Merge pull request #55 from jayfunc/dev

v1.0.26.0

.github/workflows/issues-translator.yml

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

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

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

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

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

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

@@ -142,8 +142,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4654" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
   </ItemGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
 </Project>

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

@@ -12,7 +12,7 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.0.39.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

@@ -48,7 +48,6 @@
             <converter:IntToCornerRadius x:Key="IntToCornerRadius" />
             <converter:CornerRadiusToDoubleConverter x:Key="CornerRadiusToDoubleConverter" />
             <converter:LyricsSearchProviderToDisplayNameConverter x:Key="LyricsSearchProviderToDisplayNameConverter" />
-            <converter:TranslationSearchProviderToDisplayNameConverter x:Key="TranslationSearchProviderToDisplayNameConverter" />
             <converter:AlbumArtSearchProviderToDisplayNameConverter x:Key="AlbumArtSearchProviderToDisplayNameConverter" />
             <converter:SecondsToFormattedTimeConverter x:Key="SecondsToFormattedTimeConverter" />
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
@@ -103,7 +102,7 @@
             </Style>
 
             <Style x:Key="GhostSliderStyle" TargetType="Slider">
-                <Setter Property="Background" Value="{ThemeResource ControlStrokeColorOnAccentDefaultBrush}" />
+                <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
                 <Setter Property="BorderThickness" Value="{ThemeResource SliderBorderThemeThickness}" />
                 <Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
                 <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
@@ -286,10 +285,188 @@
                 </Setter>
             </Style>
 
-            <Style x:Key="ListViewStretchedItemContainerStyle" TargetType="ListViewItem">
-                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                <Setter Property="Margin" Value="0" />
-                <Setter Property="Padding" Value="0" />
+            <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" />

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

@@ -10,17 +10,14 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using Microsoft.Windows.ApplicationModel.Resources;
 using Serilog;
 using ShadowViewer.Controls;
 using System;
-using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Vanara.PInvoke;
 
 namespace BetterLyrics.WinUI3
 {
@@ -37,8 +34,6 @@ namespace BetterLyrics.WinUI3
         public NotificationPanel? LyricsWindowNotificationPanel { get; set; }
         public NotificationPanel? SettingsWindowNotificationPanel { get; set; }
 
-        private static Mutex? _instanceMutex;
-
         public App()
         {
             this.InitializeComponent();
@@ -47,8 +42,6 @@ namespace BetterLyrics.WinUI3
             DispatcherQueueTimer = DispatcherQueue.CreateTimer();
             ResourceLoader = new ResourceLoader();
 
-            EnsureSingleInstance();
-
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             PathHelper.EnsureDirectories();
             ConfigureServices();
@@ -61,28 +54,14 @@ namespace BetterLyrics.WinUI3
             TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;
         }
 
-        private void EnsureSingleInstance()
-        {
-            bool createdNew;
-            _instanceMutex = new Mutex(true, MetadataHelper.AppName, out createdNew);
-
-            if (!createdNew)
-            {
-                User32.MessageBox(HWND.NULL, ResourceLoader!.GetString("TryRunMultipleInstance"), null, User32.MB_FLAGS.MB_APPLMODAL);
-                Environment.Exit(0);
-            }
-        }
-
         protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
             WindowHelper.OpenWindow<LyricsWindow>();
-
             var lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (lyricsWindow != null)
-            {
-                lyricsWindow.ViewModel.InitLockHotKey();
-                lyricsWindow.AutoSelectLyricsMode();
-            }
+            if (lyricsWindow == null) return;
+
+            lyricsWindow.ViewModel.InitLockHotKey();
+            lyricsWindow.AutoSelectLyricsMode();
         }
 
         private static void ConfigureServices()

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

@@ -20,8 +20,8 @@
 		<PRIResource Remove="ViewModels\Lyrics\**" />
 	</ItemGroup>
 	<ItemGroup>
+		<None Remove="Assets\Core14.profile.xml" />
 		<None Remove="Assets\Segoe Fluent Icons.ttf" />
-		<None Remove="Assets\Wiki82.profile.xml" />
 		<None Remove="Controls\SystemTray.xaml" />
 		<None Remove="Views\MusicGalleryPage.xaml" />
 		<None Remove="Views\MusicGalleryWindow.xaml" />
@@ -35,17 +35,14 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="3v.EvtSource" Version="2.0.0" />
-		<PackageReference Include="ColorThief.ImageSharp" Version="1.0.0" />
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.MarqueeText" Version="0.1.230830" />
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.OpacityMaskView" Version="0.1.250703-build.2173" />
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.250703-build.2173" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
 		<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Controls.MetadataControl" 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.Controls.Sizers" 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" />
@@ -61,14 +58,13 @@
 		<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
 		<PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
 		<PackageReference Include="NTextCat" Version="0.3.65" />
-		<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.3-dev-02320" />
+		<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
 		<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
 		<PackageReference Include="ShadowViewer.Controls.Notification" Version="1.2.1" />
-		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
 		<PackageReference Include="System.Drawing.Common" Version="9.0.7" />
 		<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.7" />
 		<PackageReference Include="TagLibSharp" Version="2.3.0" />
-		<PackageReference Include="TinyPinyin.Net" Version="1.0.2" />
 		<PackageReference Include="Ude.NetStandard" Version="1.2.0" />
 		<PackageReference Include="Vanara.PInvoke.CoreAudio" Version="4.1.6" />
 		<PackageReference Include="Vanara.PInvoke.DwmApi" Version="4.1.6" />
@@ -93,33 +89,9 @@
 		<TrimmerRootAssembly Include="TagLibSharp" />
 	</ItemGroup>
 	<ItemGroup>
-	  <Content Update="Assets\Discord.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\EmptyBox.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\EmptyState.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\Logo.ico">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\Logo.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\QQ.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
 	  <Content Update="Assets\Segoe Fluent Icons.ttf">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
-	  <Content Update="Assets\Telegram.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\Wiki82.profile.xml">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
 	</ItemGroup>
 	<ItemGroup>
 	  <Page Update="Views\MusicGalleryWindow.xaml">

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

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

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

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
-    public partial class AlbumArtSearchProviderToDisplayNameConverter : IValueConverter
+    public class AlbumArtSearchProviderToDisplayNameConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/CornerRadiusToDoubleConverter.cs

@@ -3,7 +3,7 @@ using Microsoft.UI.Xaml.Data;
 
 namespace BetterLyrics.WinUI3.Converter
 {
-    public partial class CornerRadiusToDoubleConverter : IValueConverter
+    internal partial class CornerRadiusToDoubleConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/EnumToIntConverter.cs

@@ -5,7 +5,7 @@ using Microsoft.UI.Xaml.Data;
 
 namespace BetterLyrics.WinUI3.Converter
 {
-    public partial class EnumToIntConverter : IValueConverter
+    internal partial class EnumToIntConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {

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

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

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

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
-    public partial class SecondsToFormattedTimeConverter : IValueConverter
+    public class SecondsToFormattedTimeConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {

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

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/CommonSongProperty.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum CommonSongProperty
-    {
-        Title,
-        Album,
-        Artist
-    }
-}

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

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

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

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/PlaybackOrder.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum PlaybackOrder
-    {
-        RepeatAll,
-        RepeatOne,
-        Shuffle,
-    }
-}

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

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

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

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/PositionChangedEventArgs.cs

@@ -4,9 +4,8 @@ using System;
 
 namespace BetterLyrics.WinUI3.Events
 {
-    public class TimelineChangedEventArgs(TimeSpan position, TimeSpan end) : EventArgs()
+    public class PositionChangedEventArgs(TimeSpan position) : EventArgs()
     {
         public TimeSpan Position { get; set; } = position;
-        public TimeSpan End { get; set; } = end;
     }
 }

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

@@ -1,19 +0,0 @@
-using Microsoft.UI.Windowing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public static class AppWindowHelper
-    {
-        public static void SetIcons(this AppWindow appWindow)
-        {
-            appWindow.SetIcon(PathHelper.LogoPath);
-            appWindow.SetTaskbarIcon(PathHelper.LogoPath);
-            appWindow.SetTitleBarIcon(PathHelper.LogoPath);
-        }
-    }
-}

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

@@ -1,6 +1,5 @@
 using ATL;
 using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Services;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -13,39 +12,32 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public static class CollectionHelper
     {
-        public static ObservableCollection<GroupInfoList> GetGroupedBy<T>(
-            this IEnumerable<T> items,
-            Func<T, object> groupKeySelector,
-            Func<object, object>? orderSelector = null)
+        public static ObservableCollection<GroupInfoList> GetGroupedByTitleAsync(this ICollection<Track> tracks)
         {
-            var query = from item in items
-                        group item by groupKeySelector(item) into g
+            // 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
-                        select new GroupInfoList(g.Cast<object>(), orderSelector) { Key = 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) return;
-            if (items == null) return;
+            if (collection == null) throw new ArgumentNullException(nameof(collection));
+            if (items == null) throw new ArgumentNullException(nameof(items));
             foreach (var item in items)
             {
                 collection.Add(item);
             }
         }
 
-        public static void InsertRange<T>(this IList<T> list, int index, IEnumerable<T> items)
-        {
-            if (list == null) return;
-            if (items == null) return;
-            if (index < 0 || index > list.Count) return;
-            foreach (var item in items)
-            {
-                list.Insert(index++, item);
-            }
-        }
-
     }
 }

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

@@ -106,25 +106,25 @@ namespace BetterLyrics.WinUI3.Helper
             return CommunityToolkit.WinUI.Helpers.ColorHelper.FromHsl(h, s, brightness);
         }
 
-        public static System.Drawing.Color GetAccentColor(IntPtr myHwnd, string monitorDeviceName, WindowPixelSampleMode mode)
+        public static System.Drawing.Color GetAccentColor(IntPtr myHwnd, WindowPixelSampleMode mode)
         {
             if (!User32.GetWindowRect(myHwnd, out RECT myRect)) return System.Drawing.Color.Transparent;
 
-            var monitorInfo = MonitorHelper.GetMonitorInfoExFromDeviceName(monitorDeviceName);
-            int screenWidth = monitorInfo.rcMonitor.Width;
             switch (mode)
             {
                 case WindowPixelSampleMode.BelowWindow:
                     {
+                        int screenWidth = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN);
                         int sampleHeight = 1;
                         int sampleY = myRect.Bottom + 1;
-                        return GetAverageColorFromScreenRegion(myRect.Left, sampleY, screenWidth, sampleHeight);
+                        return GetAverageColorFromScreenRegion(0, sampleY, screenWidth, sampleHeight);
                     }
                 case WindowPixelSampleMode.AboveWindow:
                     {
+                        int screenWidth = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN);
                         int sampleHeight = 1;
                         int sampleY = myRect.Top - 1;
-                        return GetAverageColorFromScreenRegion(myRect.Left, sampleY, screenWidth, sampleHeight);
+                        return GetAverageColorFromScreenRegion(0, sampleY, screenWidth, sampleHeight);
                     }
                 case WindowPixelSampleMode.WindowArea:
                     {

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

@@ -73,14 +73,17 @@ 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
-                )
+                new Windows.Graphics.RectInt32(targetX, targetY, targetWidth, targetHeight)
             );
 
             // <20><><EFBFBD><EFBFBD>ԭTopMost״̬

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

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

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

@@ -24,9 +24,11 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public class ImageHelper
     {
+        private const int _accentColorCount = 1;
+
         public static async Task<InMemoryRandomAccessStream> ByteArrayToStream(byte[] bytes)
         {
-            using var stream = new InMemoryRandomAccessStream();
+            var stream = new InMemoryRandomAccessStream();
             await stream.WriteAsync(bytes.AsBuffer());
             stream.Seek(0);
 
@@ -35,8 +37,8 @@ namespace BetterLyrics.WinUI3.Helper
 
         public static RandomAccessStreamReference ByteArrayToRandomAccessStreamReference(byte[] bytes)
         {
-            using var stream = new InMemoryRandomAccessStream();
-            using var writer = new DataWriter(stream);
+            var stream = new InMemoryRandomAccessStream();
+            var writer = new DataWriter(stream);
             writer.WriteBytes(bytes);
             writer.StoreAsync().GetAwaiter().GetResult();
             writer.FlushAsync().GetAwaiter().GetResult();
@@ -46,8 +48,8 @@ namespace BetterLyrics.WinUI3.Helper
 
         public static async Task<byte[]> CreateTextPlaceholderBytesAsync(int width, int height)
         {
-            using var device = CanvasDevice.GetSharedDevice();
-            using var renderTarget = new CanvasRenderTarget(device, width, height, 96);
+            var device = CanvasDevice.GetSharedDevice();
+            var renderTarget = new CanvasRenderTarget(device, width, height, 96);
 
             // 随机生成渐变色
             Windows.UI.Color RandomColor()
@@ -56,7 +58,7 @@ namespace BetterLyrics.WinUI3.Helper
                 double h = rand.NextDouble() * 360;
                 double s = 0.35 + rand.NextDouble() * 0.3; // 0.35~0.65，适中饱和度
                 double l = 0.5 + rand.NextDouble() * 0.3;  // 0.5~0.8，明亮
-                return CommunityToolkit.WinUI.Helpers.ColorHelper.FromHsl(h, s, l);
+                return HslToColor(h, s, l);
             }
 
             Windows.UI.Color color1 = RandomColor();
@@ -65,40 +67,86 @@ namespace BetterLyrics.WinUI3.Helper
             using (var ds = renderTarget.CreateDrawingSession())
             {
                 // 绘制线性渐变背景
-                using var gradientBrush = new Microsoft.Graphics.Canvas.Brushes.CanvasLinearGradientBrush(ds, color1, color2)
+                var gradientBrush = new Microsoft.Graphics.Canvas.Brushes.CanvasLinearGradientBrush(ds, color1, color2)
                 {
-                    StartPoint = new Vector2(0, 0),
-                    EndPoint = new Vector2(width, height)
+                    StartPoint = new System.Numerics.Vector2(0, 0),
+                    EndPoint = new System.Numerics.Vector2(width, height)
                 };
                 ds.FillRectangle(0, 0, width, height, gradientBrush);
             }
 
             // 保存为 PNG 并转为 byte[]
-            using var stream = new InMemoryRandomAccessStream();
-            await renderTarget.SaveAsync(stream, CanvasBitmapFileFormat.Png);
-            var buffer = new byte[stream.Size];
-            using (var reader = new DataReader(stream.GetInputStreamAt(0)))
+            using (var stream = new InMemoryRandomAccessStream())
             {
-                await reader.LoadAsync((uint)stream.Size);
-                reader.ReadBytes(buffer);
+                await renderTarget.SaveAsync(stream, CanvasBitmapFileFormat.Png);
+                var buffer = new byte[stream.Size];
+                using (var reader = new DataReader(stream.GetInputStreamAt(0)))
+                {
+                    await reader.LoadAsync((uint)stream.Size);
+                    reader.ReadBytes(buffer);
+                }
+                return buffer;
+            }
+
+            // HSL转Color
+            static Windows.UI.Color HslToColor(double h, double s, double l)
+            {
+                h = h / 360.0;
+                double r = l, g = l, b = l;
+                if (s != 0)
+                {
+                    double q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+                    double p = 2 * l - q;
+                    r = HueToRgb(p, q, h + 1.0 / 3.0);
+                    g = HueToRgb(p, q, h);
+                    b = HueToRgb(p, q, h - 1.0 / 3.0);
+                }
+                return Windows.UI.Color.FromArgb(255, (byte)(r * 255), (byte)(g * 255), (byte)(b * 255));
+            }
+            static double HueToRgb(double p, double q, double t)
+            {
+                if (t < 0) t += 1;
+                if (t > 1) t -= 1;
+                if (t < 1.0 / 6.0) return p + (q - p) * 6 * t;
+                if (t < 1.0 / 2.0) return q;
+                if (t < 2.0 / 3.0) return p + (q - p) * (2.0 / 3.0 - t) * 6;
+                return p;
             }
-            return buffer;
         }
 
-        public static List<Windows.UI.Color> GetAccentColorsFromByte(byte[] bytes, int count, bool? isDark = null)
+        public static List<Windows.UI.Color> GetAccentColorsFromByte(byte[] bytes)
         {
-            using var image = Image.Load<Rgba32>(bytes);
-            var colorThief = new ColorThief.ImageSharp.ColorThief();
-            var mainColor = colorThief.GetColor(image, 10, false);
-            var palette = colorThief.GetPalette(image, 255, 10, false);
-            var topColors = palette
-                .OrderByDescending(x => x.Population)
-                .Where(x => x.IsDark == (isDark ?? mainColor.IsDark))
-                .Select(x => Windows.UI.Color.FromArgb(x.Color.A, x.Color.R, x.Color.G, x.Color.B))
-                .Take(count)
+            // 使用 ImageSharp 读取图片
+            using var image = SixLabors.ImageSharp.Image.Load<SixLabors.ImageSharp.PixelFormats.Rgba32>(bytes);
+
+            // 简单聚类法：统计所有像素出现频率，取出现最多的前 AccentColorCount 个颜色
+            var colorCount = new Dictionary<SixLabors.ImageSharp.PixelFormats.Rgba32, int>();
+
+            for (int y = 0; y < image.Height; y++)
+            {
+                for (int x = 0; x < image.Width; x++)
+                {
+                    var color = image[x, y];
+                    // 可选：忽略透明像素
+                    if (color.A < 32) continue;
+                    if (colorCount.ContainsKey(color))
+                        colorCount[color]++;
+                    else
+                        colorCount[color] = 1;
+                }
+            }
+
+            // 按出现次数排序，取前 AccentColorCount 个
+            var topColors = colorCount
+                .OrderByDescending(kv => kv.Value)
+                .Take(_accentColorCount)
+                .Select(kv => kv.Key)
                 .ToList();
 
-            return topColors;
+            // 转换为 Windows.UI.Color
+            return topColors
+                .Select(c => Windows.UI.Color.FromArgb(c.A, c.R, c.G, c.B))
+                .ToList();
         }
 
         //public static async Task<BitmapImage> GetBitmapImageFromBytesAsync(byte[] imageBytes)
@@ -166,7 +214,7 @@ namespace BetterLyrics.WinUI3.Helper
 
             int size = Math.Max(image.Width, image.Height);
 
-            var themeColor = Rgba32.ParseHex(GetAccentColorsFromByte(imageBytes, 1).FirstOrDefault().ToHex());
+            var themeColor = Rgba32.ParseHex(GetAccentColorsFromByte(imageBytes).FirstOrDefault().ToHex());
 
             // 新建正方形画布
             using var square = new Image<Rgba32>(size, size, themeColor);
@@ -183,22 +231,5 @@ namespace BetterLyrics.WinUI3.Helper
             square.Save(ms, new PngEncoder());
             return ms.ToArray();
         }
-
-        public static byte[] Resize(byte[] imageBytes, int size)
-        {
-            using Image image = Image.Load(imageBytes);
-            var factor = Math.Max(size / image.Width, size / image.Height);
-            if (factor <= 1)
-            {
-                return imageBytes;
-            }
-            int width = image.Width * factor;
-            int height = image.Height * factor;
-            image.Mutate(x => x.Resize(width, height, KnownResamplers.Welch));
-
-            using var ms = new MemoryStream();
-            image.Save(ms, new PngEncoder());
-            return ms.ToArray();
-        }
     }
 }

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

@@ -6,7 +6,6 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using TinyPinyin;
 using Windows.Globalization;
 
 namespace BetterLyrics.WinUI3.Services
@@ -57,20 +56,36 @@ namespace BetterLyrics.WinUI3.Services
             _identifier = _factory.Load(PathHelper.LanguageProfilePath);
         }
 
+        private static string? ThreeLetterToTwoLetter(string? threeLetterCode)
+        {
+            if (threeLetterCode == null) return null;
+
+            foreach (var ci in CultureInfo.GetCultures(CultureTypes.AllCultures))
+            {
+                if (string.Equals(ci.ThreeLetterISOLanguageName, threeLetterCode, StringComparison.OrdinalIgnoreCase))
+                {
+                    return ci.TwoLetterISOLanguageName;
+                }
+            }
+            return null;
+        }
+
         public static string? DetectLanguageCode(string? text)
         {
             if (text == null) return null;
 
-            var guessList = _identifier.Identify(text);
-            string? code = guessList?.FirstOrDefault()?.Item1.Iso639_2T;
-            code = code switch
+            string? code = ThreeLetterToTwoLetter(_identifier.Identify(text).FirstOrDefault()?.Item1.Iso639_2T);
+            if (code != null && code == "zh")
             {
-                "simple" => "en",
-                "zh_classical" => "zh-Hant",
-                "zh_yue" => "zh-Hant",
-                "zh" => "zh-Hans",
-                _ => code
-            };
+                if (ChineseConverter.ConvertToTraditionalChinese(text) == text)
+                {
+                    return "zh-Hant";
+                }
+                else
+                {
+                    return "zh-Hans";
+                }
+            }
             return code;
         }
 
@@ -109,20 +124,5 @@ namespace BetterLyrics.WinUI3.Services
             if (found == -1) found = 7; // 默认使用英语
             return found;
         }
-
-        public static string GetOrderChar(string text)
-        {
-            if (string.IsNullOrWhiteSpace(text)) return "#";
-            char c = text.ElementAtOrDefault(0);
-            if (char.IsLetter(c) && c < 128)
-                return char.ToUpper(c).ToString();
-
-            if (PinyinHelper.IsChinese(c))
-            {
-                return PinyinHelper.GetPinyinInitials($"{c}");
-            }
-
-            return "#";
-        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LauncherHelper.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Storage;
-using Windows.System;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public class LauncherHelper
-    {
-        public static async Task SelectAndShowFile(string filePath)
-        {
-            var file = await StorageFile.GetFileFromPathAsync(filePath);
-            var folder = await file.GetParentAsync();
-
-            var folderOptions = new FolderLauncherOptions();
-            folderOptions.ItemsToSelect.Add(file);
-
-            await Launcher.LaunchFolderAsync(folder, folderOptions);
-        }
-    }
-}

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

@@ -109,57 +109,46 @@ namespace BetterLyrics.WinUI3.Helper
 
             // 按时间分组
             var grouped = lrcLines.GroupBy(l => l.time).OrderBy(g => g.Key).ToList();
-            int languageCount = 0;
-            if (grouped != null && grouped.Count > 0)
-            {
-                // 计算最大语言数量
-                languageCount = grouped.Max(g => g.Count());
-            }
+            int languageCount = grouped.Max(g => g.Count());
 
             // 初始化每种语言的歌词列表
             _lyricsDataArr.Clear();
             for (int i = 0; i < languageCount; i++) _lyricsDataArr.Add(new LyricsData());
 
             // 遍历每个时间分组
-            if (grouped != null)
+            foreach (var group in grouped)
             {
-                foreach (var group in grouped)
+                var linesInGroup = group.ToList();
+                for (int langIdx = 0; langIdx < languageCount; langIdx++)
                 {
-                    var linesInGroup = group.ToList();
-                    for (int langIdx = 0; langIdx < languageCount; langIdx++)
+                    // 如果该语言有翻译，取对应行，否则用原文（第一行）
+                    var (start, text, syllables) =
+                        langIdx < linesInGroup.Count ? linesInGroup[langIdx] : linesInGroup[0];
+                    var line = new LyricsLine
                     {
-                        // 只添加有对应行的语言，否则跳过
-                        if (langIdx < linesInGroup.Count)
+                        StartMs = start,
+                        OriginalText = text,
+                        LyricsChars = [],
+                    };
+                    if (syllables != null && syllables.Count > 0)
+                    {
+                        int currentIndex = 0;
+                        for (int j = 0; j < syllables.Count; j++)
                         {
-                            var (start, text, syllables) = linesInGroup[langIdx];
-                            var line = new LyricsLine
-                            {
-                                StartMs = start,
-                                OriginalText = text,
-                                LyricsChars = [],
-                            };
-                            if (syllables != null && syllables.Count > 0)
-                            {
-                                int currentIndex = 0;
-                                for (int j = 0; j < syllables.Count; j++)
+                            var (charStart, charText) = syllables[j];
+                            int startIndex = currentIndex;
+                            line.LyricsChars.Add(
+                                new LyricsChar
                                 {
-                                    var (charStart, charText) = syllables[j];
-                                    int startIndex = currentIndex;
-                                    line.LyricsChars.Add(
-                                        new LyricsChar
-                                        {
-                                            StartMs = charStart,
-                                            Text = charText ?? "",
-                                            StartIndex = startIndex,
-                                        }
-                                    );
-                                    currentIndex += charText?.Length ?? 0;
+                                    StartMs = charStart,
+                                    Text = charText ?? "",
+                                    StartIndex = startIndex,
                                 }
-                            }
-                            _lyricsDataArr[langIdx].LyricsLines.Add(line);
+                            );
+                            currentIndex += charText?.Length ?? 0;
                         }
-                        // 没有翻译行则不补原文，直接跳过
                     }
+                    _lyricsDataArr[langIdx].LyricsLines.Add(line);
                 }
             }
         }
@@ -170,7 +159,7 @@ namespace BetterLyrics.WinUI3.Helper
             {
                 List<LyricsLine> originalLines = [];
                 List<LyricsLine> translationLines = [];
-                var xdoc = XDocument.Parse(raw, LoadOptions.PreserveWhitespace);
+                var xdoc = XDocument.Parse(raw);
                 var body = xdoc.Descendants().FirstOrDefault(e => e.Name.LocalName == "body");
                 if (body == null) return;
                 var ps = body.Descendants().Where(e => e.Name.LocalName == "p");
@@ -196,18 +185,16 @@ namespace BetterLyrics.WinUI3.Helper
                         .Where(s => s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value == "x-translation")
                         .ToList();
 
-                    // 处理原文span后的空白
-                    for (int i = 0; i < originalTextSpans.Count; i++)
-                    {
-                        var span = originalTextSpans[i];
-                        var nextNode = span.NodesAfterSelf().FirstOrDefault();
-                        if (nextNode is XText textNode)
-                        {
-                            span.Value += textNode.Value;
-                        }
-                    }
-                    // 拼接空白字符后的原文
+                    // 原文（非 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;

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

@@ -29,7 +29,6 @@ namespace BetterLyrics.WinUI3.Helper
         public const string GithubUrl = "https://github.com/jayfunc/BetterLyrics";
         public const string QQGroupUrl = "https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info";
         public const string DiscordUrl = "https://discord.gg/5yAQPnyCKv";
-        public const string TelegramUrl = "https://t.me/+svhSLZ7awPsxNGY1";
 
         public static async Task<DateTime> GetBuildDate()
         {

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

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

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

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

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

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

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

@@ -15,9 +15,7 @@ namespace BetterLyrics.WinUI3.Helper
         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 LanguageProfilePath => Path.Combine(AssetsFolder, "Wiki82.profile.xml");
-        public static string LogoPath => Path.Combine(AssetsFolder, "Logo.ico");
+        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");
@@ -35,7 +33,6 @@ namespace BetterLyrics.WinUI3.Helper
         public static string TranslationCacheDirectory => Path.Combine(CacheFolder, "translations");
 
         public static string QQTranslationCacheDirectory => Path.Combine(TranslationCacheDirectory, "qq");
-        public static string NeteaseTranslationCacheDirectory => Path.Combine(TranslationCacheDirectory, "netease");
 
         public static string AlbumArtCacheDirectory => Path.Combine(CacheFolder, "album-art");
 
@@ -52,7 +49,6 @@ namespace BetterLyrics.WinUI3.Helper
             Directory.CreateDirectory(AmllTtmlDbLyricsCacheDirectory);
 
             Directory.CreateDirectory(QQTranslationCacheDirectory);
-            Directory.CreateDirectory(NeteaseTranslationCacheDirectory);
 
             Directory.CreateDirectory(iTunesAlbumArtCacheDirectory);
         }

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

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

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

@@ -6,20 +6,13 @@ using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models
 {
-    public partial class GroupInfoList : List<object>
+    public partial class GroupInfoList(IEnumerable<object> items) : List<object>(items)
     {
         public required object Key { get; set; }
 
-        public GroupInfoList(IEnumerable<object> items, Func<object, object>? orderSelector = null)
-            : base(orderSelector != null
-                ? items.OrderBy(orderSelector)
-                : items)
-        {
-        }
-
         public override string ToString()
         {
-            return $"{Key}";
+            return "Group " + Key.ToString();
         }
     }
 }

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

@@ -26,39 +26,36 @@ namespace BetterLyrics.WinUI3.Models
             LyricsLines = lyricsLines;
         }
 
-        public void SetDisplayedTextAlongWith(LyricsData translationData, int toleranceMs = 0)
+        public void SetDisplayedTextAlongWith(LyricsData translationData)
         {
+            int i = 0;
             foreach (var line in LyricsLines)
             {
-                // 在翻译歌词中查找与当前行开始时间最接近且在容忍范围内的行
-                var transLine = translationData.LyricsLines
-                    .FirstOrDefault(t => Math.Abs(t.StartMs - line.StartMs) <= toleranceMs);
-
-                if (transLine != null)
+                if (i >= translationData.LyricsLines.Count)
                 {
-                    if (translationData.LanguageCode?.StartsWith("zh") == true)
+                    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(transLine.OriginalText);
+                            tmp = ChineseConverter.ConvertToTraditionalChinese(translationData.LyricsLines[i].OriginalText);
                         }
                         else if (LanguageHelper.GetUserTargetLanguageCode() == "zh-Hans")
                         {
-                            tmp = ChineseConverter.ConvertToSimplifiedChinese(transLine.OriginalText);
+                            tmp = ChineseConverter.ConvertToSimplifiedChinese(translationData.LyricsLines[i].OriginalText);
                         }
                         line.DisplayedText = $"{line.OriginalText}\n{tmp}";
                     }
                     else
                     {
-                        line.DisplayedText = $"{line.OriginalText}\n{transLine.OriginalText}";
+                        line.DisplayedText = $"{line.OriginalText}\n{translationData.LyricsLines[i].OriginalText}";
                     }
                 }
-                else
-                {
-                    // 没有匹配的翻译，翻译部分留空
-                    line.DisplayedText = $"{line.OriginalText}";
-                }
+                i++;
             }
         }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayQueueItem.cs

@@ -1,19 +0,0 @@
-using ATL;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    public class PlayQueueItem
-    {
-        public Track Track { get; set; }
-
-        public PlayQueueItem(Track track)
-        {
-            Track = track;
-        }
-    }
-}

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

@@ -1,35 +0,0 @@
-using BetterLyrics.WinUI3.Enums;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    public class SongsTabInfo
-    {
-        public string Name { get; set; }
-
-        public string Icon { get; set; }
-
-        public bool IsClosable { get; set; }
-
-        public CommonSongProperty FilterProperty { get; set; }
-
-        public string FilterValue { get; set; }
-
-        public SongsTabInfo()
-        {
-            Name = string.Empty;
-            Icon = string.Empty;
-            IsClosable = true;
-            FilterProperty = CommonSongProperty.Title;
-            FilterValue = string.Empty;
-        }
-
-        public SongsTabInfo(string name, string icon, bool isClosable, CommonSongProperty filterProperty, string filterValue)
-        {
-            Name = name;
-            Icon = icon;
-            IsClosable = isClosable;
-            FilterProperty = filterProperty;
-            FilterValue = filterValue;
-        }
-    }
-}

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

@@ -105,7 +105,7 @@ namespace BetterLyrics.WinUI3.Services
                 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
-                using HttpResponseMessage response = await _iTunesHttpClinet.GetAsync(url);
+                HttpResponseMessage response = await _iTunesHttpClinet.GetAsync(url);
                 response.EnsureSuccessStatusCode();
                 string responseBody = await response.Content.ReadAsStringAsync();
 

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

@@ -10,7 +10,7 @@ namespace BetterLyrics.WinUI3.Services
     public interface IPlaybackService
     {
         event EventHandler<IsPlayingChangedEventArgs>? IsPlayingChanged;
-        event EventHandler<TimelineChangedEventArgs>? TimelineChanged;
+        event EventHandler<PositionChangedEventArgs>? PositionChanged;
         event EventHandler<SongInfoChangedEventArgs>? SongInfoChanged;
         event EventHandler<AlbumArtChangedEventArgs>? AlbumArtChangedChanged;
         event EventHandler<MediaSourceProvidersInfoEventArgs>? MediaSourceProvidersInfoChanged;

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

@@ -19,7 +19,6 @@ namespace BetterLyrics.WinUI3.Services
         int CoverOverlayBlurAmount { get; set; }
         int CoverOverlayOpacity { get; set; }
         bool IsDynamicCoverOverlayEnabled { get; set; }
-        int CoverAcrylicEffectAmount { get; set; }
         bool IsFanLyricsEnabled { get; set; }
         bool IsFirstRun { get; set; }
         bool IsLyricsGlowEffectEnabled { get; set; }
@@ -61,9 +60,7 @@ namespace BetterLyrics.WinUI3.Services
         LyricsFontColorType LyricsFgFontColorType { get; set; }
         LyricsFontColorType LyricsStrokeFontColorType { get; set; }
 
-        int LyricsStandardFontSize { get; set; }
-        int LyricsDockFontSize { get; set; }
-        int LyricsDesktopFontSize { get; set; }
+        int LyricsFontSize { get; set; }
 
         ElementTheme LyricsBackgroundTheme { get; set; }
 
@@ -104,8 +101,5 @@ namespace BetterLyrics.WinUI3.Services
         int SelectedFontFamilyIndex { get; set; }
         string LyricsFontFamily { get; set; }
         bool IsDragEverywhereEnabled { get; set; }
-        PlaybackOrder PlaybackOrder { get; set; }
-        bool IsLibreTranslateEnabled { get; set; }
-        string DockMonitorDeviceName { get; set; }
     }
 }

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

@@ -7,7 +7,6 @@ using CommunityToolkit.Mvvm.DependencyInjection;
 using Lyricify.Lyrics.Providers.Web.Kugou;
 using Lyricify.Lyrics.Searchers;
 using Microsoft.Extensions.Logging;
-using NTextCat.Commons;
 using System;
 using System.IO;
 using System.Linq;
@@ -271,7 +270,7 @@ namespace BetterLyrics.WinUI3.Services
             var url = $"https://raw.githubusercontent.com/Steve-xmh/amll-ttml-db/refs/heads/main/raw-lyrics/{rawLyricFile}";
             try
             {
-                using var response = await _amllTtmlDbHttpClient.GetAsync(url);
+                var response = await _amllTtmlDbHttpClient.GetAsync(url);
                 if (!response.IsSuccessStatusCode)
                     return null;
                 return await response.Content.ReadAsStringAsync();
@@ -292,7 +291,7 @@ namespace BetterLyrics.WinUI3.Services
                 $"&album_name={Uri.EscapeDataString(album)}" +
                 $"&durationMs={Uri.EscapeDataString(duration.ToString())}";
 
-            using var response = await _lrcLibHttpClient.GetAsync(url);
+            var response = await _lrcLibHttpClient.GetAsync(url);
             if (!response.IsSuccessStatusCode)
                 return null;
 
@@ -348,17 +347,6 @@ namespace BetterLyrics.WinUI3.Services
             else if (result is NeteaseSearchResult neteaseResult)
             {
                 var response = await Lyricify.Lyrics.Helpers.ProviderHelper.NeteaseApi.GetLyric(neteaseResult.Id);
-                var translated = response?.Tlyric?.Lyric;
-                if (!string.IsNullOrEmpty(translated))
-                {
-                    FileHelper.WriteLyricsCache(
-                        title,
-                        artist,
-                        translated,
-                        LyricsFormat.Lrc,
-                        PathHelper.NeteaseTranslationCacheDirectory
-                    );
-                }
                 return response?.Lrc.Lyric;
             }
             else if (result is KugouSearchResult kugouResult)

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

@@ -37,14 +37,13 @@ namespace BetterLyrics.WinUI3.Services
         private readonly ILogger<PlaybackService> _logger;
 
         private readonly string _lxMusicId = "cn.toside.music.desktop";
-        private double _lxMusicPositionSeconds = 0;
-        private double _lxMusicDurationSeconds = 0;
 
         private bool _cachedIsPlaying = false;
 
         private EventSourceReader? _sse = null;
 
         private readonly MediaManager _mediaManager = new();
+        private MediaManager.MediaSession? _focusedSession = null;
 
         private readonly LatestOnlyTaskRunner _albumArtRefreshRunner = new();
         private readonly LatestOnlyTaskRunner _onAnyMediaPropertyChangedRunner = new();
@@ -54,7 +53,7 @@ namespace BetterLyrics.WinUI3.Services
         private byte[]? _SMTCAlbumArtBytes = null;
 
         public event EventHandler<IsPlayingChangedEventArgs>? IsPlayingChanged;
-        public event EventHandler<TimelineChangedEventArgs>? TimelineChanged;
+        public event EventHandler<PositionChangedEventArgs>? PositionChanged;
         public event EventHandler<SongInfoChangedEventArgs>? SongInfoChanged;
         public event EventHandler<AlbumArtChangedEventArgs>? AlbumArtChangedChanged;
         public event EventHandler<MediaSourceProvidersInfoEventArgs>? MediaSourceProvidersInfoChanged;
@@ -96,33 +95,34 @@ namespace BetterLyrics.WinUI3.Services
         {
             if (!_mediaManager.IsStarted) return;
 
-            SendFocusedMessagesAsync().ConfigureAwait(false);
+            _focusedSession = mediaSession ?? _mediaManager.GetFocusedSession();
+
+            if (_focusedSession == null || !IsMediaSourceEnabled(_focusedSession.Id))
+            {
+                SendNullMessages();
+            }
+            else
+            {
+                SendFocusedMessagesAsync().ConfigureAwait(false);
+            }
         }
 
         private void MediaManager_OnAnyTimelinePropertyChanged(MediaManager.MediaSession mediaSession, GlobalSystemMediaTransportControlsSessionTimelineProperties timelineProperties)
         {
             if (!_mediaManager.IsStarted) return;
-            if (mediaSession == null) return;
-
-            var focusedSession = _mediaManager.GetFocusedSession();
-
-            if (!IsMediaSourceEnabled(mediaSession.Id) || mediaSession != focusedSession) return;
+            if (!IsMediaSourceEnabled(mediaSession.Id) || mediaSession != _focusedSession) return;
 
             _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
             {
-                TimelineChanged?.Invoke(this, new TimelineChangedEventArgs(timelineProperties.Position, timelineProperties.EndTime));
+                PositionChanged?.Invoke(this, new PositionChangedEventArgs(timelineProperties.Position));
             });
         }
 
         private void MediaManager_OnAnyPlaybackStateChanged(MediaManager.MediaSession mediaSession, GlobalSystemMediaTransportControlsSessionPlaybackInfo playbackInfo)
         {
             if (!_mediaManager.IsStarted) return;
-            if (mediaSession == null) return;
-
-            var focusedSession = _mediaManager.GetFocusedSession();
-
             RecordMediaSourceProviderInfo(mediaSession);
-            if (!IsMediaSourceEnabled(mediaSession.Id) || mediaSession != focusedSession) return;
+            if (!IsMediaSourceEnabled(mediaSession.Id) || mediaSession != _focusedSession) return;
 
             _cachedIsPlaying = playbackInfo.PlaybackStatus switch
             {
@@ -139,14 +139,10 @@ namespace BetterLyrics.WinUI3.Services
         private void MediaManager_OnAnyMediaPropertyChanged(MediaManager.MediaSession mediaSession, GlobalSystemMediaTransportControlsSessionMediaProperties mediaProperties)
         {
             if (!_mediaManager.IsStarted) return;
-            if (mediaSession == null) return;
-
             string id = mediaSession.Id;
 
-            var focusedSession = _mediaManager.GetFocusedSession();
-
             RecordMediaSourceProviderInfo(mediaSession);
-            if (!IsMediaSourceEnabled(id) || mediaSession != focusedSession) return;
+            if (!IsMediaSourceEnabled(id) || mediaSession != _focusedSession) return;
 
             _cachedSongInfo = new SongInfo
             {
@@ -176,7 +172,6 @@ namespace BetterLyrics.WinUI3.Services
                 if (mediaProperties.Thumbnail is IRandomAccessStreamReference streamReference)
                 {
                     _SMTCAlbumArtBytes = await ImageHelper.ToByteArrayAsync(streamReference);
-                    _SMTCAlbumArtBytes = ImageHelper.Resize(_SMTCAlbumArtBytes, 800);
                 }
                 else
                 {
@@ -201,8 +196,6 @@ namespace BetterLyrics.WinUI3.Services
         private void MediaManager_OnAnySessionClosed(MediaManager.MediaSession mediaSession)
         {
             if (!_mediaManager.IsStarted) return;
-            if (mediaSession == null) return;
-
             if (_mediaManager.CurrentMediaSessions.Count == 0)
             {
                 SendNullMessages();
@@ -212,17 +205,14 @@ namespace BetterLyrics.WinUI3.Services
         private void MediaManager_OnAnySessionOpened(MediaManager.MediaSession mediaSession)
         {
             if (!_mediaManager.IsStarted) return;
-            if (mediaSession == null) return;
-
             RecordMediaSourceProviderInfo(mediaSession);
+            _focusedSession = _mediaManager.GetFocusedSession();
             SendFocusedMessagesAsync().ConfigureAwait(false);
         }
 
         private void RecordMediaSourceProviderInfo(MediaManager.MediaSession mediaSession)
         {
             if (!_mediaManager.IsStarted) return;
-            if (mediaSession == null) return;
-
             var id = mediaSession?.Id;
             if (string.IsNullOrEmpty(id)) return;
 
@@ -246,19 +236,18 @@ namespace BetterLyrics.WinUI3.Services
                 _cachedIsPlaying = false;
                 SongInfoChanged?.Invoke(this, new SongInfoChangedEventArgs(_cachedSongInfo));
                 IsPlayingChanged?.Invoke(this, new IsPlayingChangedEventArgs(_cachedIsPlaying));
-                TimelineChanged?.Invoke(this, new TimelineChangedEventArgs(TimeSpan.Zero, TimeSpan.Zero));
+                PositionChanged?.Invoke(this, new PositionChangedEventArgs(TimeSpan.Zero));
             });
         }
 
         private async Task SendFocusedMessagesAsync()
         {
-            var focusedSession = _mediaManager.GetFocusedSession();
-            if (focusedSession == null || focusedSession.ControlSession == null) return;
+            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());
+            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)
@@ -295,12 +284,11 @@ namespace BetterLyrics.WinUI3.Services
             var _albumArtSwBitmap = await decoder.GetSoftwareBitmapAsync(BitmapPixelFormat.Rgba8, BitmapAlphaMode.Premultiplied);
             token.ThrowIfCancellationRequested();
 
-            var _albumArtLightAccentColor = ImageHelper.GetAccentColorsFromByte(bytes, 1, false).FirstOrDefault();
-            var _albumArtDarkAccentColor = ImageHelper.GetAccentColorsFromByte(bytes, 1, true).FirstOrDefault();
+            var _albumArtAccentColor = ImageHelper.GetAccentColorsFromByte(bytes).FirstOrDefault();
 
             _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
             {
-                AlbumArtChangedChanged?.Invoke(this, new AlbumArtChangedEventArgs(_albumArtSwBitmap, _albumArtLightAccentColor, _albumArtDarkAccentColor));
+                AlbumArtChangedChanged?.Invoke(this, new AlbumArtChangedEventArgs(_albumArtSwBitmap, _albumArtAccentColor));
             });
         }
 
@@ -308,7 +296,7 @@ namespace BetterLyrics.WinUI3.Services
         {
             try
             {
-                _sse = new EventSourceReader(new Uri($"{_settingsService.LXMusicServer}/subscribe-player-status?filter=progress,duration")).Start();
+                _sse = new EventSourceReader(new Uri($"{_settingsService.LXMusicServer}/subscribe-player-status?filter=progress")).Start();
                 _sse.MessageReceived += Sse_MessageReceived;
                 _sse.Disconnected += Sse_Disconnected;
             }
@@ -345,70 +333,40 @@ namespace BetterLyrics.WinUI3.Services
 
         private void Sse_MessageReceived(object sender, EventSourceMessageEventArgs e)
         {
-            if (_cachedSongInfo?.SourceAppUserModelId == _lxMusicId)
+            var data = JsonSerializer.Deserialize(e.Message, Serialization.SourceGenerationContext.Default.JsonElement);
+
+            if (data.TryGetDouble(out double positionSeconds))
             {
-                var data = JsonSerializer.Deserialize(e.Message, Serialization.SourceGenerationContext.Default.JsonElement);
-                if (data.ValueKind == JsonValueKind.Number)
+                if (_cachedSongInfo?.SourceAppUserModelId == _lxMusicId)
                 {
-                    if (e.Event == "progress")
-                    {
-                        _lxMusicPositionSeconds = data.GetDouble();
-                    }
-                    else if (e.Event == "duration")
-                    {
-                        _lxMusicDurationSeconds = data.GetDouble();
-                    }
-                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
-                    {
-                        TimelineChanged?.Invoke(this, new TimelineChangedEventArgs(TimeSpan.FromSeconds(_lxMusicPositionSeconds), TimeSpan.FromSeconds(_lxMusicDurationSeconds)));
-                    });
+                    PositionChanged?.Invoke(this, new PositionChangedEventArgs(TimeSpan.FromSeconds(positionSeconds)));
                 }
             }
         }
 
         public async Task PlayAsync()
         {
-            var focusedSession = _mediaManager.GetFocusedSession();
-            if (focusedSession != null)
-            {
-                await focusedSession.ControlSession?.TryPlayAsync();
-            }
+            await _focusedSession?.ControlSession.TryPlayAsync();
         }
 
         public async Task PauseAsync()
         {
-            var focusedSession = _mediaManager.GetFocusedSession();
-            if (focusedSession != null)
-            {
-                await focusedSession.ControlSession?.TryPauseAsync();
-            }
+            await _focusedSession?.ControlSession.TryPauseAsync();
         }
 
         public async Task PreviousAsync()
         {
-            var focusedSession = _mediaManager.GetFocusedSession();
-            if (focusedSession != null)
-            {
-                await focusedSession.ControlSession?.TrySkipPreviousAsync();
-            }
+            await _focusedSession?.ControlSession.TrySkipPreviousAsync();
         }
 
         public async Task NextAsync()
         {
-            var focusedSession = _mediaManager.GetFocusedSession();
-            if (focusedSession != null)
-            {
-                await focusedSession.ControlSession?.TrySkipNextAsync();
-            }
+            await _focusedSession?.ControlSession.TrySkipNextAsync();
         }
 
         public async Task ChangePosition(double seconds)
         {
-            var focusedSession = _mediaManager.GetFocusedSession();
-            if (focusedSession != null)
-            {
-                await focusedSession.ControlSession?.TryChangePlaybackPositionAsync(TimeSpan.FromSeconds(seconds).Ticks);
-            }
+            await _focusedSession?.ControlSession.TryChangePlaybackPositionAsync(TimeSpan.FromSeconds(seconds).Ticks);
         }
 
         public void Receive(PropertyChangedMessage<ObservableCollection<MediaSourceProviderInfo>> message)
@@ -419,7 +377,7 @@ namespace BetterLyrics.WinUI3.Services
                 {
                     _mediaSourceProvidersInfo = [.. message.NewValue];
                     _settingsService.MediaSourceProvidersInfo = _mediaSourceProvidersInfo;
-                    MediaManager_OnFocusedSessionChanged(null);
+                    MediaManager_OnFocusedSessionChanged(_mediaManager.GetFocusedSession());
                 }
             }
         }

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

@@ -30,8 +30,6 @@ namespace BetterLyrics.WinUI3.Services
         private const string CoverOverlayOpacityKey = "CoverOverlayOpacity";
         private const string IsCoverOverlayEnabledKey = "IsCoverOverlayEnabled";
 
-        private const string CoverAcrylicEffectAmountKey = "CoverAcrylicEffectAmount";
-
         private const string DesktopWindowLeftKey = "DesktopWindowLeft";
         private const string DesktopWindowTopKey = "DesktopWindowTop";
         private const string DesktopWindowWidthKey = "DesktopWindowWidth";
@@ -62,11 +60,7 @@ namespace BetterLyrics.WinUI3.Services
 
         private const string LyricsFontStrokeWidthKey = "LyricsFontStrokeWidth";
 
-        // Lyrics font size
-        private const string LyricsStandardFontSizeKey = "LyricsStandardFontSize";
-        private const string LyricsDockFontSizeKey = "LyricsDockFontSize";
-        private const string LyricsDesktopFontSizeKey = "LyricsDesktopFontSize";
-
+        private const string LyricsFontSizeKey = "LyricsFontSize";
         private const string LyricsFontWeightKey = "LyricsFontWeightKey";
         private const string LyricsGlowEffectScopeKey = "LyricsGlowEffectScope";
         private const string LyricsHighlightSopeKey = "LyricsHighlightSope";
@@ -77,14 +71,11 @@ namespace BetterLyrics.WinUI3.Services
 
         private const string MediaSourceProvidersInfoKey = "MediaSourceProvidersInfo";
 
-        // Translation
         private const string IsTranslationEnabledKey = "IsTranslationEnabled";
         private const string ShowTranslationOnlyKey = "ShowTranslationOnly";
-        private const string IsLibreTranslateEnabledKey = "IsLibreTranslateEnabled";
         private const string LibreTranslateServerKey = "LibreTranslateServer";
         private const string SelectedTargetLanguageIndexKey = "SelectedTargetLanguageIndex";
 
-        // LX Music
         private const string LXMusicServerKey = "LXMusicServer";
 
         private const string LyricsBackgroundThemeKey = "LyricsBackgroundTheme";
@@ -99,7 +90,6 @@ namespace BetterLyrics.WinUI3.Services
         private const string IsLyricsFloatAnimationEnabledKey = "IsLyricsFloatAnimationEnabled";
 
         private const string ResetPositionOffsetOnSongChangedKey = "ResetPositionOffsetOnSongChanged";
-        private const string PlaybackOrderKey = "PlaybackOrder";
 
         private const string PositionOffsetKey = "PositionOffset";
 
@@ -113,8 +103,6 @@ namespace BetterLyrics.WinUI3.Services
         private const string LyricsFontFamilyKey = "LyricsFontFamily";
         private const string IsDragEverywhereEnabledKey = "IsDragEverywhereEnabled";
 
-        private const string DockMonitorDeviceNameKey = "DockMonitorDeviceName";
-
         private readonly ApplicationDataContainer _localSettings;
 
         public SettingsService()
@@ -193,14 +181,13 @@ namespace BetterLyrics.WinUI3.Services
             SetDefault(CoverOverlayOpacityKey, 100); // 100 % = 1.0
             SetDefault(CoverOverlayBlurAmountKey, 100);
             SetDefault(CoverImageRadiusKey, 12); // 12 %
-            SetDefault(CoverAcrylicEffectAmountKey, 0);
             // Lyrics
             SetDefault(LyricsAlignmentTypeKey, (int)TextAlignmentType.Center);
             SetDefault(SongInfoAlignmentTypeKey, (int)TextAlignmentType.Left);
             SetDefault(LyricsFontWeightKey, (int)LyricsFontWeight.Bold);
             SetDefault(LyricsBlurAmountKey, 5);
 
-            SetDefault(LyricsBackgroundThemeKey, (int)ElementTheme.Dark);
+            SetDefault(LyricsBackgroundThemeKey, (int)ElementTheme.Default);
 
             SetDefault(LyricsBgFontColorTypeKey, (int)LyricsFontColorType.AdaptiveGrayed);
             SetDefault(LyricsFgFontColorTypeKey, (int)LyricsFontColorType.AdaptiveGrayed);
@@ -210,10 +197,7 @@ namespace BetterLyrics.WinUI3.Services
             SetDefault(LyricsCustomFgFontColorKey, Colors.White.ToInt());
             SetDefault(LyricsCustomStrokeFontColorKey, Colors.White.ToInt());
 
-            SetDefault(LyricsStandardFontSizeKey, 28);
-            SetDefault(LyricsDockFontSizeKey, 20);
-            SetDefault(LyricsDesktopFontSizeKey, 28);
-
+            SetDefault(LyricsFontSizeKey, 28);
             SetDefault(LyricsLineSpacingFactorKey, 0.5f);
             SetDefault(LyricsVerticalEdgeOpacityKey, 0);
             SetDefault(IsLyricsGlowEffectEnabledKey, true);
@@ -222,7 +206,6 @@ namespace BetterLyrics.WinUI3.Services
             SetDefault(IsFanLyricsEnabledKey, false);
 
             SetDefault(LibreTranslateServerKey, "");
-            SetDefault(IsLibreTranslateEnabledKey, false);
             SetDefault(IsTranslationEnabledKey, true);
             SetDefault(ShowTranslationOnlyKey, false);
             SetDefault(SelectedTargetLanguageIndexKey, LanguageHelper.GetDefaultTargetLanguageIndex());
@@ -249,7 +232,6 @@ namespace BetterLyrics.WinUI3.Services
             SetDefault(SelectedFontFamilyIndexKey, 0);
             SetDefault(LyricsFontFamilyKey, FontHelper.SystemFontFamilies.ElementAtOrDefault(0));
             SetDefault(IsDragEverywhereEnabledKey, false);
-            SetDefault(DockMonitorDeviceNameKey, MonitorHelper.GetPrimaryMonitorDeviceName());
         }
 
         public bool IsDragEverywhereEnabled
@@ -414,12 +396,6 @@ namespace BetterLyrics.WinUI3.Services
             set => SetValue(IsDynamicCoverOverlayEnabledKey, value);
         }
 
-        public int CoverAcrylicEffectAmount
-        {
-            get => GetValue<int>(CoverAcrylicEffectAmountKey);
-            set => SetValue(CoverAcrylicEffectAmountKey, value);
-        }
-
         public bool IsFanLyricsEnabled
         {
             get => GetValue<bool>(IsFanLyricsEnabledKey);
@@ -521,22 +497,10 @@ namespace BetterLyrics.WinUI3.Services
             set => SetValue(LyricsFontStrokeWidthKey, value);
         }
 
-        public int LyricsStandardFontSize
+        public int LyricsFontSize
         {
-            get => GetValue<int>(LyricsStandardFontSizeKey);
-            set => SetValue(LyricsStandardFontSizeKey, value);
-        }
-
-        public int LyricsDockFontSize
-        {
-            get => GetValue<int>(LyricsDockFontSizeKey);
-            set => SetValue(LyricsDockFontSizeKey, value);
-        }
-
-        public int LyricsDesktopFontSize
-        {
-            get => GetValue<int>(LyricsDesktopFontSizeKey);
-            set => SetValue(LyricsDesktopFontSizeKey, value);
+            get => GetValue<int>(LyricsFontSizeKey);
+            set => SetValue(LyricsFontSizeKey, value);
         }
 
         public LyricsFontWeight LyricsFontWeight
@@ -632,12 +596,6 @@ namespace BetterLyrics.WinUI3.Services
             set => SetValue(IsTranslationEnabledKey, value);
         }
 
-        public bool IsLibreTranslateEnabled
-        {
-            get => GetValue<bool>(IsLibreTranslateEnabledKey);
-            set => SetValue(IsLibreTranslateEnabledKey, value);
-        }
-
         public int SelectedTargetLanguageIndex
         {
             get => GetValue<int>(SelectedTargetLanguageIndexKey);
@@ -674,12 +632,6 @@ namespace BetterLyrics.WinUI3.Services
             set => SetValue(ResetPositionOffsetOnSongChangedKey, value);
         }
 
-        public PlaybackOrder PlaybackOrder
-        {
-            get => (PlaybackOrder)GetValue<int>(PlaybackOrderKey);
-            set => SetValue(PlaybackOrderKey, (int)value);
-        }
-
         public int PositionOffset
         {
             get => GetValue<int>(PositionOffsetKey);
@@ -692,12 +644,6 @@ namespace BetterLyrics.WinUI3.Services
             set => SetValue(IsImmersiveModeKey, value);
         }
 
-        public string DockMonitorDeviceName
-        {
-            get => GetValue<string>(DockMonitorDeviceNameKey)!;
-            set => SetValue(DockMonitorDeviceNameKey, value);
-        }
-
         private T? GetValue<T>(string key)
         {
             if (_localSettings.Values.TryGetValue(key, out object? value))

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>
@@ -250,7 +250,7 @@
     <value>この値を調整すると、アルバム画像のバックグラウンドブラー強度も増加します。</value>
   </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
-    <value>現在の値： </value>
+    <value>現在の値：</value>
   </data>
   <data name="SettingsPageLyricsBlurHighGPUUsage.Text" xml:space="preserve">
     <value>ぼかしが有効になっている場合のGPU使用量が大幅に高くなります（&gt; 0）</value>
@@ -264,14 +264,8 @@
   <data name="SettingsPageLyricsLineSpacingFactorUnit.Text" xml:space="preserve">
     <value>x線の高さ</value>
   </data>
-  <data name="SettingsPageLyricsStandardFontSize.Header" xml:space="preserve">
-    <value>フォントサイズ（標準モード）</value>
-  </data>
-  <data name="SettingsPageLyricsDockFontSize.Header" xml:space="preserve">
-    <value>フォントサイズ（ドックモード）</value>
-  </data>
-  <data name="SettingsPageLyricsDesktopFontSize.Header" xml:space="preserve">
-    <value>フォントサイズ（デスクトップモード）</value>
+  <data name="SettingsPageLyricsFontSize.Header" xml:space="preserve">
+    <value>フォントサイズ</value>
   </data>
   <data name="MainPageLyriscOnly.Content" xml:space="preserve">
     <value>歌詞のみ</value>
@@ -487,6 +481,9 @@
   <data name="LyricsSearchProviderLocalMusicFile" xml:space="preserve">
     <value>ローカル音楽ファイル</value>
   </data>
+  <data name="LyricsSearchProviderLrcLib" xml:space="preserve">
+    <value>LRCLIB</value>
+  </data>
   <data name="SettingsPageJA.Content" xml:space="preserve">
     <value>日本語</value>
   </data>
@@ -502,6 +499,18 @@
   <data name="SettingsPagePathIncludingOthersInfo" xml:space="preserve">
     <value>このフォルダーには追加されたフォルダーが含まれています。これらのフォルダを削除してフォルダーを追加してください</value>
   </data>
+  <data name="LyricsSearchProviderAmllTtmlDb" xml:space="preserve">
+    <value>amll-ttml-db</value>
+  </data>
+  <data name="LyricsSearchProviderQQ" xml:space="preserve">
+    <value>QQ</value>
+  </data>
+  <data name="LyricsSearchProviderNetease" xml:space="preserve">
+    <value>Netease</value>
+  </data>
+  <data name="LyricsSearchProviderKugou" xml:space="preserve">
+    <value>Kugou</value>
+  </data>
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>デバッグオーバーレイを表示します</value>
   </data>
@@ -584,7 +593,7 @@
     <value>歌詞タイムラインオフセット（ミリ秒）</value>
   </data>
   <data name="SettingsPageTranslationConfig.Header" xml:space="preserve">
-    <value>リブレットランレート翻訳サービス</value>
+    <value>翻訳サービスを構成します</value>
   </data>
   <data name="SettingsPageLibreTranslateServer.Header" xml:space="preserve">
     <value>サーバーアドレス</value>
@@ -784,136 +793,7 @@
   <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
     <value>タイトルバーをページ全体に拡張して、ウィンドウを非対話領域でドラッグできるようにします</value>
   </data>
-  <data name="SettingsPageBackgroundAcrylicEffectAmount.Header" xml:space="preserve">
-    <value>仿亚克力效果粗糙度</value>
-  </data>
   <data name="MusicGalleryPageTitle" xml:space="preserve">
-    <value>音楽ギャラリー - BetterLyrics</value>
-  </data>
-  <data name="LibreTranslateFailed" xml:space="preserve">
-    <value>リブレットランスレートからの翻訳のリクエストが失敗しました。設定またはネイティブリブレットランレート構成を確認してください</value>
-  </data>
-  <data name="MusicGalleryPageFileInfo.Text" xml:space="preserve">
-    <value>ファイル情報</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoTitle.Text" xml:space="preserve">
-    <value>タイトル</value>
-  </data>
-  <data name="MusicGalleryPageFileArtist.Text" xml:space="preserve">
-    <value>アーティスト</value>
-  </data>
-  <data name="MusicGalleryPageFileAlbum.Text" xml:space="preserve">
-    <value>アルバム</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoYear.Text" xml:space="preserve">
-    <value>年</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoDuration.Text" xml:space="preserve">
-    <value>間隔</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoBitrate.Text" xml:space="preserve">
-    <value>ビットレート</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoSampleRate.Text" xml:space="preserve">
-    <value>サンプルレート</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoBitDepth.Text" xml:space="preserve">
-    <value>ビットの深さ</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoFormat.Text" xml:space="preserve">
-    <value>形式</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoEncoder.Text" xml:space="preserve">
-    <value>エンコーダー</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoPath.Text" xml:space="preserve">
-    <value>パス</value>
-  </data>
-  <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
-    <value>曲を検索します</value>
-  </data>
-  <data name="MusicGalleryPageSortType.Text" xml:space="preserve">
-    <value>並べ替えタイプ</value>
-  </data>
-  <data name="MusicGalleryPageSortByTitle.Content" xml:space="preserve">
-    <value>タイトル</value>
-  </data>
-  <data name="MusicGalleryPageSortByAlbum.Content" xml:space="preserve">
-    <value>アルバム</value>
-  </data>
-  <data name="MusicGalleryPageSortByArtist.Content" xml:space="preserve">
-    <value>アーティスト</value>
-  </data>
-  <data name="MusicGalleryPageFileNotFound.Text" xml:space="preserve">
-    <value>メディアライブラリには歌が見つかりませんでした</value>
-  </data>
-  <data name="MusicGalleryPagePlayingQueue.Text" xml:space="preserve">
-    <value>キューを再生します</value>
-  </data>
-  <data name="MusicGalleryPageEmptyPlayingQueue.Content" xml:space="preserve">
-    <value>クリアプレイキュー</value>
-  </data>
-  <data name="MusicGalleryPageScrollToPlayingItem.Content" xml:space="preserve">
-    <value>アイテムを再生するための位置</value>
-  </data>
-  <data name="MusicGalleryPageQueueLoop.Content" xml:space="preserve">
-    <value>ループをリストします</value>
-  </data>
-  <data name="MusicGalleryPageSingleLoop.Content" xml:space="preserve">
-    <value>シングルループ</value>
-  </data>
-  <data name="MusicGalleryPageQueueRandom.Content" xml:space="preserve">
-    <value>ランダム</value>
-  </data>
-  <data name="MusicGalleryPageRemoveFromPlayingQueue.Text" xml:space="preserve">
-    <value>プレイリストから取り外します</value>
-  </data>
-  <data name="MusicGalleryPagePlayingQueueEmpty.Text" xml:space="preserve">
-    <value>キューを再生するのは空です</value>
-  </data>
-  <data name="MusicGalleryPageSelectAll.Content" xml:space="preserve">
-    <value>すべてを選択します</value>
-  </data>
-  <data name="MusicGalleryPageAddToPlayingQueue.Content" xml:space="preserve">
-    <value>キューを再生するために追加します</value>
-  </data>
-  <data name="MusicGalleryPageAddToNext.Text" xml:space="preserve">
-    <value>次のアイテム</value>
-  </data>
-  <data name="MusicGalleryPageAddToEnd.Text" xml:space="preserve">
-    <value>リストの終わり</value>
-  </data>
-  <data name="MusicGalleryPageAddToCustomList.Content" xml:space="preserve">
-    <value>プレイリストに追加します</value>
-  </data>
-  <data name="MusicGalleryPageNewPlaylist.Text" xml:space="preserve">
-    <value>プレイリストを作成します</value>
-  </data>
-  <data name="SystemTrayMusicGallery.Text" xml:space="preserve">
-    <value>オープンミュージックギャラリー</value>
-  </data>
-  <data name="TryRunMultipleInstance" xml:space="preserve">
-    <value>BetterLyrics はすでに実行されています！</value>
-  </data>
-  <data name="MusicGalleryPageAllSongs" xml:space="preserve">
-    <value>すべての曲</value>
-  </data>
-  <data name="SettingsPageTelegram.Header" xml:space="preserve">
-    <value>Telegram</value>
-  </data>
-  <data name="LyricsPageLyricsProviderPrefix.Text" xml:space="preserve">
-    <value>歌詞プロバイダー</value>
-  </data>
-  <data name="LyricsPageTranslationProviderPrefix.Text" xml:space="preserve">
-    <value>翻訳プロバイダー</value>
-  </data>
-  <data name="SettingsPageDockMonitor.Header" xml:space="preserve">
-    <value>ターゲットモニター</value>
-  </data>
-  <data name="SystemTrayRestart.Text" xml:space="preserve">
-    <value>再アート</value>
-  </data>
-  <data name="SystemTrayResetWindowPosition.Text" xml:space="preserve">
-    <value>ウィンドウの位置をリセットします</value>
+    <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>
@@ -250,7 +250,7 @@
     <value>이 값을 조정하면 앨범 이미지의 배경 흐림 강도가 증가합니다.</value>
   </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
-    <value>현재 가치 : </value>
+    <value>현재 가치 :</value>
   </data>
   <data name="SettingsPageLyricsBlurHighGPUUsage.Text" xml:space="preserve">
     <value>Blur가 활성화 될 때 상당히 높은 GPU 사용량 (&gt; 0)</value>
@@ -264,14 +264,8 @@
   <data name="SettingsPageLyricsLineSpacingFactorUnit.Text" xml:space="preserve">
     <value>X 라인 높이</value>
   </data>
-  <data name="SettingsPageLyricsStandardFontSize.Header" xml:space="preserve">
-    <value>글꼴 크기 (표준 모드)</value>
-  </data>
-  <data name="SettingsPageLyricsDockFontSize.Header" xml:space="preserve">
-    <value>글꼴 크기 (도크 모드)</value>
-  </data>
-  <data name="SettingsPageLyricsDesktopFontSize.Header" xml:space="preserve">
-    <value>글꼴 크기 (데스크탑 모드)</value>
+  <data name="SettingsPageLyricsFontSize.Header" xml:space="preserve">
+    <value>글꼴 크기</value>
   </data>
   <data name="MainPageLyriscOnly.Content" xml:space="preserve">
     <value>가사 만</value>
@@ -487,6 +481,9 @@
   <data name="LyricsSearchProviderLocalMusicFile" xml:space="preserve">
     <value>로컬 음악 파일</value>
   </data>
+  <data name="LyricsSearchProviderLrcLib" xml:space="preserve">
+    <value>LRCLIB</value>
+  </data>
   <data name="SettingsPageJA.Content" xml:space="preserve">
     <value>日本語</value>
   </data>
@@ -502,6 +499,18 @@
   <data name="SettingsPagePathIncludingOthersInfo" xml:space="preserve">
     <value>이 폴더에는 추가 된 폴더가 포함되어 있습니다. 폴더를 추가하려면이 폴더를 삭제하십시오.</value>
   </data>
+  <data name="LyricsSearchProviderAmllTtmlDb" xml:space="preserve">
+    <value>amll-ttml-db</value>
+  </data>
+  <data name="LyricsSearchProviderQQ" xml:space="preserve">
+    <value>QQ</value>
+  </data>
+  <data name="LyricsSearchProviderNetease" xml:space="preserve">
+    <value>Netease</value>
+  </data>
+  <data name="LyricsSearchProviderKugou" xml:space="preserve">
+    <value>Kugou</value>
+  </data>
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>디버그 오버레이를 표시하십시오</value>
   </data>
@@ -584,7 +593,7 @@
     <value>가사 타임 라인 오프셋 (밀리초)</value>
   </data>
   <data name="SettingsPageTranslationConfig.Header" xml:space="preserve">
-    <value>libretranslate 번역 서비스</value>
+    <value>번역 서비스를 구성하십시오</value>
   </data>
   <data name="SettingsPageLibreTranslateServer.Header" xml:space="preserve">
     <value>서버 주소</value>
@@ -770,7 +779,7 @@
     <value>자동 가죽 창</value>
   </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
-    <value>도크 모드 또는 데스크탑 모드에서 재생되지 않을 때는 창을 자동으로 숨기고 있습니다</value>
+    <value>도크 모드 또는 데스크탑 모드에서 재생되지 않을 때는 창을 자동으로 숨기고 있습니다.</value>
   </data>
   <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
     <value>창 높이</value>
@@ -784,136 +793,7 @@
   <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
     <value>비 중과 영역에서 창을 드래그 할 수 있도록 제목 표시 줄을 전체 페이지로 확장하십시오.</value>
   </data>
-  <data name="SettingsPageBackgroundAcrylicEffectAmount.Header" xml:space="preserve">
-    <value>仿亚克力效果粗糙度</value>
-  </data>
   <data name="MusicGalleryPageTitle" xml:space="preserve">
-    <value>음악 갤러리 - BetterLyrics</value>
-  </data>
-  <data name="LibreTranslateFailed" xml:space="preserve">
-    <value>LibreTranslate에서 번역 요청 실패, 설정 또는 기본 LibreTranslate 구성을 확인하십시오.</value>
-  </data>
-  <data name="MusicGalleryPageFileInfo.Text" xml:space="preserve">
-    <value>파일 정보</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoTitle.Text" xml:space="preserve">
-    <value>제목</value>
-  </data>
-  <data name="MusicGalleryPageFileArtist.Text" xml:space="preserve">
-    <value>아티스트</value>
-  </data>
-  <data name="MusicGalleryPageFileAlbum.Text" xml:space="preserve">
-    <value>앨범</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoYear.Text" xml:space="preserve">
-    <value>년도</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoDuration.Text" xml:space="preserve">
-    <value>지속</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoBitrate.Text" xml:space="preserve">
-    <value>비트 레이트</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoSampleRate.Text" xml:space="preserve">
-    <value>샘플 속도</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoBitDepth.Text" xml:space="preserve">
-    <value>비트 깊이</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoFormat.Text" xml:space="preserve">
-    <value>체재</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoEncoder.Text" xml:space="preserve">
-    <value>인코더</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoPath.Text" xml:space="preserve">
-    <value>길</value>
-  </data>
-  <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
-    <value>노래 검색</value>
-  </data>
-  <data name="MusicGalleryPageSortType.Text" xml:space="preserve">
-    <value>정렬 유형</value>
-  </data>
-  <data name="MusicGalleryPageSortByTitle.Content" xml:space="preserve">
-    <value>제목</value>
-  </data>
-  <data name="MusicGalleryPageSortByAlbum.Content" xml:space="preserve">
-    <value>앨범</value>
-  </data>
-  <data name="MusicGalleryPageSortByArtist.Content" xml:space="preserve">
-    <value>아티스트</value>
-  </data>
-  <data name="MusicGalleryPageFileNotFound.Text" xml:space="preserve">
-    <value>미디어 라이브러리에는 노래가 없습니다</value>
-  </data>
-  <data name="MusicGalleryPagePlayingQueue.Text" xml:space="preserve">
-    <value>대기열을 재생하십시오</value>
-  </data>
-  <data name="MusicGalleryPageEmptyPlayingQueue.Content" xml:space="preserve">
-    <value>플레이 대기열을 클리어합니다</value>
-  </data>
-  <data name="MusicGalleryPageScrollToPlayingItem.Content" xml:space="preserve">
-    <value>아이템을 재생하기위한 포지셔닝</value>
-  </data>
-  <data name="MusicGalleryPageQueueLoop.Content" xml:space="preserve">
-    <value>목록 루프</value>
-  </data>
-  <data name="MusicGalleryPageSingleLoop.Content" xml:space="preserve">
-    <value>단일 루프</value>
-  </data>
-  <data name="MusicGalleryPageQueueRandom.Content" xml:space="preserve">
-    <value>무작위의</value>
-  </data>
-  <data name="MusicGalleryPageRemoveFromPlayingQueue.Text" xml:space="preserve">
-    <value>재생 목록에서 제거하십시오</value>
-  </data>
-  <data name="MusicGalleryPagePlayingQueueEmpty.Text" xml:space="preserve">
-    <value>플레이 대기열이 비어 있습니다</value>
-  </data>
-  <data name="MusicGalleryPageSelectAll.Content" xml:space="preserve">
-    <value>모두를 선택하십시오</value>
-  </data>
-  <data name="MusicGalleryPageAddToPlayingQueue.Content" xml:space="preserve">
-    <value>재생 큐에 추가하십시오</value>
-  </data>
-  <data name="MusicGalleryPageAddToNext.Text" xml:space="preserve">
-    <value>다음 항목</value>
-  </data>
-  <data name="MusicGalleryPageAddToEnd.Text" xml:space="preserve">
-    <value>목록의 끝</value>
-  </data>
-  <data name="MusicGalleryPageAddToCustomList.Content" xml:space="preserve">
-    <value>재생 목록에 추가하십시오</value>
-  </data>
-  <data name="MusicGalleryPageNewPlaylist.Text" xml:space="preserve">
-    <value>재생 목록을 만듭니다</value>
-  </data>
-  <data name="SystemTrayMusicGallery.Text" xml:space="preserve">
-    <value>오픈 음악 갤러리</value>
-  </data>
-  <data name="TryRunMultipleInstance" xml:space="preserve">
-    <value>BetterLyrics 가 이미 실행 중입니다</value>
-  </data>
-  <data name="MusicGalleryPageAllSongs" xml:space="preserve">
-    <value>모든 노래</value>
-  </data>
-  <data name="SettingsPageTelegram.Header" xml:space="preserve">
-    <value>Telegram</value>
-  </data>
-  <data name="LyricsPageLyricsProviderPrefix.Text" xml:space="preserve">
-    <value>가사 제공자</value>
-  </data>
-  <data name="LyricsPageTranslationProviderPrefix.Text" xml:space="preserve">
-    <value>번역 제공자</value>
-  </data>
-  <data name="SettingsPageDockMonitor.Header" xml:space="preserve">
-    <value>대상 모니터</value>
-  </data>
-  <data name="SystemTrayRestart.Text" xml:space="preserve">
-    <value>resart</value>
-  </data>
-  <data name="SystemTrayResetWindowPosition.Text" xml:space="preserve">
-    <value>창 위치를 재설정합니다</value>
+    <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>
@@ -250,7 +250,7 @@
     <value>调整该数值将同步提高专辑图片背景模糊强度</value>
   </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
-    <value>当前值： </value>
+    <value>当前值：</value>
   </data>
   <data name="SettingsPageLyricsBlurHighGPUUsage.Text" xml:space="preserve">
     <value>启用模糊（&gt; 0）时将显著提升 GPU 占用率</value>
@@ -264,14 +264,8 @@
   <data name="SettingsPageLyricsLineSpacingFactorUnit.Text" xml:space="preserve">
     <value> 倍行高</value>
   </data>
-  <data name="SettingsPageLyricsStandardFontSize.Header" xml:space="preserve">
-    <value>字体尺寸（标准模式）</value>
-  </data>
-  <data name="SettingsPageLyricsDockFontSize.Header" xml:space="preserve">
-    <value>字体大小（停靠模式）</value>
-  </data>
-  <data name="SettingsPageLyricsDesktopFontSize.Header" xml:space="preserve">
-    <value>字体尺寸（桌面模式）</value>
+  <data name="SettingsPageLyricsFontSize.Header" xml:space="preserve">
+    <value>字体大小</value>
   </data>
   <data name="MainPageLyriscOnly.Content" xml:space="preserve">
     <value>仅显示歌词</value>
@@ -487,6 +481,9 @@
   <data name="LyricsSearchProviderLocalMusicFile" xml:space="preserve">
     <value>本地音乐文件</value>
   </data>
+  <data name="LyricsSearchProviderLrcLib" xml:space="preserve">
+    <value>LRCLIB</value>
+  </data>
   <data name="SettingsPageJA.Content" xml:space="preserve">
     <value>日本語</value>
   </data>
@@ -502,6 +499,18 @@
   <data name="SettingsPagePathIncludingOthersInfo" xml:space="preserve">
     <value>该文件夹包含已添加文件夹，请删除这些文件夹以添加该文件夹</value>
   </data>
+  <data name="LyricsSearchProviderAmllTtmlDb" xml:space="preserve">
+    <value>amll-ttml-db</value>
+  </data>
+  <data name="LyricsSearchProviderQQ" xml:space="preserve">
+    <value>QQ</value>
+  </data>
+  <data name="LyricsSearchProviderNetease" xml:space="preserve">
+    <value>Netease</value>
+  </data>
+  <data name="LyricsSearchProviderKugou" xml:space="preserve">
+    <value>Kugou</value>
+  </data>
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>显示调试覆盖层</value>
   </data>
@@ -584,7 +593,7 @@
     <value>歌词时间轴偏移（毫秒）</value>
   </data>
   <data name="SettingsPageTranslationConfig.Header" xml:space="preserve">
-    <value>LibreTranslate 翻译服务</value>
+    <value>配置翻译服务</value>
   </data>
   <data name="SettingsPageLibreTranslateServer.Header" xml:space="preserve">
     <value>服务器地址</value>
@@ -641,7 +650,7 @@
     <value>设置</value>
   </data>
   <data name="TranslateServerNotSet" xml:space="preserve">
-    <value>未设置Translate服务器，请先在设置中进行配置</value>
+    <value>未设置翻译服务器，请先在设置中进行配置</value>
   </data>
   <data name="LyricsPagePositionOffsetHint.Text" xml:space="preserve">
     <value>切换歌曲时重置为 0</value>
@@ -784,136 +793,7 @@
   <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
     <value>将标题栏扩展至整个页面使得在任意非交互区域均可拖拽窗口</value>
   </data>
-  <data name="SettingsPageBackgroundAcrylicEffectAmount.Header" xml:space="preserve">
-    <value>仿亚克力效果粗糙度</value>
-  </data>
   <data name="MusicGalleryPageTitle" xml:space="preserve">
-    <value>音乐库 - BetterLyrics</value>
-  </data>
-  <data name="LibreTranslateFailed" xml:space="preserve">
-    <value>向 LibreTranslate 请求翻译失败，请检查设置或本机 LibreTranslate 配置</value>
-  </data>
-  <data name="MusicGalleryPageFileInfo.Text" xml:space="preserve">
-    <value>文件信息</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoTitle.Text" xml:space="preserve">
-    <value>标题</value>
-  </data>
-  <data name="MusicGalleryPageFileArtist.Text" xml:space="preserve">
-    <value>艺术家</value>
-  </data>
-  <data name="MusicGalleryPageFileAlbum.Text" xml:space="preserve">
-    <value>专辑</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoYear.Text" xml:space="preserve">
-    <value>年</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoDuration.Text" xml:space="preserve">
-    <value>期间</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoBitrate.Text" xml:space="preserve">
-    <value>比特率</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoSampleRate.Text" xml:space="preserve">
-    <value>样本率</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoBitDepth.Text" xml:space="preserve">
-    <value>位深度</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoFormat.Text" xml:space="preserve">
-    <value>格式</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoEncoder.Text" xml:space="preserve">
-    <value>编码器</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoPath.Text" xml:space="preserve">
-    <value>路径</value>
-  </data>
-  <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
-    <value>搜索歌曲</value>
-  </data>
-  <data name="MusicGalleryPageSortType.Text" xml:space="preserve">
-    <value>排序类型</value>
-  </data>
-  <data name="MusicGalleryPageSortByTitle.Content" xml:space="preserve">
-    <value>标题</value>
-  </data>
-  <data name="MusicGalleryPageSortByAlbum.Content" xml:space="preserve">
-    <value>专辑</value>
-  </data>
-  <data name="MusicGalleryPageSortByArtist.Content" xml:space="preserve">
-    <value>艺术家</value>
-  </data>
-  <data name="MusicGalleryPageFileNotFound.Text" xml:space="preserve">
-    <value>未在媒体库内找到任何歌曲</value>
-  </data>
-  <data name="MusicGalleryPagePlayingQueue.Text" xml:space="preserve">
-    <value>播放队列</value>
-  </data>
-  <data name="MusicGalleryPageEmptyPlayingQueue.Content" xml:space="preserve">
-    <value>清除播放队列</value>
-  </data>
-  <data name="MusicGalleryPageScrollToPlayingItem.Content" xml:space="preserve">
-    <value>定位到播放项</value>
-  </data>
-  <data name="MusicGalleryPageQueueLoop.Content" xml:space="preserve">
-    <value>列表循环</value>
-  </data>
-  <data name="MusicGalleryPageSingleLoop.Content" xml:space="preserve">
-    <value>单曲循环</value>
-  </data>
-  <data name="MusicGalleryPageQueueRandom.Content" xml:space="preserve">
-    <value>随机</value>
-  </data>
-  <data name="MusicGalleryPageRemoveFromPlayingQueue.Text" xml:space="preserve">
-    <value>从播放列表移除</value>
-  </data>
-  <data name="MusicGalleryPagePlayingQueueEmpty.Text" xml:space="preserve">
-    <value>播放队列是空的</value>
-  </data>
-  <data name="MusicGalleryPageSelectAll.Content" xml:space="preserve">
-    <value>选择全部</value>
-  </data>
-  <data name="MusicGalleryPageAddToPlayingQueue.Content" xml:space="preserve">
-    <value>添加到播放队列</value>
-  </data>
-  <data name="MusicGalleryPageAddToNext.Text" xml:space="preserve">
-    <value>下一个项目</value>
-  </data>
-  <data name="MusicGalleryPageAddToEnd.Text" xml:space="preserve">
-    <value>列表的结尾</value>
-  </data>
-  <data name="MusicGalleryPageAddToCustomList.Content" xml:space="preserve">
-    <value>添加到歌单</value>
-  </data>
-  <data name="MusicGalleryPageNewPlaylist.Text" xml:space="preserve">
-    <value>创建歌单</value>
-  </data>
-  <data name="SystemTrayMusicGallery.Text" xml:space="preserve">
-    <value>打开音乐库</value>
-  </data>
-  <data name="TryRunMultipleInstance" xml:space="preserve">
-    <value>BetterLyrics 已经在运行</value>
-  </data>
-  <data name="MusicGalleryPageAllSongs" xml:space="preserve">
-    <value>所有歌曲</value>
-  </data>
-  <data name="SettingsPageTelegram.Header" xml:space="preserve">
-    <value>Telegram</value>
-  </data>
-  <data name="LyricsPageLyricsProviderPrefix.Text" xml:space="preserve">
-    <value>歌词来源</value>
-  </data>
-  <data name="LyricsPageTranslationProviderPrefix.Text" xml:space="preserve">
-    <value>翻译来源</value>
-  </data>
-  <data name="SettingsPageDockMonitor.Header" xml:space="preserve">
-    <value>目标显示器</value>
-  </data>
-  <data name="SystemTrayRestart.Text" xml:space="preserve">
-    <value>重新启动</value>
-  </data>
-  <data name="SystemTrayResetWindowPosition.Text" xml:space="preserve">
-    <value>重置窗口位置</value>
+    <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>
@@ -127,7 +127,7 @@
     <value>在檔案總管中開啟</value>
   </data>
   <data name="SettingsPageRemovePath.Content" xml:space="preserve">
-    <value>從應用程序中移除</value>
+    <value>從應用程式中移除</value>
   </data>
   <data name="SettingsPageRemoveInfo.Title" xml:space="preserve">
     <value>您可以安全刪除以下項目</value>
@@ -250,7 +250,7 @@
     <value>調整此數值將同步提升專輯圖片背景模糊強度</value>
   </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
-    <value>目前值： </value>
+    <value>目前值：</value>
   </data>
   <data name="SettingsPageLyricsBlurHighGPUUsage.Text" xml:space="preserve">
     <value>啟用模糊（&gt; 0）時將顯著提升 GPU 佔用率</value>
@@ -264,14 +264,8 @@
   <data name="SettingsPageLyricsLineSpacingFactorUnit.Text" xml:space="preserve">
     <value> 倍行高</value>
   </data>
-  <data name="SettingsPageLyricsStandardFontSize.Header" xml:space="preserve">
-    <value>字體尺寸（標準模式）</value>
-  </data>
-  <data name="SettingsPageLyricsDockFontSize.Header" xml:space="preserve">
-    <value>字體大小（停靠模式）</value>
-  </data>
-  <data name="SettingsPageLyricsDesktopFontSize.Header" xml:space="preserve">
-    <value>字體尺寸（桌面模式）</value>
+  <data name="SettingsPageLyricsFontSize.Header" xml:space="preserve">
+    <value>字體大小</value>
   </data>
   <data name="MainPageLyriscOnly.Content" xml:space="preserve">
     <value>僅顯示歌詞</value>
@@ -487,6 +481,9 @@
   <data name="LyricsSearchProviderLocalMusicFile" xml:space="preserve">
     <value>本地音樂文件</value>
   </data>
+  <data name="LyricsSearchProviderLrcLib" xml:space="preserve">
+    <value>LRCLIB</value>
+  </data>
   <data name="SettingsPageJA.Content" xml:space="preserve">
     <value>日本語</value>
   </data>
@@ -502,6 +499,18 @@
   <data name="SettingsPagePathIncludingOthersInfo" xml:space="preserve">
     <value>該文件夾包含已添加文件夾，請刪除這些文件夾以添加該文件夾</value>
   </data>
+  <data name="LyricsSearchProviderAmllTtmlDb" xml:space="preserve">
+    <value>amll-ttml-db</value>
+  </data>
+  <data name="LyricsSearchProviderQQ" xml:space="preserve">
+    <value>QQ</value>
+  </data>
+  <data name="LyricsSearchProviderNetease" xml:space="preserve">
+    <value>Netease</value>
+  </data>
+  <data name="LyricsSearchProviderKugou" xml:space="preserve">
+    <value>Kugou</value>
+  </data>
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>顯示調試覆蓋層</value>
   </data>
@@ -563,7 +572,7 @@
     <value>歌曲標題和藝術家</value>
   </data>
   <data name="SettingsPageEasingFuncType.Header" xml:space="preserve">
-    <value>緩動動畫類型</value>
+    <value>缓动动画类型</value>
   </data>
   <data name="SettingsPagePlaybackLib.Content" xml:space="preserve">
     <value>播放來源</value>
@@ -581,10 +590,10 @@
     <value>歌詞翻譯</value>
   </data>
   <data name="MainPagePositionOffsetSlider.Header" xml:space="preserve">
-    <value>歌詞時間軌偏移（毫秒）</value>
+    <value>歌詞時間軸偏移（毫秒）</value>
   </data>
   <data name="SettingsPageTranslationConfig.Header" xml:space="preserve">
-    <value>LibreTranslate 翻譯服務</value>
+    <value>配置翻譯服務</value>
   </data>
   <data name="SettingsPageLibreTranslateServer.Header" xml:space="preserve">
     <value>服務器地址</value>
@@ -596,7 +605,7 @@
     <value>目標語言</value>
   </data>
   <data name="SettingsPageTranslationInfo.Header" xml:space="preserve">
-    <value>翻譯服務由 LibreTranslate 驅動</value>
+    <value>翻译服务由 LibreTranslate 驱动</value>
   </data>
   <data name="SettingsPageTranslationInfoLink.Text" xml:space="preserve">
     <value>造訪 https://github.com/LibreTranslate/LibreTranslate 以取得安裝教學及更多資訊（本軟體與此翻譯服務無任何關聯）</value>
@@ -611,13 +620,13 @@
     <value>歌詞描邊寬度（僅桌面模式）</value>
   </data>
   <data name="SettingsPageFollowSystem.Content" xml:space="preserve">
-    <value>跟隨系統</value>
+    <value>跟随系统</value>
   </data>
   <data name="SettingsPageAutoStart.Header" xml:space="preserve">
     <value>自動啟動</value>
   </data>
   <data name="SettingsPageLyricsStrokeFontColor.Header" xml:space="preserve">
-    <value>歌詞描邊顏色（僅桌面模式）</value>
+    <value>歌词描边颜色（仅桌面模式）</value>
   </data>
   <data name="SettingsPageIgnoreFullscreenWindow.Header" xml:space="preserve">
     <value>始終顯示在全螢幕應用程式上方</value>
@@ -716,7 +725,7 @@
     <value>高亮顯示範圍</value>
   </data>
   <data name="SettingsPageLyricsTimelineThreshold.Header" xml:space="preserve">
-    <value>歌詞時間軌同步閾值</value>
+    <value>歌詞時間軸同步閾值</value>
   </data>
   <data name="SettingsPageLyricsTimelineThreshold.Description" xml:space="preserve">
     <value>當歌詞進度抖動時，請嘗試增加該閾值；更改此值會導致歌詞同步偏差</value>
@@ -784,136 +793,7 @@
   <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
     <value>將標題列擴展至整個頁面使得在任意非互動區域均可拖曳窗口</value>
   </data>
-  <data name="SettingsPageBackgroundAcrylicEffectAmount.Header" xml:space="preserve">
-    <value>仿亚克力效果粗糙度</value>
-  </data>
   <data name="MusicGalleryPageTitle" xml:space="preserve">
-    <value>音樂庫 - BetterLyrics</value>
-  </data>
-  <data name="LibreTranslateFailed" xml:space="preserve">
-    <value>向 LibreTranslate 請求翻譯失敗，請檢查設置或本機 LibreTranslate 配置</value>
-  </data>
-  <data name="MusicGalleryPageFileInfo.Text" xml:space="preserve">
-    <value>文件信息</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoTitle.Text" xml:space="preserve">
-    <value>標題</value>
-  </data>
-  <data name="MusicGalleryPageFileArtist.Text" xml:space="preserve">
-    <value>藝術家</value>
-  </data>
-  <data name="MusicGalleryPageFileAlbum.Text" xml:space="preserve">
-    <value>專輯</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoYear.Text" xml:space="preserve">
-    <value>年</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoDuration.Text" xml:space="preserve">
-    <value>期間</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoBitrate.Text" xml:space="preserve">
-    <value>比特率</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoSampleRate.Text" xml:space="preserve">
-    <value>樣本率</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoBitDepth.Text" xml:space="preserve">
-    <value>位深度</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoFormat.Text" xml:space="preserve">
-    <value>格式</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoEncoder.Text" xml:space="preserve">
-    <value>編碼器</value>
-  </data>
-  <data name="MusicGalleryPageFileInfoPath.Text" xml:space="preserve">
-    <value>路徑</value>
-  </data>
-  <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
-    <value>搜索歌曲</value>
-  </data>
-  <data name="MusicGalleryPageSortType.Text" xml:space="preserve">
-    <value>排序類型</value>
-  </data>
-  <data name="MusicGalleryPageSortByTitle.Content" xml:space="preserve">
-    <value>標題</value>
-  </data>
-  <data name="MusicGalleryPageSortByAlbum.Content" xml:space="preserve">
-    <value>專輯</value>
-  </data>
-  <data name="MusicGalleryPageSortByArtist.Content" xml:space="preserve">
-    <value>藝術家</value>
-  </data>
-  <data name="MusicGalleryPageFileNotFound.Text" xml:space="preserve">
-    <value>未在媒體庫內找到任何歌曲</value>
-  </data>
-  <data name="MusicGalleryPagePlayingQueue.Text" xml:space="preserve">
-    <value>清除播放</value>
-  </data>
-  <data name="MusicGalleryPageEmptyPlayingQueue.Content" xml:space="preserve">
-    <value>清除播放隊列</value>
-  </data>
-  <data name="MusicGalleryPageScrollToPlayingItem.Content" xml:space="preserve">
-    <value>定位到播放項</value>
-  </data>
-  <data name="MusicGalleryPageQueueLoop.Content" xml:space="preserve">
-    <value>列表循環</value>
-  </data>
-  <data name="MusicGalleryPageSingleLoop.Content" xml:space="preserve">
-    <value>單曲循環</value>
-  </data>
-  <data name="MusicGalleryPageQueueRandom.Content" xml:space="preserve">
-    <value>隨機</value>
-  </data>
-  <data name="MusicGalleryPageRemoveFromPlayingQueue.Text" xml:space="preserve">
-    <value>從播放列表移除</value>
-  </data>
-  <data name="MusicGalleryPagePlayingQueueEmpty.Text" xml:space="preserve">
-    <value>播放隊列是空的</value>
-  </data>
-  <data name="MusicGalleryPageSelectAll.Content" xml:space="preserve">
-    <value>選擇全部</value>
-  </data>
-  <data name="MusicGalleryPageAddToPlayingQueue.Content" xml:space="preserve">
-    <value>新增到播放隊列</value>
-  </data>
-  <data name="MusicGalleryPageAddToNext.Text" xml:space="preserve">
-    <value>下一個項目</value>
-  </data>
-  <data name="MusicGalleryPageAddToEnd.Text" xml:space="preserve">
-    <value>列表的結尾</value>
-  </data>
-  <data name="MusicGalleryPageAddToCustomList.Content" xml:space="preserve">
-    <value>添加到歌單</value>
-  </data>
-  <data name="MusicGalleryPageNewPlaylist.Text" xml:space="preserve">
-    <value>建立歌單</value>
-  </data>
-  <data name="SystemTrayMusicGallery.Text" xml:space="preserve">
-    <value>開啟音樂庫</value>
-  </data>
-  <data name="TryRunMultipleInstance" xml:space="preserve">
-    <value>BetterLyrics 已經在運作</value>
-  </data>
-  <data name="MusicGalleryPageAllSongs" xml:space="preserve">
-    <value>所有歌曲</value>
-  </data>
-  <data name="SettingsPageTelegram.Header" xml:space="preserve">
-    <value>Telegram</value>
-  </data>
-  <data name="LyricsPageLyricsProviderPrefix.Text" xml:space="preserve">
-    <value>歌詞來源</value>
-  </data>
-  <data name="LyricsPageTranslationProviderPrefix.Text" xml:space="preserve">
-    <value>翻譯來源</value>
-  </data>
-  <data name="SettingsPageDockMonitor.Header" xml:space="preserve">
-    <value>目標顯示器</value>
-  </data>
-  <data name="SystemTrayRestart.Text" xml:space="preserve">
-    <value>重新啟動</value>
-  </data>
-  <data name="SystemTrayResetWindowPosition.Text" xml:space="preserve">
-    <value>重置窗口位置</value>
+    <value>音樂庫</value>
   </data>
 </root>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/TemplateSelector/SongOrderTemplateSelector.cs

@@ -1,25 +0,0 @@
-using BetterLyrics.WinUI3.Enums;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-
-namespace BetterLyrics.WinUI3.TemplateSelector;
-
-public class SongOrderTemplateSelector : DataTemplateSelector
-{
-    public DataTemplate ByTitleTemplate { get; set; }
-    public DataTemplate ByAlbumTemplate { get; set; }
-    public DataTemplate ByArtistTemplate { get; set; }
-
-    public CommonSongProperty SongOrderType { get; set; }
-
-    protected override DataTemplate SelectTemplateCore(object item)
-    {
-        return SongOrderType switch
-        {
-            CommonSongProperty.Title => ByTitleTemplate,
-            CommonSongProperty.Album => ByAlbumTemplate,
-            CommonSongProperty.Artist => ByArtistTemplate,
-            _ => ByTitleTemplate
-        };
-    }
-}

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

@@ -1,23 +1,23 @@
 // 2025/6/23 by Zhe Fang
 
+using System;
 using BetterLyrics.WinUI3.Services;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.UI.Dispatching;
-using System;
-using System.Runtime.InteropServices;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
     public partial class BaseViewModel : ObservableRecipient
     {
         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;

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

@@ -23,20 +23,11 @@ namespace BetterLyrics.WinUI3.ViewModels
         IRecipient<PropertyChangedMessage<bool>>,
         IRecipient<PropertyChangedMessage<int>>,
         IRecipient<PropertyChangedMessage<string>>,
-        IRecipient<PropertyChangedMessage<TimeSpan>>,
-        IRecipient<PropertyChangedMessage<LyricsSearchProvider?>>,
-        IRecipient<PropertyChangedMessage<TranslationSearchProvider?>>
+        IRecipient<PropertyChangedMessage<TimeSpan>>
     {
         private readonly IPlaybackService _playbackService;
         private readonly ThrottleHelper _timelineThrottle = new(TimeSpan.FromSeconds(1));
 
-        private bool _isDockMode = false;
-        private bool _isDesktopMode = false;
-
-        private int _lyricsStandardFontSize = 8;
-        private int _lyricsDockFontSize = 8;
-        private int _lyricsDesktopFontSize = 8;
-
         public LyricsPageViewModel(ISettingsService settingsService, IPlaybackService playbackService) : base(settingsService)
         {
             IsFirstRun = _settingsService.IsFirstRun;
@@ -46,9 +37,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             PositionOffset = _settingsService.PositionOffset;
             IsImmersiveMode = _settingsService.IsImmersiveMode;
             ShowTranslationOnly = _settingsService.ShowTranslationOnly;
-
-            UpdateHintMessageFontSize();
-
+            LyricsFontSize = _settingsService.LyricsFontSize;
             LyricsFontFamily = _settingsService.LyricsFontFamily;
 
             OnIsImmersiveModeChanged(IsImmersiveMode);
@@ -59,16 +48,10 @@ namespace BetterLyrics.WinUI3.ViewModels
             _playbackService = playbackService;
             _playbackService.SongInfoChanged += PlaybackService_SongInfoChanged;
             _playbackService.IsPlayingChanged += PlaybackService_IsPlayingChanged;
-            _playbackService.TimelineChanged += PlaybackService_TimelineChanged;
 
             IsSongPlaying = _playbackService.IsPlaying;
         }
 
-        private void PlaybackService_TimelineChanged(object? sender, Events.TimelineChangedEventArgs e)
-        {
-            SongDurationSeconds = (int)e.End.TotalSeconds;
-        }
-
         //private void SystemVolumeHelper_VolumeChanged(int volume)
         //{
         //    Volume = volume;
@@ -102,7 +85,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         public partial string LyricsFontFamily { get; set; }
 
         [ObservableProperty]
-        public partial int HintMessageFontSize { get; set; }
+        public partial int LyricsFontSize { get; set; }
 
         [ObservableProperty]
         public partial bool IsImmersiveMode { get; set; }
@@ -145,35 +128,12 @@ namespace BetterLyrics.WinUI3.ViewModels
         [ObservableProperty]
         public partial bool IsSongPlaying { get; set; }
 
-        [ObservableProperty]
-        public partial LyricsSearchProvider? LyricsSearchProvider { get; set; } = null;
-
-        [ObservableProperty]
-        public partial TranslationSearchProvider? TranslationSearchProvider { get; set; } = null;
-
-        private void UpdateHintMessageFontSize()
-        {
-            if (_isDockMode)
-            {
-                HintMessageFontSize = _settingsService.LyricsDockFontSize;
-            }
-            else if (_isDesktopMode)
-            {
-                HintMessageFontSize = _settingsService.LyricsDesktopFontSize;
-            }
-            else
-            {
-                HintMessageFontSize = _settingsService.LyricsStandardFontSize;
-            }
-        }
-
         public void Receive(PropertyChangedMessage<bool> message)
         {
             if (message.Sender is LyricsWindowViewModel)
             {
                 if (message.PropertyName == nameof(LyricsWindowViewModel.IsDockMode))
                 {
-                    _isDockMode = message.NewValue;
                     if (message.NewValue)
                     {
                         DisplayType = LyricsDisplayType.LyricsOnly;
@@ -182,11 +142,9 @@ namespace BetterLyrics.WinUI3.ViewModels
                     {
                         DisplayType = _settingsService.DisplayType;
                     }
-                    UpdateHintMessageFontSize();
                 }
                 else if (message.PropertyName == nameof(LyricsWindowViewModel.IsDesktopMode))
                 {
-                    _isDesktopMode = message.NewValue;
                     if (message.NewValue)
                     {
                         DisplayType = LyricsDisplayType.LyricsOnly;
@@ -195,7 +153,6 @@ namespace BetterLyrics.WinUI3.ViewModels
                     {
                         DisplayType = _settingsService.DisplayType;
                     }
-                    UpdateHintMessageFontSize();
                 }
                 else if (message.PropertyName == nameof(LyricsWindowViewModel.IsImmersiveMode))
                 {
@@ -273,17 +230,9 @@ namespace BetterLyrics.WinUI3.ViewModels
         {
             if (message.Sender is SettingsPageViewModel)
             {
-                if (message.PropertyName == nameof(SettingsPageViewModel.LyricsStandardFontSize))
+                if (message.PropertyName == nameof(SettingsPageViewModel.LyricsFontSize))
                 {
-                    UpdateHintMessageFontSize();
-                }
-                else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsDockFontSize))
-                {
-                    UpdateHintMessageFontSize();
-                }
-                else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsDesktopFontSize))
-                {
-                    UpdateHintMessageFontSize();
+                    LyricsFontSize = message.NewValue;
                 }
             }
         }
@@ -320,27 +269,5 @@ namespace BetterLyrics.WinUI3.ViewModels
                 }
             }
         }
-
-        public void Receive(PropertyChangedMessage<LyricsSearchProvider?> message)
-        {
-            if (message.Sender is LyricsRendererViewModel)
-            {
-                if (message.PropertyName == nameof(LyricsRendererViewModel.LyricsSearchProvider))
-                {
-                    LyricsSearchProvider = message.NewValue;
-                }
-            }
-        }
-
-        public void Receive(PropertyChangedMessage<TranslationSearchProvider?> message)
-        {
-            if (message.Sender is LyricsRendererViewModel)
-            {
-                if (message.PropertyName == nameof(LyricsRendererViewModel.TranslationSearchProvider))
-                {
-                    TranslationSearchProvider = message.NewValue;
-                }
-            }
-        }
     }
 }

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

@@ -21,7 +21,6 @@ namespace BetterLyrics.WinUI3.ViewModels
             _isDynamicCoverOverlayEnabled = _settingsService.IsDynamicCoverOverlayEnabled;
             _albumArtBgOpacity = _settingsService.CoverOverlayOpacity;
             _albumArtBgBlurAmount = _settingsService.CoverOverlayBlurAmount;
-            _coverAcrylicEffectAmount = _settingsService.CoverAcrylicEffectAmount;
 
             _lyricsBgFontColorType = _settingsService.LyricsBgFontColorType;
             _lyricsFgFontColorType = _settingsService.LyricsFgFontColorType;
@@ -33,11 +32,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             _lyricsAlignmentType = _settingsService.LyricsAlignmentType;
             _lyricsVerticalEdgeOpacity = _settingsService.LyricsVerticalEdgeOpacity;
             _lyricsLineSpacingFactor = _settingsService.LyricsLineSpacingFactor;
-            
-            _lyricsStandardFontSize = _settingsService.LyricsStandardFontSize;
-            _lyricsDockFontSize = _settingsService.LyricsDockFontSize;
-            _lyricsDesktopFontSize = _settingsService.LyricsDesktopFontSize;
-
+            _lyricsFontSize = _settingsService.LyricsFontSize;
             _lyricsBlurAmount = _settingsService.LyricsBlurAmount;
             _isLyricsGlowEffectEnabled = _settingsService.IsLyricsGlowEffectEnabled;
             _lyricsGlowEffectScope = _settingsService.LyricsGlowEffectScope;
@@ -52,7 +47,6 @@ namespace BetterLyrics.WinUI3.ViewModels
             _lyricsFontStrokeWidth = _settingsService.LyricsFontStrokeWidth;
             _isTranslationEnabled = _settingsService.IsTranslationEnabled;
             _showTranslationOnly = _settingsService.ShowTranslationOnly;
-            _isLibreTranslateEnabled = _settingsService.IsLibreTranslateEnabled;
             _targetLanguageIndex = _settingsService.SelectedTargetLanguageIndex;
             _titleTextFormat.HorizontalAlignment = _artistTextFormat.HorizontalAlignment = _settingsService.SongInfoAlignmentType.ToCanvasHorizontalAlignment();
 
@@ -71,7 +65,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             _playbackService.IsPlayingChanged += PlaybackService_IsPlayingChanged;
             _playbackService.SongInfoChanged += PlaybackService_SongInfoChanged;
             _playbackService.AlbumArtChangedChanged += PlaybackService_AlbumArtChangedChanged;
-            _playbackService.TimelineChanged += PlaybackService_TimelineChanged;
+            _playbackService.PositionChanged += PlaybackService_PositionChanged;
 
             _isPlaying = _playbackService.IsPlaying;
 

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

@@ -7,14 +7,11 @@ using Microsoft.Graphics.Canvas.Geometry;
 using Microsoft.Graphics.Canvas.Text;
 using Microsoft.Graphics.Canvas.UI.Xaml;
 using Microsoft.UI;
-using Microsoft.UI.Xaml.Media;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Numerics;
 using Windows.Foundation;
-using Windows.Graphics.Effects;
 using Windows.UI;
 
 namespace BetterLyrics.WinUI3.ViewModels
@@ -30,20 +27,28 @@ namespace BetterLyrics.WinUI3.ViewModels
                 DrawBlurredLyrics(control, blurredLyricsDs);
             }
 
+            if (_lastAlbumArtSwBitmap != null && _lastAlbumArtCanvasBitmap == null)
+            {
+                _lastAlbumArtCanvasBitmap = CanvasBitmap.CreateFromSoftwareBitmap(control, _lastAlbumArtSwBitmap);
+            }
+            if (_albumArtSwBitmap != null && _albumArtCanvasBitmap == null)
+            {
+                _albumArtCanvasBitmap = CanvasBitmap.CreateFromSoftwareBitmap(control, _albumArtSwBitmap);
+            }
+
             using var combined = new CanvasCommandList(control);
             using var combinedDs = combined.CreateDrawingSession();
 
             if (_isDockMode)
             {
-                FillBackground(control, combinedDs, _immersiveBgTransition.Value, 0f, _immersiveBgOpacityTransition.Value);
+                DrawImmersiveBackground(control, combinedDs, 0f);
             }
             else if (_isDesktopMode)
             {
-                FillBackground(control, combinedDs, _immersiveBgTransition.Value, 0f, _immersiveBgOpacityTransition.Value);
+                DrawImmersiveBackground(control, combinedDs, 0f);
             }
             else
             {
-                FillBackground(control, combinedDs, _albumArtAccentColorTransition.Value, 0f, _albumArtBgOpacity / 100f);
                 DrawAlbumArtBackground(control, combinedDs);
             }
 
@@ -101,7 +106,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             float imageWidth = (float)canvasBitmap.Size.Width;
             float imageHeight = (float)canvasBitmap.Size.Height;
 
-            float targetSize = MathF.Sqrt(MathF.Pow(_canvasWidth, 2) + MathF.Pow(_canvasHeight, 2));
+            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;
@@ -162,16 +167,16 @@ namespace BetterLyrics.WinUI3.ViewModels
                     AlphaMask = cornerRadiusMask,
                 },
                 Opacity = opacity,
-            }, new Vector2(_albumArtXTransition.Value, _albumArtYTransition.Value));
+            }, new Vector2(_albumArtXTransition.Value, _albumArtY)
+            );
         }
 
         private void DrawAlbumArtBackground(ICanvasAnimatedControl control, CanvasDrawingSession ds)
         {
-            //ds.Transform = Matrix3x2.CreateRotation(_rotateAngle, control.Size.ToVector2() * 0.5f);
+            ds.Transform = Matrix3x2.CreateRotation(_rotateAngle, control.Size.ToVector2() * 0.5f);
 
             using var overlappedCovers = new CanvasCommandList(control.Device);
             using var overlappedCoversDs = overlappedCovers.CreateDrawingSession();
-            overlappedCoversDs.Transform = Matrix3x2.CreateRotation(_rotateAngle, control.Size.ToVector2() * 0.5f);
 
             if (_lastAlbumArtCanvasBitmap != null)
             {
@@ -182,40 +187,20 @@ namespace BetterLyrics.WinUI3.ViewModels
                 DrawBackgroundImgae(control, overlappedCoversDs, _albumArtCanvasBitmap, _albumArtBgTransition.Value);
             }
 
-            overlappedCoversDs.Transform = Matrix3x2.Identity;
-
-            IGraphicsEffectSource blurredCover = new GaussianBlurEffect
-            {
-                BlurAmount = _albumArtBgBlurAmount,
-                Source = overlappedCovers,
-                BorderMode = EffectBorderMode.Soft,
-                Optimization = EffectOptimization.Speed,
-            };
-
-            // 应用亚克力噪点效果
-            // TODO: 没有写_coverAcrylicNoiseCanvasBitmap加载的代码
-            if (_coverAcrylicEffectAmount > 0 && _coverAcrylicNoiseCanvasBitmap != null)
-            {
-                blurredCover = new BlendEffect
-                {
-                    Mode = BlendEffectMode.SoftLight,
-                    Background = blurredCover,
-                    Foreground = new OpacityEffect
-                    {
-                        Source = _coverAcrylicNoiseCanvasBitmap,
-                        Opacity = _coverAcrylicEffectAmount / 100f,
-                    },
-                };
-            }
-
-            var coverOverlayEffect = new OpacityEffect
+            using var coverOverlayEffect = new OpacityEffect
             {
                 Opacity = _albumArtBgOpacity / 100f,
-                Source = blurredCover,
+                Source = new GaussianBlurEffect
+                {
+                    BlurAmount = _albumArtBgBlurAmount,
+                    Source = overlappedCovers,
+                    BorderMode = EffectBorderMode.Soft,
+                    Optimization = EffectOptimization.Speed,
+                },
             };
             ds.DrawImage(coverOverlayEffect);
 
-            //ds.Transform = Matrix3x2.Identity;
+            ds.Transform = Matrix3x2.Identity;
         }
 
         private void DrawAlbumArt(ICanvasAnimatedControl control, CanvasDrawingSession ds)
@@ -237,7 +222,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             {
                 Source = albumArt,
                 BlurAmount = 12f,
-                Optimization = EffectOptimization.Speed,
+                Optimization = EffectOptimization.Quality,
             });
             opacityDs.DrawImage(albumArt);
 
@@ -262,27 +247,21 @@ namespace BetterLyrics.WinUI3.ViewModels
 
         private void DrawSingleTitleAndArtist(ICanvasAnimatedControl control, CanvasDrawingSession ds, string? title, string? artist, float opacity)
         {
-            var maxWidth = _lyricsLayoutOrientation switch
-            {
-                LyricsLayoutOrientation.Horizontal => _albumArtSize,
-                LyricsLayoutOrientation.Vertical => _canvasWidth - _leftMargin - _albumArtSize - _rightMargin,
-                _ => 0f
-            };
-            using CanvasTextLayout titleLayout = new(
+            CanvasTextLayout titleLayout = new(
                 control, title ?? string.Empty,
-                _titleTextFormat, maxWidth, _canvasHeight
+                _titleTextFormat, _albumArtSize, _canvasHeight
             );
-            using CanvasTextLayout artistLayout = new(
+            CanvasTextLayout artistLayout = new(
                 control, artist ?? string.Empty,
-                _artistTextFormat, maxWidth, _canvasHeight
+                _artistTextFormat, _albumArtSize, _canvasHeight
             );
             ds.DrawTextLayout(
                 titleLayout,
-                new Vector2(_titleXTransition.Value, _titleYTransition.Value),
+                new Vector2(_albumArtXTransition.Value, _titleY),
                 _bgFontColor.WithAlpha((byte)(_albumArtOpacityTransition.Value * 255 * opacity)));
             ds.DrawTextLayout(
                 artistLayout,
-                new Vector2(_titleXTransition.Value, _titleYTransition.Value + (float)titleLayout.LayoutBounds.Height),
+                new Vector2(_albumArtXTransition.Value, _titleY + (float)titleLayout.LayoutBounds.Height),
                 _bgFontColor.WithAlpha((byte)(_albumArtOpacityTransition.Value * 128 * opacity)));
         }
 
@@ -333,7 +312,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                 }
 
                 float xOffset = _lyricsXTransition.Value;
-                float yOffset = _canvasYScrollTransition.Value + _canvasHeight / 2 + _lyricsYTransition.Value;
+                float yOffset = _canvasYScrollTransition.Value + _canvasHeight / 2;
 
                 // 组合变换：缩放 -> 旋转 -> 平移
                 ds.Transform =
@@ -371,8 +350,8 @@ namespace BetterLyrics.WinUI3.ViewModels
                     {
                         Source = new OpacityEffect { Source = bgLyrics, Opacity = line.OpacityTransition.Value * _lyricsOpacityTransition.Value },
                         BlurAmount = line.BlurAmountTransition.Value,
+                        Optimization = EffectOptimization.Quality,
                         BorderMode = EffectBorderMode.Soft,
-                        Optimization = EffectOptimization.Speed,
                     }
                 );
 
@@ -500,7 +479,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                                             },
                                         },
                                         BlurAmount = _lyricsGlowEffectAmount,
-                                        Optimization = EffectOptimization.Speed,
+                                        Optimization = EffectOptimization.Quality,
                                     }
                                     : new CanvasCommandList(control.Device),
                             Foreground = new AlphaMaskEffect
@@ -530,7 +509,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                                 Displacement = mask,
                                 XChannelSelect = EffectChannelSelect.Red,
                                 YChannelSelect = EffectChannelSelect.Alpha,
-                                Amount = 1f,
+                                Amount = 1f
                             });
                         }
                         else
@@ -553,7 +532,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             }
         }
 
-        private void FillBackground(ICanvasAnimatedControl control, CanvasDrawingSession ds, Color color, float radius, float opacity)
+        private void DrawImmersiveBackground(ICanvasAnimatedControl control, CanvasDrawingSession ds, float radius)
         {
             CanvasCommandList list = new(control.Device);
             using var listDs = list.CreateDrawingSession();
@@ -561,12 +540,12 @@ namespace BetterLyrics.WinUI3.ViewModels
                 new Rect(0, 0, _canvasWidth, _canvasHeight),
                 radius,
                 radius,
-                color
+                _immersiveBgTransition.Value
             );
             ds.DrawImage(new OpacityEffect
             {
                 Source = list,
-                Opacity = opacity
+                Opacity = _immersiveBgOpacityTransition.Value
             });
         }
 
@@ -577,11 +556,16 @@ namespace BetterLyrics.WinUI3.ViewModels
             float width
         )
         {
-            return new CanvasLinearGradientBrush(control, stops.Select(stops => new CanvasGradientStop
-            {
-                Position = stops.position,
-                Color = Color.FromArgb((byte)(stops.opacity * 255), 128, 128, 128),
-            }).ToArray())
+            return new CanvasLinearGradientBrush(
+                control,
+                stops
+                    .Select(stops => new CanvasGradientStop
+                    {
+                        Position = stops.position,
+                        Color = Color.FromArgb((byte)(stops.opacity * 255), 128, 128, 128),
+                    })
+                    .ToArray()
+            )
             {
                 StartPoint = new Vector2(startX, 0),
                 EndPoint = new Vector2(startX + width, 0),

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

@@ -84,11 +84,6 @@ namespace BetterLyrics.WinUI3.ViewModels
                 {
                     _isLyricsFloatAnimationEnabled = message.NewValue;
                 }
-                else if (message.PropertyName == nameof(SettingsPageViewModel.IsLibreTranslateEnabled))
-                {
-                    _isLibreTranslateEnabled = message.NewValue;
-                    UpdateTranslations();
-                }
             }
             else if (message.Sender is LyricsWindowViewModel)
             {
@@ -97,14 +92,12 @@ namespace BetterLyrics.WinUI3.ViewModels
                     _isDockMode = message.NewValue;
                     UpdateColorConfig();
                     UpdateImmersiveBackgroundOpacity();
-                    _isLayoutChanged = true;
                 }
                 else if (message.PropertyName == nameof(LyricsWindowViewModel.IsDesktopMode))
                 {
                     _isDesktopMode = message.NewValue;
                     UpdateColorConfig();
                     UpdateImmersiveBackgroundOpacity();
-                    _isLayoutChanged = true;
                 }
                 else if (message.PropertyName == nameof(LyricsWindowViewModel.IsLyricsWindowLocked))
                 {
@@ -192,11 +185,6 @@ namespace BetterLyrics.WinUI3.ViewModels
                 {
                     _albumArtBgBlurAmount = message.NewValue;
                 }
-                else if (message.PropertyName == nameof(SettingsPageViewModel.CoverAcrylicEffectAmount))
-                {
-                    _coverAcrylicEffectAmount = message.NewValue;
-                    _isCoverAcrylicEffectAmountChanged = true;
-                }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsVerticalEdgeOpacity))
                 {
                     _lyricsVerticalEdgeOpacity = message.NewValue;
@@ -207,19 +195,9 @@ namespace BetterLyrics.WinUI3.ViewModels
                     _lyricsBlurAmount = message.NewValue;
                     _isLayoutChanged = true;
                 }
-                else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsStandardFontSize))
+                else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsFontSize))
                 {
-                    _lyricsStandardFontSize = message.NewValue;
-                    _isLayoutChanged = true;
-                }
-                else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsDockFontSize))
-                {
-                    _lyricsDockFontSize = message.NewValue;
-                    _isLayoutChanged = true;
-                }
-                else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsDesktopFontSize))
-                {
-                    _lyricsDesktopFontSize = message.NewValue;
+                    _lyricsFontSize = message.NewValue;
                     _isLayoutChanged = true;
                 }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.SelectedTargetLanguageIndex))

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

@@ -24,37 +24,16 @@ namespace BetterLyrics.WinUI3.ViewModels
             interpolator: (from, to, progress) => Helper.ColorHelper.GetInterpolatedColor(progress, from, to)
         );
 
-        private readonly ValueTransition<Color> _albumArtAccentColorTransition = new(
-            initialValue: Colors.Transparent,
-            durationSeconds: 0.3f,
-            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> _titleXTransition = new(
-            initialValue: 0f,
-            durationSeconds: 0.3f
-        );
-
-        private readonly ValueTransition<float> _titleYTransition = new(
-            initialValue: 0f,
-            durationSeconds: 0.3f
-        );
-
         private readonly ValueTransition<float> _lyricsXTransition = new(
             initialValue: 0f,
             durationSeconds: 0.3f
         );
 
-        private readonly ValueTransition<float> _lyricsYTransition = new(
-            initialValue: 0f,
-            durationSeconds: 0.3f
-        );
-
         private readonly ValueTransition<float> _lyricsOpacityTransition = new(
             initialValue: 0f,
             durationSeconds: 0.3f
@@ -75,11 +54,6 @@ namespace BetterLyrics.WinUI3.ViewModels
             durationSeconds: 0.3f
         );
 
-        private readonly ValueTransition<float> _albumArtYTransition = new(
-            initialValue: 0f,
-            durationSeconds: 0.3f
-        );
-
         private readonly ValueTransition<float> _songInfoOpacityTransition = new(
             initialValue: 0f,
             durationSeconds: 1f

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

@@ -11,8 +11,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Numerics;
-using System.Threading.Tasks;
-using Windows.Graphics.Imaging;
 using Windows.UI;
 
 namespace BetterLyrics.WinUI3.ViewModels
@@ -23,7 +21,6 @@ namespace BetterLyrics.WinUI3.ViewModels
         private bool _isCanvasHeightChanged = false;
 
         private bool _isDisplayTypeChanged = false;
-        private bool _isLyricsLayoutOrientationChanged = false;
 
         private bool _isPlayingLineChanged = false;
         private bool _isVisibleLinesBoundaryChanged = false;
@@ -49,20 +46,11 @@ namespace BetterLyrics.WinUI3.ViewModels
             _displayType = _displayTypeReceived;
             _playingLineIndex = playingLineIndex;
 
-            if (_albumArtChanged)
-            {
-                if (_lastAlbumArtSwBitmap != null)
-                {
-                    _lastAlbumArtCanvasBitmap = CanvasBitmap.CreateFromSoftwareBitmap(control, _lastAlbumArtSwBitmap);
-                }
-                _albumArtBgTransition.Reset(0f);
-                _albumArtBgTransition.StartTransition(1f);
-                if (_albumArtSwBitmap != null)
-                {
-                    _albumArtCanvasBitmap = CanvasBitmap.CreateFromSoftwareBitmap(control, _albumArtSwBitmap);
-                }
-                _albumArtChanged = false;
-            }
+            _immersiveBgOpacityTransition.Update(_elapsedTime);
+            _immersiveBgTransition.Update(_elapsedTime);
+            _albumArtBgTransition.Update(_elapsedTime);
+            _lyricsBgBrightnessTransition.Update(_elapsedTime);
+            _songInfoOpacityTransition.Update(_elapsedTime);
 
             if (_isDynamicCoverOverlayEnabled)
             {
@@ -70,97 +58,52 @@ namespace BetterLyrics.WinUI3.ViewModels
                 _rotateAngle %= MathF.PI * 2;
             }
 
-            if (_isCanvasWidthChanged)
+            if (_isCanvasHeightChanged)
             {
-                if (_canvasWidth < 450)
-                {
-                    _lyricsLayoutOrientation = LyricsLayoutOrientation.Vertical;
-                }
-                else
-                {
-                    _lyricsLayoutOrientation = LyricsLayoutOrientation.Horizontal;
-                }
+                _albumArtY = 36 + (_canvasHeight - 36 * 2) * 3 / 16f;
             }
 
             if (_isCanvasWidthChanged || _isCanvasHeightChanged)
             {
-                _isCoverAcrylicEffectAmountChanged = true;
-            }
+                _albumArtSize = MathF.Min(
+                    (_canvasHeight - _topMargin - _bottomMargin) * 8.5f / 16,
+                    (_canvasWidth - _leftMargin - _middleMargin - _rightMargin) / 2);
+                _albumArtSize = MathF.Max(0, _albumArtSize);
 
-            if (_isCoverAcrylicEffectAmountChanged)
-            {
-                UpdateCoverAcrylicOverlay(control);
+                _titleY = _albumArtY + _albumArtSize * 1.05f;
             }
 
             if (_isDisplayTypeChanged || _isCanvasWidthChanged)
             {
                 bool jumpTo = !_isDisplayTypeChanged && _isCanvasWidthChanged;
-                switch (_lyricsLayoutOrientation)
+                switch (_displayType)
                 {
-                    case LyricsLayoutOrientation.Horizontal:
-                        _albumArtSize = MathF.Min((_canvasHeight - _topMargin - _bottomMargin) * 8.5f / 16, (_canvasWidth - _leftMargin - _middleMargin - _rightMargin) / 2);
-                        _albumArtSize = MathF.Max(0, _albumArtSize);
-                        _albumArtYTransition.StartTransition((_canvasHeight - _albumArtSize * 1.05f - _titleTextFormat.FontSize - _artistTextFormat.FontSize) / 2, jumpTo);
-                        _titleYTransition.StartTransition(_albumArtYTransition.TargetValue + _albumArtSize * 1.05f, jumpTo);
-                        _lyricsYTransition.StartTransition(0, jumpTo);
-                        switch (_displayType)
-                        {
-                            case LyricsDisplayType.AlbumArtOnly:
-                                _lyricsOpacityTransition.StartTransition(0f, jumpTo);
-                                _albumArtOpacityTransition.StartTransition(1f, jumpTo);
-                                _albumArtXTransition.StartTransition(_canvasWidth / 2 - _albumArtSize / 2, jumpTo);
-                                _titleXTransition.StartTransition(_albumArtXTransition.TargetValue, jumpTo);
-                                break;
-                            case LyricsDisplayType.LyricsOnly:
-                                _lyricsOpacityTransition.StartTransition(1f, jumpTo);
-                                _albumArtOpacityTransition.StartTransition(0f, jumpTo);
-                                _lyricsXTransition.StartTransition(_leftMargin, jumpTo);
-                                break;
-                            case LyricsDisplayType.SplitView:
-                                _lyricsOpacityTransition.StartTransition(1f, jumpTo);
-                                _albumArtOpacityTransition.StartTransition(1f, jumpTo);
-                                _lyricsXTransition.StartTransition((_canvasWidth - _leftMargin - _middleMargin - _rightMargin) / 2 + _leftMargin + _middleMargin, jumpTo);
-                                _albumArtXTransition.StartTransition(_leftMargin + ((_canvasWidth - _leftMargin - _middleMargin - _rightMargin) / 2 - _albumArtSize) / 2, jumpTo);
-                                _titleXTransition.StartTransition(_albumArtXTransition.TargetValue, jumpTo);
-                                break;
-                            default:
-                                break;
-                        }
+                    case LyricsDisplayType.AlbumArtOnly:
+                        _lyricsOpacityTransition.StartTransition(0f, jumpTo);
+                        _albumArtOpacityTransition.StartTransition(1f, jumpTo);
+                        _albumArtXTransition.StartTransition(_canvasWidth / 2 - _albumArtSize / 2, jumpTo);
                         break;
-                    case LyricsLayoutOrientation.Vertical:
-                        _albumArtSize = 64;
+                    case LyricsDisplayType.LyricsOnly:
+                        _lyricsOpacityTransition.StartTransition(1f, jumpTo);
+                        _albumArtOpacityTransition.StartTransition(0f, jumpTo);
                         _lyricsXTransition.StartTransition(_leftMargin, jumpTo);
-                        _albumArtXTransition.StartTransition(_leftMargin, jumpTo);
-                        _titleXTransition.StartTransition(_leftMargin + _albumArtSize * 1.2f, jumpTo);
-                        switch (_displayType)
-                        {
-                            case LyricsDisplayType.AlbumArtOnly:
-                                _lyricsOpacityTransition.StartTransition(0f, jumpTo);
-                                _albumArtOpacityTransition.StartTransition(1f, jumpTo);
-                                _albumArtYTransition.StartTransition((_canvasHeight - _albumArtSize) / 2, jumpTo);
-                                _titleYTransition.StartTransition(_albumArtYTransition.TargetValue, jumpTo);
-                                break;
-                            case LyricsDisplayType.LyricsOnly:
-                                _lyricsOpacityTransition.StartTransition(1f, jumpTo);
-                                _albumArtOpacityTransition.StartTransition(0f, jumpTo);
-                                _lyricsYTransition.StartTransition(0, jumpTo);
-                                break;
-                            case LyricsDisplayType.SplitView:
-                                _albumArtYTransition.StartTransition(_topMargin, jumpTo);
-                                _titleYTransition.StartTransition(_topMargin, jumpTo);
-                                _lyricsOpacityTransition.StartTransition(1f, jumpTo);
-                                _albumArtOpacityTransition.StartTransition(1f, jumpTo);
-                                _lyricsYTransition.StartTransition(_albumArtSize, jumpTo);
-                                break;
-                            default:
-                                break;
-                        }
+                        break;
+                    case LyricsDisplayType.SplitView:
+                        _lyricsOpacityTransition.StartTransition(1f, jumpTo);
+                        _albumArtOpacityTransition.StartTransition(1f, jumpTo);
+                        _lyricsXTransition.StartTransition((_canvasWidth - _leftMargin - _middleMargin - _rightMargin) / 2 + _leftMargin + _middleMargin, jumpTo);
+                        _albumArtXTransition.StartTransition(_leftMargin + ((_canvasWidth - _leftMargin - _middleMargin - _rightMargin) / 2 - _albumArtSize) / 2, jumpTo);
                         break;
                     default:
                         break;
                 }
             }
 
+            _lyricsXTransition.Update(_elapsedTime);
+            _albumArtXTransition.Update(_elapsedTime);
+            _lyricsOpacityTransition.Update(_elapsedTime);
+            _albumArtOpacityTransition.Update(_elapsedTime);
+
             if (_isCanvasWidthChanged || _lyricsXTransition.IsTransitioning)
             {
                 _maxLyricsWidth = _canvasWidth - _lyricsXTransition.Value - _rightMargin;
@@ -181,21 +124,6 @@ namespace BetterLyrics.WinUI3.ViewModels
             UpdateLinesProps();
 
             _isLayoutChanged = false;
-
-            _titleXTransition.Update(_elapsedTime);
-            _titleYTransition.Update(_elapsedTime);
-            _lyricsXTransition.Update(_elapsedTime);
-            _lyricsYTransition.Update(_elapsedTime);
-            _albumArtXTransition.Update(_elapsedTime);
-            _albumArtYTransition.Update(_elapsedTime);
-            _lyricsOpacityTransition.Update(_elapsedTime);
-            _albumArtOpacityTransition.Update(_elapsedTime);
-            _immersiveBgOpacityTransition.Update(_elapsedTime);
-            _immersiveBgTransition.Update(_elapsedTime);
-            _albumArtAccentColorTransition.Update(_elapsedTime);
-            _albumArtBgTransition.Update(_elapsedTime);
-            _lyricsBgBrightnessTransition.Update(_elapsedTime);
-            _songInfoOpacityTransition.Update(_elapsedTime);
         }
 
         private void ReLayout(ICanvasAnimatedControl control)
@@ -203,18 +131,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             if (control == null)
                 return;
 
-            if (_isDockMode)
-            {
-                _lyricsTextFormat.FontSize = _lyricsDockFontSize;
-            }
-            else if (_isDesktopMode)
-            {
-                _lyricsTextFormat.FontSize = _lyricsDesktopFontSize;
-            }
-            else
-            {
-                _lyricsTextFormat.FontSize = _lyricsStandardFontSize;
-            }
+            _lyricsTextFormat.FontSize = _lyricsFontSize;
 
             float y = 0;
 
@@ -355,30 +272,46 @@ namespace BetterLyrics.WinUI3.ViewModels
                 ThemeTypeSent = _lyricsBgTheme;
             }
 
-            float brightness;
+            float brightness = 0f;
+
             Color grayedEnvironmentalColor = Colors.Transparent;
 
-            bool isLight = ThemeTypeSent switch
+            switch (ThemeTypeSent)
             {
-                ElementTheme.Default => Application.Current.RequestedTheme == ApplicationTheme.Light,
-                ElementTheme.Light => true,
-                ElementTheme.Dark => false,
-                _ => false
-            };
-
-            if (isLight)
-            {
-                _adaptiveGrayedFontColor = _darkColor;
-                brightness = 0.7f;
-                grayedEnvironmentalColor = _lightColor;
-                _albumArtAccentColorTransition.StartTransition(_albumArtLightAccentColor);
+                case ElementTheme.Default:
+                    switch (Application.Current.RequestedTheme)
+                    {
+                        case ApplicationTheme.Light:
+                            _adaptiveGrayedFontColor = _darkColor;
+                            brightness = 0.7f;
+                            break;
+                        case ApplicationTheme.Dark:
+                            _adaptiveGrayedFontColor = _lightColor;
+                            brightness = 0.3f;
+                            break;
+                        default:
+                            break;
+                    }
+                    break;
+                case ElementTheme.Light:
+                    _adaptiveGrayedFontColor = _darkColor;
+                    brightness = 0.7f;
+                    break;
+                case ElementTheme.Dark:
+                    _adaptiveGrayedFontColor = _lightColor;
+                    brightness = 0.3f;
+                    break;
+                default:
+                    break;
             }
-            else
+
+            if (_adaptiveGrayedFontColor == _lightColor)
             {
-                _adaptiveGrayedFontColor = _lightColor;
-                brightness = 0.3f;
                 grayedEnvironmentalColor = _darkColor;
-                _albumArtAccentColorTransition.StartTransition(_albumArtDarkAccentColor);
+            }
+            else if (_adaptiveGrayedFontColor == _darkColor)
+            {
+                grayedEnvironmentalColor = _lightColor;
             }
 
             _lyricsBgBrightnessTransition.StartTransition(brightness);
@@ -389,14 +322,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             }
             else
             {
-                if (isLight)
-                {
-                    _adaptiveColoredFontColor = _albumArtDarkAccentColor;
-                }
-                else
-                {
-                    _adaptiveColoredFontColor = _albumArtLightAccentColor;
-                }
+                _adaptiveColoredFontColor = Helper.ColorHelper.GetForegroundColor(_albumArtAccentColor?.WithBrightness(brightness) ?? Colors.Transparent);
             }
 
             switch (_lyricsBgFontColorType)
@@ -513,21 +439,5 @@ namespace BetterLyrics.WinUI3.ViewModels
             }
             _immersiveBgOpacityTransition.StartTransition(targetOpacity);
         }
-
-        private void UpdateCoverAcrylicOverlay(ICanvasAnimatedControl control)
-        {
-            if (_coverAcrylicEffectAmount > 0)
-            {
-                var ret = NoiseOverlayHelper.GenerateNoiseBitmapBGRA((int)_canvasWidth, (int)_canvasHeight);
-                _coverAcrylicNoiseCanvasBitmap = CanvasBitmap.CreateFromBytes(
-                    control,
-                    ret,
-                    (int)_canvasWidth,
-                    (int)_canvasHeight,
-                   Windows.Graphics.DirectX.DirectXPixelFormat.B8G8R8A8UIntNormalized
-                );
-            }
-            _isCoverAcrylicEffectAmountChanged = false;
-        }
     }
 }

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

@@ -14,11 +14,9 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Text;
 using Microsoft.Graphics.Canvas.UI.Xaml;
-using Microsoft.Graphics.Display;
 using Microsoft.UI;
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -48,17 +46,16 @@ namespace BetterLyrics.WinUI3.ViewModels
         private CanvasBitmap? _lastAlbumArtCanvasBitmap = null;
         private CanvasBitmap? _albumArtCanvasBitmap = null;
 
-        private bool _albumArtChanged = false;
-
-        private CanvasBitmap? _coverAcrylicNoiseCanvasBitmap = null;
-        private bool _isCoverAcrylicEffectAmountChanged = false;
-
         private float _albumArtSize = 0f;
         private int _albumArtCornerRadius = 0;
 
+        private float _albumArtY = 0f;
+
         private string? _lastSongTitle;
         private string? _songTitle;
 
+        private float _titleY = 0f;
+
         private string? _lastSongArtist;
         private string? _songArtist;
 
@@ -74,14 +71,6 @@ namespace BetterLyrics.WinUI3.ViewModels
         private readonly float _coverRotateSpeed = 0.003f;
         private float _rotateAngle = 0f;
 
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial LyricsSearchProvider? LyricsSearchProvider { get; set; } = null;
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial TranslationSearchProvider? TranslationSearchProvider { get; set; } = null;
-
         private TextAlignmentType _lyricsAlignmentType;
 
         private readonly float _lyricsGlowEffectAmount = 8f;
@@ -93,9 +82,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         private LineRenderingType _lyricsHighlightScope;
 
         private int _lyricsFontStrokeWidth;
-        private int _lyricsStandardFontSize;
-        private int _lyricsDockFontSize;
-        private int _lyricsDesktopFontSize;
+        private int _lyricsFontSize;
         private float _lyricsLineSpacingFactor;
 
         private LyricsFontColorType _lyricsBgFontColorType;
@@ -119,8 +106,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         private Color _adaptiveGrayedFontColor = Colors.Transparent;
         private Color? _adaptiveColoredFontColor = null;
 
-        private Color _albumArtLightAccentColor = Colors.Transparent;
-        private Color _albumArtDarkAccentColor = Colors.Transparent;
+        private Color? _albumArtAccentColor = null;
         private Color _environmentalColor = Colors.Transparent;
 
         private Color _lightColor = Colors.White;
@@ -159,10 +145,10 @@ namespace BetterLyrics.WinUI3.ViewModels
         private int _langIndex = 0;
 
         private List<LyricsData> _lyricsDataArr = [];
+        private List<string> _translationList = [];
         private bool _isTranslationEnabled;
         private bool _showTranslationOnly;
         private int _targetLanguageIndex;
-        private bool _isLibreTranslateEnabled;
 
         private int _timelineSyncThreshold;
 
@@ -196,13 +182,9 @@ namespace BetterLyrics.WinUI3.ViewModels
         private LyricsDisplayType _displayTypeReceived;
         private LyricsDisplayType _displayType;
 
-        private LyricsLayoutOrientation _lyricsLayoutOrientation;
-
         private int _albumArtBgBlurAmount;
         private int _albumArtBgOpacity;
 
-        private int _coverAcrylicEffectAmount;
-
         [ObservableProperty]
         public partial bool IsTranslating { get; set; } = false;
 
@@ -353,7 +335,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             _isPlaying = e.IsPlaying;
         }
 
-        private void PlaybackService_TimelineChanged(object? sender, TimelineChangedEventArgs e)
+        private void PlaybackService_PositionChanged(object? sender, PositionChangedEventArgs e)
         {
             if (Math.Abs(TotalTime.TotalMilliseconds - e.Position.TotalMilliseconds) >= _timelineSyncThreshold)
             {
@@ -379,6 +361,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                 _songInfoOpacityTransition.StartTransition(1f);
 
                 _logger.LogInformation("Song info changed: Title={Title}, Artist={Artist}, refreshing lyrics...", _songTitle, _songArtist);
+                Debug.WriteLine($"Song info changed: Title={_songTitle}, Artist={_songArtist}");
                 _ = _refreshLyricsRunner.RunAsync(async token =>
                 {
                     await RefreshLyricsAsync(token);
@@ -391,20 +374,16 @@ namespace BetterLyrics.WinUI3.ViewModels
         {
             if (e.AlbumArtSwBitmap != _albumArtSwBitmap)
             {
-                //_lastAlbumArtSwBitmap?.Dispose();
                 _lastAlbumArtSwBitmap = _albumArtSwBitmap;
-                //_lastAlbumArtCanvasBitmap?.Dispose();
                 _lastAlbumArtCanvasBitmap = null;
 
-                //_albumArtSwBitmap?.Dispose();
                 _albumArtSwBitmap = e.AlbumArtSwBitmap;
-                //_albumArtCanvasBitmap?.Dispose();
                 _albumArtCanvasBitmap = null;
 
-                _albumArtChanged = true;
+                _albumArtAccentColor = e.AlbumArtAccentColor;
 
-                _albumArtLightAccentColor = e.AlbumArtLightAccentColor ?? Colors.Transparent;
-                _albumArtDarkAccentColor = e.AlbumArtDarkAccentColor ?? Colors.Transparent;
+                _albumArtBgTransition.Reset(0f);
+                _albumArtBgTransition.StartTransition(1f);
 
                 UpdateColorConfig();
             }
@@ -412,7 +391,6 @@ namespace BetterLyrics.WinUI3.ViewModels
 
         private void UpdateTranslations()
         {
-            TranslationSearchProvider = null;
             _lyricsDataArr.ElementAtOrDefault(0)?.SetDisplayedTextInOriginalText();
             _isLayoutChanged = true;
 
@@ -462,12 +440,11 @@ namespace BetterLyrics.WinUI3.ViewModels
                     }
                     else
                     {
-                        _lyricsDataArr[0].SetDisplayedTextAlongWith(_lyricsDataArr[found], 50);
+                        _lyricsDataArr[0].SetDisplayedTextAlongWith(_lyricsDataArr[found]);
                         _langIndex = 0;
                     }
-                    TranslationSearchProvider = LyricsSearchProvider.ToTranslationSearchProvider();
                 }
-                else if (_isLibreTranslateEnabled)
+                else
                 {
                     string translated = string.Empty;
                     try
@@ -486,42 +463,36 @@ namespace BetterLyrics.WinUI3.ViewModels
                             _lyricsDataArr[0].SetDisplayedTextAlongWith(translated);
                             _langIndex = 0;
                         }
-                        TranslationSearchProvider = Enums.TranslationSearchProvider.LibreTranslate;
                         token.ThrowIfCancellationRequested();
                     }
-                    catch (Exception)
-                    {
-                        App.Current.LyricsWindowNotificationPanel?.Notify(App.ResourceLoader?.GetString("LibreTranslateFailed")!, Microsoft.UI.Xaml.Controls.InfoBarSeverity.Error);
-                    }
+                    catch (Exception) { }
                 }
             }
         }
 
         private async Task RefreshLyricsAsync(CancellationToken token)
         {
-            LyricsSearchProvider = null;
             _logger.LogInformation("Refreshing lyrics...");
 
             _lyricsDataArr = [LyricsData.GetLoadingPlaceholder()];
             _isLayoutChanged = true;
 
             string? lyricsRaw = null;
-            LyricsSearchProvider? lyricsSearchProvider = null;
+            LyricsSearchProvider? provider = null;
 
             if (SongInfo != null)
             {
-                (lyricsRaw, lyricsSearchProvider) = await _lyrcsSearchService.SearchAsync(
+                (lyricsRaw, provider) = await _lyrcsSearchService.SearchAsync(
                     SongInfo.Title,
                     SongInfo.Artist,
                     SongInfo.Album ?? "",
                     SongInfo.DurationMs ?? 0,
                     token
                 );
-                LyricsSearchProvider = lyricsSearchProvider;
                 _logger.LogInformation("Lyrics search result: {LyricsRaw}", lyricsRaw ?? "null");
                 token.ThrowIfCancellationRequested();
                 _lyricsDataArr = new LyricsParser().Parse(lyricsRaw, (int?)SongInfo?.DurationMs);
-                FillTranslationFromCache(LyricsSearchProvider);
+                FillTranslationFromCache(provider);
             }
             else
             {
@@ -542,25 +513,24 @@ namespace BetterLyrics.WinUI3.ViewModels
             string? translationRaw = null;
             switch (provider)
             {
-                case Enums.LyricsSearchProvider.QQ:
+                case LyricsSearchProvider.QQ:
                     translationRaw = FileHelper.ReadLyricsCache(SongInfo!.Title, SongInfo.Artist, LyricsFormat.Lrc, PathHelper.QQTranslationCacheDirectory);
                     break;
-                case Enums.LyricsSearchProvider.Kugou:
+                case LyricsSearchProvider.Kugou:
                     break;
-                case Enums.LyricsSearchProvider.Netease:
-                    translationRaw = FileHelper.ReadLyricsCache(SongInfo!.Title, SongInfo.Artist, LyricsFormat.Lrc, PathHelper.NeteaseTranslationCacheDirectory);
+                case LyricsSearchProvider.Netease:
                     break;
-                case Enums.LyricsSearchProvider.LrcLib:
+                case LyricsSearchProvider.LrcLib:
                     break;
-                case Enums.LyricsSearchProvider.AmllTtmlDb:
+                case LyricsSearchProvider.AmllTtmlDb:
                     break;
-                case Enums.LyricsSearchProvider.LocalMusicFile:
+                case LyricsSearchProvider.LocalMusicFile:
                     break;
-                case Enums.LyricsSearchProvider.LocalLrcFile:
+                case LyricsSearchProvider.LocalLrcFile:
                     break;
-                case Enums.LyricsSearchProvider.LocalEslrcFile:
+                case LyricsSearchProvider.LocalEslrcFile:
                     break;
-                case Enums.LyricsSearchProvider.LocalTtmlFile:
+                case LyricsSearchProvider.LocalTtmlFile:
                     break;
                 default:
                     break;
@@ -568,20 +538,14 @@ namespace BetterLyrics.WinUI3.ViewModels
             if (translationRaw != null)
             {
                 var translationData = new LyricsParser().Parse(translationRaw, (int?)SongInfo?.DurationMs);
-                if (provider == Enums.LyricsSearchProvider.QQ)
+                foreach (var data in translationData)
                 {
-                    foreach (var data in translationData)
+                    data.LyricsLines = data.LyricsLines.Where(line => !string.IsNullOrWhiteSpace(line.OriginalText)).ToList();
+                    foreach (var item in data.LyricsLines)
                     {
-                        foreach (var item in data.LyricsLines)
-                        {
-                            if (item.OriginalText == "//")
-                            {
-                                item.OriginalText = "";
-                            }
-                        }
+                        if (item.OriginalText == "//") item.OriginalText = "";
                     }
                 }
-
                 _lyricsDataArr = _lyricsDataArr.Concat(translationData).ToList();
             }
         }

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

@@ -30,7 +30,6 @@ namespace BetterLyrics.WinUI3
         : BaseWindowViewModel,
             IRecipient<PropertyChangedMessage<int>>,
             IRecipient<PropertyChangedMessage<bool>>,
-            IRecipient<PropertyChangedMessage<string>>,
             IRecipient<PropertyChangedMessage<ElementTheme>>,
             IRecipient<PropertyChangedMessage<DockPlacement>>
     {
@@ -41,11 +40,9 @@ namespace BetterLyrics.WinUI3
 
         private DockPlacement _dockPlacement;
         private int _dockWindowHeight;
-        private string _dockMonitorDeviceName;
 
         public LyricsWindowViewModel(ISettingsService settingsService) : base(settingsService)
         {
-            _dockMonitorDeviceName = _settingsService.DockMonitorDeviceName;
             _ignoreFullscreenWindow = _settingsService.IgnoreFullscreenWindow;
             _hideWindowWhenNotPlaying = _settingsService.HideWindowWhenNotPlaying;
             IsImmersiveMode = _settingsService.IsImmersiveMode;
@@ -53,12 +50,12 @@ namespace BetterLyrics.WinUI3
             _dockWindowHeight = _settingsService.DockWindowHeight;
             OnIsImmersiveModeChanged(_settingsService.IsImmersiveMode);
 
-            _playbackService.IsPlayingChanged += PlaybackService_IsPlayingChanged;
+            _playbackService.SongInfoChanged += PlaybackService_SongInfoChanged;
         }
 
-        private void PlaybackService_IsPlayingChanged(object? sender, Events.IsPlayingChangedEventArgs e)
+        private void PlaybackService_SongInfoChanged(object? sender, Events.SongInfoChangedEventArgs e)
         {
-            UpdateDockWindow();
+            AutoHideOrShowWindow();
         }
 
         [ObservableProperty]
@@ -97,7 +94,7 @@ namespace BetterLyrics.WinUI3
         [ObservableProperty]
         public partial string LockHotKey { get; set; } = "";
 
-        private void UpdateDockWindow()
+        private void AutoHideOrShowWindow()
         {
             var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
             if (window == null) return;
@@ -106,11 +103,11 @@ namespace BetterLyrics.WinUI3
 
             if (IsDockMode || IsDesktopMode)
             {
-                if (_hideWindowWhenNotPlaying && !_playbackService.IsPlaying)
+                if (_hideWindowWhenNotPlaying && _playbackService.SongInfo == null)
                 {
                     if (IsDockMode)
                     {
-                        DockModeHelper.UpdateAppBarHeight(hwnd, _dockMonitorDeviceName, 0, _dockPlacement);
+                        DockModeHelper.UpdateAppBarHeight(hwnd, 0, _dockPlacement);
                     }
                     window.Hide();
                 }
@@ -118,13 +115,24 @@ namespace BetterLyrics.WinUI3
                 {
                     if (IsDockMode)
                     {
-                        DockModeHelper.UpdateAppBarHeight(hwnd, _dockMonitorDeviceName, _dockWindowHeight, _dockPlacement);
+                        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)
@@ -158,7 +166,7 @@ namespace BetterLyrics.WinUI3
                 else if (message.PropertyName == nameof(SettingsPageViewModel.HideWindowWhenNotPlaying))
                 {
                     _hideWindowWhenNotPlaying = message.NewValue;
-                    UpdateDockWindow();
+                    AutoHideOrShowWindow();
                 }
             }
         }
@@ -247,7 +255,7 @@ namespace BetterLyrics.WinUI3
         public void UpdateAccentColor(nint hwnd)
         {
             WindowPixelSampleMode mode = IsDesktopMode ? WindowPixelSampleMode.WindowEdge : _dockPlacement.ToWindowPixelSampleMode();
-            ActivatedWindowAccentColor = Helper.ColorHelper.GetAccentColor(hwnd, _settingsService.DockMonitorDeviceName, mode).ToColor();
+            ActivatedWindowAccentColor = Helper.ColorHelper.GetAccentColor(hwnd, mode).ToColor();
         }
 
         public void InitLockHotKey()
@@ -274,7 +282,7 @@ namespace BetterLyrics.WinUI3
                 IsImmersiveMode = true;
             }
 
-            UpdateDockWindow();
+            AutoHideOrShowWindow();
         }
 
         [RelayCommand]
@@ -308,8 +316,7 @@ namespace BetterLyrics.WinUI3
             IsDockMode = !IsDockMode;
             if (IsDockMode)
             {
-                window.Restore();
-                DockModeHelper.Enable(window, _dockMonitorDeviceName, _dockWindowHeight, _dockPlacement);
+                DockModeHelper.Enable(window, _dockWindowHeight, _dockPlacement);
                 StartWatchWindowColorChange();
             }
             else
@@ -317,7 +324,7 @@ namespace BetterLyrics.WinUI3
                 DockModeHelper.Disable(window);
             }
 
-            UpdateDockWindow();
+            AutoHideOrShowWindow();
         }
 
         [RelayCommand]
@@ -337,17 +344,5 @@ namespace BetterLyrics.WinUI3
                 }
             }
         }
-
-        public void Receive(PropertyChangedMessage<string> message)
-        {
-            if (message.Sender is SettingsPageViewModel)
-            {
-                if (message.PropertyName == nameof(SettingsPageViewModel.SelectedDockMonitorDeviceName))
-                {
-                    _dockMonitorDeviceName = message.NewValue;
-                    UpdateDockWindow();
-                }
-            }
-        }
     }
 }

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

@@ -1,12 +1,10 @@
 using ATL;
-using BetterLyrics.WinUI3.Enums;
 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 CommunityToolkit.WinUI;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml.Controls;
 using System;
@@ -30,178 +28,37 @@ namespace BetterLyrics.WinUI3.ViewModels
         private readonly MediaPlayer _mediaPlayer = new();
         private readonly MediaTimelineController _timelineController = new();
         private readonly SystemMediaTransportControls _smtc;
-        // All songs
         private List<Track> _tracks = [];
-        // Songs in current playlist
-        private List<Track> _playlistTracks = [];
-        // Filtered songs based on search query for current playlist
-        private List<Track> _filteredTracks = [];
 
         [ObservableProperty]
-        public partial bool IsLocalMediaNotFound { get; set; }
-
-        /// <summary>
-        /// Grouped tracks after filtering and sorting for current playlist
-        /// </summary>
-        [ObservableProperty]
-        public partial ObservableCollection<GroupInfoList> GroupedTracks { get; set; } = [];
-
-        [ObservableProperty]
-        public partial List<Track> SelectedTracks { get; set; } = [];
-
-        [ObservableProperty]
-        public partial ObservableCollection<PlayQueueItem> TrackPlayingQueue { get; set; } = [];
-
-        public PlayQueueItem? PlayingQueueItem => TrackPlayingQueue.ElementAtOrDefault(PlayingSongIndex);
-
-        [ObservableProperty]
-        public partial PlaybackOrder PlaybackOrder { get; set; }
-
-        [ObservableProperty]
-        public partial CommonSongProperty SongOrderType { get; set; } = CommonSongProperty.Title;
-
-        [ObservableProperty]
-        public partial ObservableCollection<SongsTabInfo> SongsTabInfoList { get; set; } = [];
-
-        [ObservableProperty]
-        public partial int SelectedSongsTabInfoIndex { get; set; } = 0;
-
-        public SongsTabInfo? SelectedSongsTabInfo => SongsTabInfoList.ElementAtOrDefault(SelectedSongsTabInfoIndex);
+        public partial ObservableCollection<GroupInfoList> TracksByTitle { get; set; } = [];
 
         [ObservableProperty]
         public partial bool IsDataLoading { get; set; } = false;
 
-        [ObservableProperty]
-        public partial Track TrackRightTapped { get; set; } = new();
-
-        [ObservableProperty]
-        public partial int PlayingSongIndex { get; set; } = -1;
-
-        [ObservableProperty]
-        public partial int DisplayedPlayingSongIndex { get; set; } = 0;
-
-        [ObservableProperty]
-        public partial string SongSearchQuery { get; set; } = string.Empty;
-
         public MusicGalleryViewModel(ISettingsService settingsService, ILibWatcherService libWatcherService) : base(settingsService)
         {
-            SongsTabInfoList.Add(new SongsTabInfo(App.ResourceLoader!.GetString("MusicGalleryPageAllSongs"), "\uE8A9", false, CommonSongProperty.Title, string.Empty));
-
-            RefreshSongs();
-
-            PlaybackOrder = _settingsService.PlaybackOrder;
-
-            _mediaPlayer.MediaOpened += MediaPlayer_MediaOpened;
-            _mediaPlayer.MediaEnded += MediaPlayer_MediaEnded;
             _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;
-            _smtc.PlaybackPositionChangeRequested += Smtc_PlaybackPositionChangeRequested;
 
             _libWatcherService = libWatcherService;
             _libWatcherService.MusicLibraryFilesChanged += LibWatcherService_MusicLibraryFilesChanged;
         }
 
-        private void MediaPlayer_MediaEnded(MediaPlayer sender, object args)
-        {
-            PlayNextTrack();
-        }
-
-        public void PlayNextTrack()
-        {
-            switch (PlaybackOrder)
-            {
-                case PlaybackOrder.RepeatAll:
-                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
-                    {
-                        if (PlayingSongIndex < TrackPlayingQueue.Count - 1)
-                        {
-                            PlayingSongIndex++;
-                        }
-                        else
-                        {
-                            PlayingSongIndex = 0;
-                        }
-                        PlayTrack(PlayingQueueItem);
-                    });
-                    break;
-                case PlaybackOrder.RepeatOne:
-                    _timelineController.Position = TimeSpan.Zero;
-                    break;
-                case PlaybackOrder.Shuffle:
-                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
-                    {
-                        if (TrackPlayingQueue.Count > 0)
-                        {
-                            PlayingSongIndex = new Random().Next(0, TrackPlayingQueue.Count);
-                        }
-                        PlayTrack(PlayingQueueItem);
-                    });
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        private void PlayPreviousTrack()
-        {
-            switch (PlaybackOrder)
-            {
-                case PlaybackOrder.RepeatAll:
-                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
-                    {
-                        if (PlayingSongIndex > 0)
-                        {
-                            PlayingSongIndex--;
-                        }
-                        else
-                        {
-                            PlayingSongIndex = TrackPlayingQueue.Count - 1;
-                        }
-                        PlayTrack(PlayingQueueItem);
-                    });
-                    break;
-                case PlaybackOrder.RepeatOne:
-                    _timelineController.Position = TimeSpan.Zero;
-                    break;
-                case PlaybackOrder.Shuffle:
-                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
-                    {
-                        if (TrackPlayingQueue.Count > 0)
-                        {
-                            PlayingSongIndex = new Random().Next(0, TrackPlayingQueue.Count);
-                        }
-                        PlayTrack(PlayingQueueItem);
-                    });
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        private void Smtc_PlaybackPositionChangeRequested(SystemMediaTransportControls sender, PlaybackPositionChangeRequestedEventArgs args)
-        {
-            _timelineController.Position = args.RequestedPlaybackPosition;
-        }
-
-        private void MediaPlayer_MediaOpened(MediaPlayer sender, object args)
-        {
-            _timelineController.Start();
-            _smtc.PlaybackStatus = MediaPlaybackStatus.Playing;
-        }
-
         private void TimelineController_PositionChanged(MediaTimelineController sender, object args)
         {
             _smtc.UpdateTimelineProperties(new SystemMediaTransportControlsTimelineProperties()
             {
                 Position = sender.Position,
-                EndTime = _mediaPlayer.PlaybackSession.NaturalDuration
+                EndTime = sender.Duration ?? TimeSpan.Zero
             });
         }
 
@@ -211,17 +68,17 @@ namespace BetterLyrics.WinUI3.ViewModels
             {
                 case SystemMediaTransportControlsButton.Play:
                     _smtc.PlaybackStatus = MediaPlaybackStatus.Playing;
-                    _timelineController.Resume();
+                    _mediaPlayer.Play();
                     break;
                 case SystemMediaTransportControlsButton.Pause:
                     _smtc.PlaybackStatus = MediaPlaybackStatus.Paused;
-                    _timelineController.Pause();
+                    _mediaPlayer.Pause();
                     break;
                 case SystemMediaTransportControlsButton.Next:
-                    PlayNextTrack();
+                    //Next
                     break;
                 case SystemMediaTransportControlsButton.Previous:
-                    PlayPreviousTrack();
+                    //Previous
                     break;
             }
         }
@@ -233,177 +90,58 @@ namespace BetterLyrics.WinUI3.ViewModels
 
         public void RefreshSongs()
         {
-            _dispatcherQueueTimer.Debounce(() =>
-            {
-                IsDataLoading = true;
-                _tracks.Clear();
+            IsDataLoading = true;
+            _tracks.Clear();
 
-                Task.Run(() =>
+            Task.Run(() =>
+            {
+                foreach (var folder in _settingsService.LocalMediaFolders)
                 {
-                    foreach (var folder in _settingsService.LocalMediaFolders)
+                    if (Directory.Exists(folder.Path) && folder.IsEnabled)
                     {
-                        if (Directory.Exists(folder.Path) && folder.IsEnabled)
+                        foreach (var file in Directory.GetFiles(folder.Path, $"*.*", SearchOption.AllDirectories))
                         {
-                            foreach (var file in Directory.GetFiles(folder.Path, $"*.*", SearchOption.AllDirectories))
+                            Track track = new(file);
+                            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
                             {
-                                Track track = new(file);
-                                if (track.Duration <= 0) continue;
                                 _tracks.Add(track);
-                            }
+                            });
                         }
                     }
+                }
 
-                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
-                    {
-                        ApplyPlaylist();
-                        ApplySongSearchQuery();
-                        IsLocalMediaNotFound = !_filteredTracks.Any();
-                        ApplySongOrderType();
-                        IsDataLoading = false;
-                    });
+                _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+                {
+                    TracksByTitle.AddRange(_tracks.GetGroupedByTitleAsync());
+                    IsDataLoading = false;
                 });
-            }, TimeSpan.FromMilliseconds(100));
+            });
         }
 
-        public void ApplyPlaylist()
+        public void PlaySongAt(int? index)
         {
-            if (SelectedSongsTabInfo?.FilterValue == string.Empty)
+            if (index.HasValue)
             {
-                _playlistTracks = _tracks;
-            }
-            else
-            {
-                switch (SelectedSongsTabInfo?.FilterProperty)
+                var track = _tracks.ElementAtOrDefault(index.Value);
+                if (track != null)
                 {
-                    case CommonSongProperty.Title:
-                        _playlistTracks = _tracks.Where(t => t.Title.Equals(SelectedSongsTabInfo.FilterValue, StringComparison.OrdinalIgnoreCase)).ToList();
-                        break;
-                    case CommonSongProperty.Album:
-                        _playlistTracks = _tracks.Where(t => t.Album.Equals(SelectedSongsTabInfo.FilterValue, StringComparison.OrdinalIgnoreCase)).ToList();
-                        break;
-                    case CommonSongProperty.Artist:
-                        _playlistTracks = _tracks.Where(t => t.Artist.Equals(SelectedSongsTabInfo.FilterValue, StringComparison.OrdinalIgnoreCase)).ToList();
-                        break;
-                    default:
-                        break;
+                    _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;
                 }
             }
-            ApplySongSearchQuery();
-            IsLocalMediaNotFound = !_filteredTracks.Any();
-            ApplySongOrderType();
-        }
-
-        public void ApplySongSearchQuery()
-        {
-            if (string.IsNullOrWhiteSpace(SongSearchQuery))
-            {
-                _filteredTracks = _playlistTracks;
-                return;
-            }
-            _filteredTracks = _playlistTracks.Where(t =>
-                    t.Title.Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) ||
-                    t.Artist.Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) ||
-                    t.Album.Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase)).ToList();
-        }
-
-        private void ApplySongOrderType()
-        {
-            switch (SongOrderType)
-            {
-                case CommonSongProperty.Title:
-                    GroupedTracks = _filteredTracks.GetGroupedBy(
-                        t => LanguageHelper.GetOrderChar(t.Title),
-                        o => ((Track)o).Title
-                    );
-                    break;
-                case CommonSongProperty.Artist:
-                    GroupedTracks = _filteredTracks.GetGroupedBy(
-                        t => LanguageHelper.GetOrderChar(t.Artist),
-                        o => ((Track)o).Artist
-                    );
-                    break;
-                case CommonSongProperty.Album:
-                    GroupedTracks = _filteredTracks.GetGroupedBy(
-                        t => LanguageHelper.GetOrderChar(t.Album),
-                        o => ((Track)o).Album
-                    );
-                    break;
-            }
-        }
-
-        public void UpdateSelectedPlaylist(SongsTabInfo playlist)
-        {
-            var found = SongsTabInfoList.Where(x => x.FilterProperty == playlist.FilterProperty && x.FilterValue == playlist.FilterValue)
-                .ToList().FirstOrDefault();
-            if (found == null)
-            {
-                SongsTabInfoList.Add(playlist);
-                SelectedSongsTabInfoIndex = SongsTabInfoList.Count - 1;
-            }
-            else
-            {
-                SelectedSongsTabInfoIndex = SongsTabInfoList.IndexOf(found);
-            }
-            ApplyPlaylist();
-        }
-
-        public void PlayTrackAt(int index)
-        {
-            PlayTrack(TrackPlayingQueue.ElementAtOrDefault(index));
-        }
-
-        public void PlayTrack(PlayQueueItem? playQueueItem)
-        {
-            _timelineController.Pause();
-            _mediaPlayer.Source = null;
-            if (playQueueItem == null)
-            {
-                _smtc.IsEnabled = false;
-            }
-            else
-            {
-                var track = playQueueItem.Track;
-                var updater = _smtc.DisplayUpdater;
-                _smtc.IsEnabled = true;
-                _mediaPlayer.Source = MediaSource.CreateFromUri(new Uri(track.Path));
-                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);
-                }
-                else
-                {
-                    updater.Thumbnail = null;
-                }
-                updater.Update();
-            }
-        }
-
-        partial void OnSongOrderTypeChanged(CommonSongProperty value)
-        {
-            ApplySongOrderType();
-            IsLocalMediaNotFound = !_filteredTracks.Any();
-        }
-
-        partial void OnSongSearchQueryChanged(string value)
-        {
-            ApplySongSearchQuery();
-            IsLocalMediaNotFound = !_filteredTracks.Any();
-            ApplySongOrderType();
-        }
-
-        partial void OnPlayingSongIndexChanged(int value)
-        {
-            DisplayedPlayingSongIndex = value + 1;
-        }
-
-        partial void OnPlaybackOrderChanged(PlaybackOrder value)
-        {
-            _settingsService.PlaybackOrder = value;
         }
 
         public void Receive(PropertyChangedMessage<ObservableCollection<LocalMediaFolder>> message)

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

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

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

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

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

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

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

@@ -31,11 +31,292 @@ namespace BetterLyrics.WinUI3.ViewModels
 
         private readonly string _autoStartupTaskId = "AutoStartup";
 
+        public SettingsPageViewModel(ISettingsService settingsService, ILibWatcherService libWatcherService, IPlaybackService playbackService, ITranslateService libreTranslateService) : base(settingsService)
+        {
+            _libWatcherService = libWatcherService;
+            _playbackService = playbackService;
+            _libreTranslateService = libreTranslateService;
+
+            LibreTranslateServer = _settingsService.LibreTranslateServer;
+            SelectedTargetLanguageIndex = _settingsService.SelectedTargetLanguageIndex;
+
+            LocalMediaFolders = [.. _settingsService.LocalMediaFolders];
+            LyricsSearchProvidersInfo = [.. _settingsService.LyricsSearchProvidersInfo];
+            AlbumArtSearchProvidersInfo = [.. _settingsService.AlbumArtSearchProvidersInfo];
+
+            Language = _settingsService.Language;
+            CoverImageRadius = _settingsService.CoverImageRadius;
+
+            AutoStartWindowType = _settingsService.AutoStartWindowType;
+            AutoLockOnDesktopMode = _settingsService.AutoLockOnDesktopMode;
+
+            IsDynamicCoverOverlayEnabled = _settingsService.IsDynamicCoverOverlayEnabled;
+            CoverOverlayOpacity = _settingsService.CoverOverlayOpacity;
+            CoverOverlayBlurAmount = _settingsService.CoverOverlayBlurAmount;
+
+            LyricsAlignmentType = _settingsService.LyricsAlignmentType;
+            SongInfoAlignmentType = _settingsService.SongInfoAlignmentType;
+            LyricsFontWeight = _settingsService.LyricsFontWeight;
+            LyricsBlurAmount = _settingsService.LyricsBlurAmount;
+            LyricsVerticalEdgeOpacity = _settingsService.LyricsVerticalEdgeOpacity;
+            LyricsLineSpacingFactor = _settingsService.LyricsLineSpacingFactor;
+            LyricsFontSize = _settingsService.LyricsFontSize;
+            IsLyricsGlowEffectEnabled = _settingsService.IsLyricsGlowEffectEnabled;
+            LyricsGlowEffectScope = _settingsService.LyricsGlowEffectScope;
+            LyricsHighlightScope = _settingsService.LyricsHighlightScope;
+            IsFanLyricsEnabled = _settingsService.IsFanLyricsEnabled;
+
+            LyricsBgFontColorType = _settingsService.LyricsBgFontColorType;
+            LyricsFgFontColorType = _settingsService.LyricsFgFontColorType;
+            LyricsStrokeFontColorType = _settingsService.LyricsStrokeFontColorType;
+
+            LyricsCustomBgFontColor = _settingsService.LyricsCustomBgFontColor;
+            LyricsCustomFgFontColor = _settingsService.LyricsCustomFgFontColor;
+            LyricsCustomStrokeFontColor = _settingsService.LyricsCustomStrokeFontColor;
+
+            LyricsFontStrokeWidth = _settingsService.LyricsFontStrokeWidth;
+            LyricsBackgroundTheme = _settingsService.LyricsBackgroundTheme;
+            MediaSourceProvidersInfo = [.. _settingsService.MediaSourceProvidersInfo];
+            IgnoreFullscreenWindow = _settingsService.IgnoreFullscreenWindow;
+
+            LyricsScrollEasingType = _settingsService.LyricsScrollEasingType;
+            LyricsScrollDuration = _settingsService.LyricsScrollDuration;
+            TimelineSyncThreshold = _settingsService.TimelineSyncThreshold;
+
+            IsLyricsFloatAnimationEnabled = _settingsService.IsLyricsFloatAnimationEnabled;
+            ResetPositionOffsetOnSongChanged = _settingsService.ResetPositionOffsetOnSongChanged;
+            LockHotKeyIndex = _settingsService.LockHotKeyIndex;
+
+            LXMusicServer = _settingsService.LXMusicServer;
+            DockPlacement = _settingsService.DockPlacement;
+            LyricsBgFontOpacity = _settingsService.LyricsBgFontOpacity;
+            HideWindowWhenNotPlaying = _settingsService.HideWindowWhenNotPlaying;
+            DockWindowHeight = _settingsService.DockWindowHeight;
+
+            SystemFontNames = [.. FontHelper.SystemFontFamilies];
+            SelectedFontFamilyIndex = _settingsService.SelectedFontFamilyIndex;
+            LyricsFontFamily = _settingsService.LyricsFontFamily;
+            IsDragEverywhereEnabled = _settingsService.IsDragEverywhereEnabled;
+
+            _playbackService.MediaSourceProvidersInfoChanged += PlaybackService_SessionIdsChanged;
+
+            Task.Run(async () =>
+            {
+                BuildDate = (await MetadataHelper.GetBuildDate()).ToString("(yyyy/MM/dd HH:mm:ss)");
+            });
+        }
+
         private void PlaybackService_SessionIdsChanged(object? sender, Events.MediaSourceProvidersInfoEventArgs e)
         {
             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; }
+
+        [ObservableProperty]
+        public partial AutoStartWindowType AutoStartWindowType { get; set; }
+
+        [ObservableProperty]
+        public partial bool AutoLockOnDesktopMode { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int CoverImageRadius { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int CoverOverlayBlurAmount { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int CoverOverlayOpacity { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool IsDebugOverlayEnabled { get; set; } = false;
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool IsLogEnabled { get; set; } = false;
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool IsDynamicCoverOverlayEnabled { get; set; }
+
+        [ObservableProperty]
+        public partial Enums.Language Language { get; set; }
+
+        [ObservableProperty]
+        public partial ObservableCollection<LocalMediaFolder> LocalMediaFolders { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial ObservableCollection<LyricsSearchProviderInfo> LyricsSearchProvidersInfo { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial ObservableCollection<AlbumArtSearchProviderInfo> AlbumArtSearchProvidersInfo { get; set; }
+
+        [ObservableProperty]
+        public partial ObservableCollection<MediaSourceProviderInfo> MediaSourceProvidersInfo { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool IsFanLyricsEnabled { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool IsLyricsGlowEffectEnabled { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial TextAlignmentType LyricsAlignmentType { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial TextAlignmentType SongInfoAlignmentType { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int LyricsBlurAmount { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial Color LyricsCustomBgFontColor { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial Color LyricsCustomFgFontColor { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial Color LyricsCustomStrokeFontColor { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int LyricsBgFontOpacity { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial LyricsFontColorType LyricsBgFontColorType { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial LyricsFontColorType LyricsFgFontColorType { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial LyricsFontColorType LyricsStrokeFontColorType { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int LyricsFontSize { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial LyricsFontWeight LyricsFontWeight { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial LineRenderingType LyricsGlowEffectScope { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial LineRenderingType LyricsHighlightScope { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial float LyricsLineSpacingFactor { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int LyricsVerticalEdgeOpacity { get; set; }
+
+        [ObservableProperty]
+        public partial object NavViewSelectedItemTag { get; set; } = "App";
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool ResetPositionOffsetOnSongChanged { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool IsLyricsFloatAnimationEnabled { get; set; }
+
+        public string Version { get; set; } = MetadataHelper.AppVersion;
+
+        public string BuildDate { get; set; } = string.Empty;
+
+        [ObservableProperty]
+        public partial string LibreTranslateServer { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int SelectedTargetLanguageIndex { get; set; } = 0;
+
+        [ObservableProperty]
+        public partial bool IsLibreTranslateServerTesting { get; set; } = false;
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int LyricsFontStrokeWidth { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool IgnoreFullscreenWindow { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial EasingType LyricsScrollEasingType { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int LyricsScrollDuration { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int TimelineSyncThreshold { get; set; }
+
+        [ObservableProperty]
+        public partial bool IsLXMusicServerTesting { get; set; } = false;
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial string LXMusicServer { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool HideWindowWhenNotPlaying { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int DockWindowHeight { get; set; }
+
         public void OnLyricsSearchProvidersReordered()
         {
             _settingsService.LyricsSearchProvidersInfo = [.. LyricsSearchProvidersInfo];
@@ -64,13 +345,13 @@ namespace BetterLyrics.WinUI3.ViewModels
             Broadcast(LocalMediaFolders, LocalMediaFolders, nameof(LocalMediaFolders));
         }
 
-        public void ToggleLocalLyricsFolder()
+        public void ToggleLocalLyricsFolder(LocalMediaFolder folder)
         {
             _settingsService.LocalMediaFolders = [.. LocalMediaFolders];
             Broadcast(LocalMediaFolders, LocalMediaFolders, nameof(LocalMediaFolders));
         }
 
-        public void ToggleLyricsSearchProvider()
+        public void ToggleLyricsSearchProvider(LyricsSearchProviderInfo providerInfo)
         {
             _settingsService.LyricsSearchProvidersInfo = [.. LyricsSearchProvidersInfo];
             Broadcast(
@@ -209,13 +490,6 @@ namespace BetterLyrics.WinUI3.ViewModels
             });
         }
 
-        [RelayCommand]
-        private void RefreshMonitorDeviceNames()
-        {
-            MonitorDeviceNames = [.. MonitorHelper.GetAllMonitorDeviceNames()];
-            SelectedDockMonitorDeviceName = MonitorHelper.GetPrimaryMonitorDeviceName();
-        }
-
         public async Task<bool> ToggleAutoStartupAsync(bool target)
         {
             StartupTask startupTask = await StartupTask.GetAsync(_autoStartupTaskId);
@@ -247,5 +521,204 @@ 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)
+            {
+                case Enums.Language.FollowSystem:
+                    ApplicationLanguages.PrimaryLanguageOverride = "";
+                    break;
+                case Enums.Language.English:
+                    ApplicationLanguages.PrimaryLanguageOverride = "en-US";
+                    break;
+                case Enums.Language.SimplifiedChinese:
+                    ApplicationLanguages.PrimaryLanguageOverride = "zh-CN";
+                    break;
+                case Enums.Language.TraditionalChinese:
+                    ApplicationLanguages.PrimaryLanguageOverride = "zh-TW";
+                    break;
+                case Enums.Language.Japanese:
+                    ApplicationLanguages.PrimaryLanguageOverride = "ja-JP";
+                    break;
+                case Enums.Language.Korean:
+                    ApplicationLanguages.PrimaryLanguageOverride = "ko-KR";
+                    break;
+                default:
+                    break;
+            }
+            _settingsService.Language = Language;
+        }
+        partial void OnIsFanLyricsEnabledChanged(bool value)
+        {
+            _settingsService.IsFanLyricsEnabled = value;
+        }
+        partial void OnIsLyricsGlowEffectEnabledChanged(bool value)
+        {
+            _settingsService.IsLyricsGlowEffectEnabled = value;
+        }
+        partial void OnLyricsAlignmentTypeChanged(TextAlignmentType value)
+        {
+            _settingsService.LyricsAlignmentType = value;
+        }
+        partial void OnSongInfoAlignmentTypeChanged(TextAlignmentType value)
+        {
+            _settingsService.SongInfoAlignmentType = value;
+        }
+        partial void OnLyricsBlurAmountChanged(int value)
+        {
+            _settingsService.LyricsBlurAmount = value;
+        }
+        partial void OnLyricsCustomBgFontColorChanged(Color value)
+        {
+            _settingsService.LyricsCustomBgFontColor = value;
+        }
+        partial void OnLyricsCustomFgFontColorChanged(Color value)
+        {
+            _settingsService.LyricsCustomFgFontColor = value;
+        }
+        partial void OnLyricsCustomStrokeFontColorChanged(Color value)
+        {
+            _settingsService.LyricsCustomStrokeFontColor = value;
+        }
+        partial void OnLyricsBgFontColorTypeChanged(LyricsFontColorType value)
+        {
+            _settingsService.LyricsBgFontColorType = value;
+        }
+        partial void OnLyricsFgFontColorTypeChanged(LyricsFontColorType value)
+        {
+            _settingsService.LyricsFgFontColorType = value;
+        }
+        partial void OnLyricsStrokeFontColorTypeChanged(LyricsFontColorType value)
+        {
+            _settingsService.LyricsStrokeFontColorType = value;
+        }
+        partial void OnLyricsFontSizeChanged(int value)
+        {
+            _settingsService.LyricsFontSize = value;
+        }
+        partial void OnLyricsFontWeightChanged(LyricsFontWeight value)
+        {
+            _settingsService.LyricsFontWeight = value;
+        }
+        partial void OnLyricsGlowEffectScopeChanged(LineRenderingType value)
+        {
+            _settingsService.LyricsGlowEffectScope = value;
+        }
+        partial void OnLyricsHighlightScopeChanged(LineRenderingType value)
+        {
+            _settingsService.LyricsHighlightScope = value;
+        }
+        partial void OnLyricsLineSpacingFactorChanged(float value)
+        {
+            _settingsService.LyricsLineSpacingFactor = value;
+        }
+        partial void OnLyricsVerticalEdgeOpacityChanged(int value)
+        {
+            _settingsService.LyricsVerticalEdgeOpacity = value;
+        }
+        partial void OnTimelineSyncThresholdChanged(int value)
+        {
+            _settingsService.TimelineSyncThreshold = value;
+        }
+        partial void OnIsLyricsFloatAnimationEnabledChanged(bool value)
+        {
+            _settingsService.IsLyricsFloatAnimationEnabled = value;
+        }
+        partial void OnResetPositionOffsetOnSongChangedChanged(bool value)
+        {
+            _settingsService.ResetPositionOffsetOnSongChanged = value;
+        }
+        partial void OnLyricsBgFontOpacityChanged(int value)
+        {
+            _settingsService.LyricsBgFontOpacity = value;
+        }
+        partial void OnHideWindowWhenNotPlayingChanged(bool value)
+        {
+            _settingsService.HideWindowWhenNotPlaying = value;
+        }
+        partial void OnDockWindowHeightChanged(int value)
+        {
+            _settingsService.DockWindowHeight = value;
+        }
+        partial void OnSelectedFontFamilyIndexChanged(int value)
+        {
+            _settingsService.SelectedFontFamilyIndex = value;
+            LyricsFontFamily = SystemFontNames[value];
+        }
+        partial void OnLyricsFontFamilyChanged(string value)
+        {
+            _settingsService.LyricsFontFamily = value;
+        }
+        partial void OnIsDragEverywhereEnabledChanged(bool value)
+        {
+            _settingsService.IsDragEverywhereEnabled = value;
+
+            LyricsWindow? lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
+            if (lyricsWindow != null)
+            {
+                lyricsWindow.UpdateTitleBarArea();
+            }
+        }
     }
 }

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

@@ -6,8 +6,6 @@ using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
 using Microsoft.UI.Xaml;
-using System;
-using WinUIEx;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
@@ -42,23 +40,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             {
                 DockModeHelper.Disable(lyricsWindow);
             }
-            Environment.Exit(0);
-        }
-
-        [RelayCommand]
-        private static void RestartApp()
-        {
-            WindowHelper.RestartApp();
-        }
-
-        [RelayCommand]
-        private static void ResetWindowPosition()
-        {
-            LyricsWindow? lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (lyricsWindow != null)
-            {
-                lyricsWindow.MoveAndResize(0, 0, 800, 600);
-            }
+            Application.Current.Exit();
         }
 
         [RelayCommand]
@@ -67,18 +49,6 @@ namespace BetterLyrics.WinUI3.ViewModels
             WindowHelper.OpenWindow<SettingsWindow>();
         }
 
-        [RelayCommand]
-        private static void OpenMusicGallery()
-        {
-            WindowHelper.OpenWindow<MusicGalleryWindow>();
-        }
-
-        [RelayCommand]
-        private static void OpenLyricsWindow()
-        {
-            WindowHelper.OpenWindow<LyricsWindow>();
-        }
-
         [RelayCommand]
         private void UnlockWindow()
         {

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

@@ -29,7 +29,7 @@
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
                 FontFamily="{x:Bind ViewModel.LyricsFontFamily, Mode=OneWay}"
-                FontSize="{x:Bind ViewModel.HintMessageFontSize, Mode=OneWay}" />
+                FontSize="{x:Bind ViewModel.LyricsFontSize, Mode=OneWay}" />
             <Grid.OpacityTransition>
                 <ScalarTransition />
             </Grid.OpacityTransition>
@@ -92,7 +92,7 @@
                             <ToolTipService.ToolTip>
                                 <ToolTip x:Name="TimelineOffsetToolTip" x:Uid="LyricsPageTimelineOffsetButtonToolTip" />
                             </ToolTipService.ToolTip>
-                            <Button.ContextFlyout>
+                            <Button.DataContext>
                                 <Flyout x:Name="TimelineOffsetFlyout" ShouldConstrainToRootBounds="False">
                                     <StackPanel>
                                         <Slider
@@ -122,7 +122,7 @@
                                         </CheckBox>
                                     </StackPanel>
                                 </Flyout>
-                            </Button.ContextFlyout>
+                            </Button.DataContext>
                         </Button>
 
                     </StackPanel>
@@ -244,7 +244,7 @@
                                     </FontIcon.OpacityTransition>
                                 </FontIcon>
                             </Grid>
-                            <Button.ContextFlyout>
+                            <Button.DataContext>
                                 <Flyout x:Name="VolumeFlyout" ShouldConstrainToRootBounds="False">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock x:Uid="SettingsPageSliderPrefix" VerticalAlignment="Center" />
@@ -264,7 +264,7 @@
                             </Button.DataContext>
                         </Button>-->
 
-                        <!--  Lyrics & Translation  -->
+                        <!--  Translation  -->
                         <Button
                             Click="TranslationButton_Click"
                             Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
@@ -273,32 +273,17 @@
                             <ToolTipService.ToolTip>
                                 <ToolTip x:Name="TranslationToolTip" x:Uid="LyricsPageTranslationButtonToolTip" />
                             </ToolTipService.ToolTip>
-                            <Button.ContextFlyout>
+                            <Button.DataContext>
                                 <Flyout x:Name="TranslationFlyout" ShouldConstrainToRootBounds="False">
-                                    <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-                                        <controls:SettingsExpander
-                                            x:Uid="LyricsPageTranslationEnabled"
-                                            HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                                     Glyph=&#xE774;}"
-                                            IsExpanded="True">
-                                            <ToggleSwitch IsOn="{x:Bind ViewModel.IsTranslationEnabled, Mode=TwoWay}" />
-                                            <controls:SettingsExpander.Items>
-                                                <controls:SettingsCard x:Uid="LyricsPageTranslationOnly" IsEnabled="{x:Bind ViewModel.IsTranslationEnabled, Mode=OneWay}">
-                                                    <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTranslationOnly, Mode=TwoWay}" />
-                                                </controls:SettingsCard>
-                                            </controls:SettingsExpander.Items>
-                                        </controls:SettingsExpander>
-                                        <StackPanel Orientation="Horizontal" Spacing="6">
-                                            <TextBlock x:Uid="LyricsPageLyricsProviderPrefix" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind ViewModel.LyricsSearchProvider, Mode=OneWay, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}" />
-                                        </StackPanel>
-                                        <StackPanel Orientation="Horizontal" Spacing="6">
-                                            <TextBlock x:Uid="LyricsPageTranslationProviderPrefix" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind ViewModel.TranslationSearchProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}" />
-                                        </StackPanel>
+                                    <StackPanel>
+                                        <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.ContextFlyout>
+                            </Button.DataContext>
                         </Button>
 
                         <!--  Display type  -->
@@ -312,7 +297,7 @@
                             <ToolTipService.ToolTip>
                                 <ToolTip x:Name="PresentationTypeToolTip" x:Uid="LyricsPageDisplayTypeButtonToolTip" />
                             </ToolTipService.ToolTip>
-                            <Button.ContextFlyout>
+                            <Button.DataContext>
                                 <Flyout x:Name="DisplayTypeSwitchFlyout" ShouldConstrainToRootBounds="false">
                                     <Flyout.FlyoutPresenterStyle>
                                         <Style TargetType="FlyoutPresenter">
@@ -326,7 +311,7 @@
                                         <RadioButton x:Uid="MainPageSplitView" Click="SplitViewRadioButton_Click" />
                                     </RadioButtons>
                                 </Flyout>
-                            </Button.ContextFlyout>
+                            </Button.DataContext>
                         </Button>
 
                         <!--  Settings  -->
@@ -352,9 +337,19 @@
                     Maximum="{x:Bind ViewModel.SongDurationSeconds, Mode=OneWay}"
                     Minimum="0"
                     Style="{StaticResource GhostSliderStyle}"
-                    Tapped="TimelineSliderOverlay_Tapped"
                     ThumbToolTipValueConverter="{StaticResource SecondsToFormattedTimeConverter}"
                     Value="{x:Bind ViewModel.TimelinePositionSeconds, Mode=OneWay}" />
+
+                <Slider
+                    x:Name="TimelineSliderOverlay"
+                    Margin="0,-32,0,0"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Top"
+                    Maximum="{Binding ElementName=TimelineSlider, Path=Maximum}"
+                    Minimum="0"
+                    Style="{StaticResource TransparentSliderStyle}"
+                    Tapped="TimelineSliderOverlay_Tapped"
+                    ThumbToolTipValueConverter="{StaticResource SecondsToFormattedTimeConverter}" />
             </Grid>
 
         </Grid>
@@ -388,7 +383,7 @@
                 <Flyout x:Name="BottomCommandFlyout" ShouldConstrainToRootBounds="False">
                     <Flyout.FlyoutPresenterStyle>
                         <Style TargetType="FlyoutPresenter">
-                            <Setter Property="MinWidth" Value="450" />
+                            <Setter Property="MinWidth" Value="600" />
                             <Setter Property="MinHeight" Value="100" />
                             <Setter Property="CornerRadius" Value="12" />
                         </Style>

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

@@ -90,7 +90,7 @@ namespace BetterLyrics.WinUI3.Views
 
         private void RootGrid_SizeChanged(object sender, SizeChangedEventArgs e)
         {
-            if (e.NewSize.Width < 450 || e.NewSize.Height < 100)
+            if (e.NewSize.Width < 500 || e.NewSize.Height < 100)
             {
                 if (BottomCommandGrid.Children.Count != 0)
                 {
@@ -142,7 +142,7 @@ namespace BetterLyrics.WinUI3.Views
 
         private void TimelineSliderOverlay_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
         {
-            _playbackService.ChangePosition(TimelineSlider.Value);
+            _playbackService.ChangePosition(TimelineSliderOverlay.Value);
         }
     }
 }

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

@@ -44,10 +44,43 @@
                         <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>
+
+            <Grid Padding="3" HorizontalAlignment="Right">
+                <StackPanel
+                    x:Name="TopRightCommandStackPanel"
+                    Orientation="Horizontal"
+                    Spacing="3">
+                    <StackPanel.OpacityTransition>
+                        <ScalarTransition />
+                    </StackPanel.OpacityTransition>
+
                     <!--  Look  -->
                     <Button
                         x:Name="ClickThroughButton"
-                        Click="ClickThroughButton_Click"
+                        Command="{x:Bind ViewModel.ToggleLockWindowCommand}"
                         Style="{StaticResource TitleBarButtonStyle}">
                         <FontIcon
                             FontFamily="{StaticResource IconFontFamily}"
@@ -94,50 +127,66 @@
                                 <ToggleMenuFlyoutItem
                                     x:Name="DockFlyoutItem"
                                     x:Uid="HostWindowDockFlyoutItem"
-                                    Click="DockFlyoutItem_Click"
+                                    Command="{x:Bind ViewModel.ToggleDockModeCommand}"
                                     IsChecked="{x:Bind ViewModel.IsDockMode, Mode=OneWay}" />
                                 <ToggleMenuFlyoutItem
                                     x:Name="DesktopFlyoutItem"
                                     x:Uid="HostWindowDesktopFlyoutItem"
-                                    Click="DesktopFlyoutItem_Click"
+                                    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="MusicGalleryFlyoutItem"
-                                    x:Uid="SystemTrayMusicGallery"
-                                    Click="MusicGalleryMenuFlyoutItem_Click" />
                                 <MenuFlyoutItem
                                     x:Name="SettingsFlyoutItem"
-                                    x:Uid="SystemTraySettings"
+                                    x:Uid="HostWindowSettingsFlyoutItem"
                                     Click="SettingsMenuFlyoutItem_Click" />
                             </MenuFlyout>
                         </Button.Flyout>
                     </Button>
-                    <!--  Immersive mode  -->
-                    <ToggleButton
-                        x:Name="ImmersiveButton"
-                        Command="{x:Bind ViewModel.ImmersiveToggleButtonEnabledChangedCommand}"
-                        IsChecked="{x:Bind ViewModel.IsImmersiveMode, Mode=TwoWay}"
-                        Style="{StaticResource TitleBarToggleButtonStyle}">
+
+                    <!--  Window Minimise  -->
+                    <Button
+                        x:Name="MinimiseButton"
+                        Click="MinimiseButton_Click"
+                        Style="{StaticResource TitleBarButtonStyle}">
                         <FontIcon
                             FontFamily="{StaticResource IconFontFamily}"
-                            FontSize="{x:Bind ViewModel.TitleBarFontSize}"
-                            Glyph="&#xED1A;" />
-                    </ToggleButton>
-                </StackPanel>
-            </Grid>
-
-            <Grid Padding="3" HorizontalAlignment="Right">
-                <StackPanel
-                    x:Name="TopRightCommandStackPanel"
-                    Orientation="Horizontal"
-                    Spacing="3">
-                    <StackPanel.OpacityTransition>
-                        <ScalarTransition />
-                    </StackPanel.OpacityTransition>
+                            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>
 

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

@@ -3,14 +3,18 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Services;
+using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.Mvvm.Messaging.Messages;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Input;
-using System;
+using System.Drawing;
+using System.Threading.Tasks;
+using System.Windows.Forms;
 using Vanara.PInvoke;
-using WinRT.Interop;
-using WinUIEx;
+using Windows.System;
 using WinUIEx.Messaging;
 
 namespace BetterLyrics.WinUI3.Views
@@ -24,25 +28,16 @@ namespace BetterLyrics.WinUI3.Views
         {
             this.InitializeComponent();
 
-            AppWindow.SetIcons();
-
             AppWindow.Changed += AppWindow_Changed;
 
             ExtendsContentIntoTitleBar = true;
-            UpdateTitleBarArea();
-
+            AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Collapsed;
             Title = App.ResourceLoader!.GetString("LyricsPageTitle");
 
+            UpdateTitleBarArea();
+
             _wmm = new WindowMessageMonitor(this);
             _wmm.WindowMessageReceived += Wmm_WindowMessageReceived;
-
-            AppWindow.Closing += AppWindow_Closing;
-        }
-
-        private void AppWindow_Closing(AppWindow sender, AppWindowClosingEventArgs args)
-        {
-            DockModeHelper.Disable(this);
-            Environment.Exit(0);
         }
 
         public void UpdateTitleBarArea()
@@ -74,11 +69,20 @@ 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,
                         _settingsService.StandardWindowWidth,
-                        _settingsService.StandardWindowHeight));
+                        _settingsService.StandardWindowHeight
+                    ));
                     break;
                 case AutoStartWindowType.DockMode:
                     DockFlyoutItem.IsChecked = true;
@@ -110,14 +114,10 @@ namespace BetterLyrics.WinUI3.Views
 
             if (args.DidPositionChange || args.DidSizeChange)
             {
-                var size = AppWindow.Size;
                 var rect = AppWindow.Position;
+                var size = AppWindow.Size;
 
-                if (rect.X < 0 && rect.Y < 0 && rect.X + size.Width < 0 && rect.Y + size.Height < 0)
-                {
-                    return;
-                }
-                else
+                if (rect.X >= 0 && rect.Y >= 0 && size.Width > 0 && size.Height > 0)
                 {
                     if (ViewModel.IsDesktopMode)
                     {
@@ -184,12 +184,14 @@ namespace BetterLyrics.WinUI3.Views
                 case AppWindowPresenterKind.Default:
                     break;
                 case AppWindowPresenterKind.CompactOverlay:
+                    MinimiseButton.Visibility = MaximiseButton.Visibility = RestoreButton.Visibility =
                     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 =
                     AOTFlyoutItem.Visibility =
                     ClickThroughButton.Visibility =
                     DesktopFlyoutItem.Visibility =
@@ -206,6 +208,7 @@ namespace BetterLyrics.WinUI3.Views
                         overlappedPresenter.IsMinimizable =
                         overlappedPresenter.IsMaximizable = false;
 
+                        MinimiseButton.Visibility = MaximiseButton.Visibility = RestoreButton.Visibility =
                         AOTFlyoutItem.Visibility =
                         DesktopFlyoutItem.Visibility =
                         ClickThroughButton.Visibility =
@@ -220,6 +223,7 @@ namespace BetterLyrics.WinUI3.Views
                         overlappedPresenter.IsMinimizable =
                         overlappedPresenter.IsMaximizable = false;
 
+                        MinimiseButton.Visibility = MaximiseButton.Visibility = RestoreButton.Visibility =
                         DockFlyoutItem.Visibility =
                         AOTFlyoutItem.Visibility =
                         FullScreenFlyoutItem.Visibility =
@@ -233,6 +237,7 @@ namespace BetterLyrics.WinUI3.Views
                         overlappedPresenter.IsMinimizable =
                         overlappedPresenter.IsMaximizable = true;
 
+                        MinimiseButton.Visibility =
                         AOTFlyoutItem.Visibility =
                         DesktopFlyoutItem.Visibility =
                         DockFlyoutItem.Visibility =
@@ -243,6 +248,17 @@ namespace BetterLyrics.WinUI3.Views
                         ClickThroughButton.Visibility = Visibility.Collapsed;
                         AOTFlyoutItem.IsChecked = overlappedPresenter.IsAlwaysOnTop;
 
+                        if (overlappedPresenter.State == OverlappedPresenterState.Maximized)
+                        {
+                            MaximiseButton.Visibility = Visibility.Collapsed;
+                            RestoreButton.Visibility = Visibility.Visible;
+                        }
+                        else if (overlappedPresenter.State == OverlappedPresenterState.Restored)
+                        {
+                            MaximiseButton.Visibility = Visibility.Visible;
+                            RestoreButton.Visibility = Visibility.Collapsed;
+                        }
+
                         ViewModel.IsImmersiveMode = _settingsService.IsImmersiveMode;
                     }
                     break;
@@ -251,6 +267,36 @@ namespace BetterLyrics.WinUI3.Views
             }
         }
 
+        private void CloseButton_Click(object sender, RoutedEventArgs e)
+        {
+            DockModeHelper.Disable(this);
+            Application.Current.Exit();
+        }
+
+        private void MaximiseButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (AppWindow.Presenter is OverlappedPresenter presenter)
+            {
+                presenter.Maximize();
+            }
+        }
+
+        private void MinimiseButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (AppWindow.Presenter is OverlappedPresenter presenter)
+            {
+                presenter.Minimize();
+            }
+        }
+
+        private void RestoreButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (AppWindow.Presenter is OverlappedPresenter presenter)
+            {
+                presenter.Restore();
+            }
+        }
+
         private void TopCommandGrid_PointerEntered(object sender, PointerRoutedEventArgs e)
         {
             if (ViewModel.IsImmersiveMode)
@@ -288,23 +334,7 @@ namespace BetterLyrics.WinUI3.Views
         {
         }
 
-        private void ClickThroughButton_Click(object sender, RoutedEventArgs e)
-        {
-            ViewModel.ToggleLockWindowCommand.Execute(null);
-        }
-
-        private void DockFlyoutItem_Click(object sender, RoutedEventArgs e)
-        {
-            ViewModel.ToggleDockModeCommand.Execute(null);
-        }
-
-        private void DesktopFlyoutItem_Click(object sender, RoutedEventArgs e)
-        {
-            ViewModel.ToggleDesktopModeCommand.Execute(null);
-            UpdateTitleBarWindowButtonsVisibility();
-        }
-
-        private void MusicGalleryMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
+        private void MusicGalleryButton_Click(object sender, RoutedEventArgs e)
         {
             WindowHelper.OpenWindow<MusicGalleryWindow>();
         }

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

@@ -12,395 +12,190 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:media="using:CommunityToolkit.WinUI.Media"
     xmlns:models="using:BetterLyrics.WinUI3.Models"
-    xmlns:templateselector="using:BetterLyrics.WinUI3.TemplateSelector"
     xmlns:ui="using:CommunityToolkit.WinUI"
+    Loaded="Page_Loaded"
     mc:Ignorable="d">
     <Page.Resources>
         <CollectionViewSource
-            x:Name="GroupedTracksCVS"
+            x:Name="TracksByTitleCVS"
             IsSourceGrouped="True"
-            Source="{x:Bind ViewModel.GroupedTracks, Mode=OneWay}" />
+            Source="{x:Bind ViewModel.TracksByTitle, Mode=OneWay}" />
     </Page.Resources>
 
     <Grid>
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="3*" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Grid
-                x:Name="SongViewer"
-                Grid.Column="0"
-                Padding="12">
-                <Grid.Tag>
-                    <Flyout
-                        x:Name="SongFileInfoFlyout"
-                        Placement="Bottom"
-                        ShouldConstrainToRootBounds="False">
-                        <ScrollViewer Width="300" Height="300">
-                            <StackPanel Spacing="12">
-                                <StackPanel>
-                                    <TextBlock x:Uid="MusicGalleryPageFileInfoTitle" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                    <TextBlock Text="{x:Bind ViewModel.TrackRightTapped.Title, Mode=OneWay}" />
-                                </StackPanel>
-                                <StackPanel>
-                                    <TextBlock x:Uid="MusicGalleryPageFileArtist" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                    <TextBlock Text="{x:Bind ViewModel.TrackRightTapped.Artist, Mode=OneWay}" />
-                                </StackPanel>
-                                <StackPanel>
-                                    <TextBlock x:Uid="MusicGalleryPageFileAlbum" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                    <TextBlock Text="{x:Bind ViewModel.TrackRightTapped.Album, Mode=OneWay}" />
-                                </StackPanel>
-                                <StackPanel>
-                                    <TextBlock x:Uid="MusicGalleryPageFileInfoYear" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                    <TextBlock Text="{x:Bind ViewModel.TrackRightTapped.Year, Mode=OneWay}" />
-                                </StackPanel>
-                                <StackPanel>
-                                    <TextBlock x:Uid="MusicGalleryPageFileInfoDuration" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                    <TextBlock Text="{x:Bind ViewModel.TrackRightTapped.Duration, Converter={StaticResource SecondsToFormattedTimeConverter}, Mode=OneWay}" />
-                                </StackPanel>
-                                <StackPanel>
-                                    <TextBlock x:Uid="MusicGalleryPageFileInfoBitrate" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                    <TextBlock Text="{x:Bind ViewModel.TrackRightTapped.Bitrate, Mode=OneWay}" />
-                                </StackPanel>
-                                <StackPanel>
-                                    <TextBlock x:Uid="MusicGalleryPageFileInfoSampleRate" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                    <TextBlock Text="{x:Bind ViewModel.TrackRightTapped.SampleRate, Mode=OneWay}" />
-                                </StackPanel>
-                                <StackPanel>
-                                    <TextBlock x:Uid="MusicGalleryPageFileInfoBitDepth" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                    <TextBlock Text="{x:Bind ViewModel.TrackRightTapped.BitDepth, Mode=OneWay}" />
-                                </StackPanel>
-                                <StackPanel>
-                                    <TextBlock x:Uid="MusicGalleryPageFileInfoFormat" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                    <TextBlock Text="{x:Bind ViewModel.TrackRightTapped.AudioFormat.Name, Mode=OneWay}" />
-                                </StackPanel>
-                                <StackPanel>
-                                    <TextBlock x:Uid="MusicGalleryPageFileInfoEncoder" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                    <TextBlock Text="{x:Bind ViewModel.TrackRightTapped.Encoder, Mode=OneWay}" />
-                                </StackPanel>
-                                <StackPanel>
-                                    <TextBlock x:Uid="MusicGalleryPageFileInfoPath" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                    <HyperlinkButton
-                                        Margin="-12,0,0,0"
-                                        Click="SongPathHyperlinkButton_Click"
-                                        Content="{x:Bind ViewModel.TrackRightTapped.Path, Mode=OneWay}" />
-                                </StackPanel>
-                            </StackPanel>
-                        </ScrollViewer>
-                    </Flyout>
-                </Grid.Tag>
+        <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" />
 
-                <ListView
-                    VerticalAlignment="Top"
-                    ItemsSource="{x:Bind ViewModel.SongsTabInfoList, Mode=OneWay}"
-                    ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                    ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                    SelectedIndex="{x:Bind ViewModel.SelectedSongsTabInfoIndex, Mode=TwoWay}">
-                    <ListView.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <ItemsStackPanel Orientation="Horizontal" />
-                        </ItemsPanelTemplate>
-                    </ListView.ItemsPanel>
-                    <ListView.ItemTemplate>
-                        <DataTemplate x:DataType="models:SongsTabInfo">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="1*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <Grid
-                                    Grid.Column="0"
-                                    Background="Transparent"
-                                    ColumnSpacing="6"
-                                    Tapped="PlaylistGrid_Tapped">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="1*" />
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
-                                    <FontIcon
-                                        Grid.Column="0"
-                                        FontFamily="{StaticResource IconFontFamily}"
-                                        FontSize="16"
-                                        Glyph="{Binding Icon}" />
-                                    <TextBlock
-                                        Grid.Column="1"
-                                        VerticalAlignment="Center"
-                                        Text="{Binding Name}" />
-                                </Grid>
-                                <Button
-                                    Grid.Column="1"
-                                    Click="PlaylistCloseButton_Click"
-                                    Content="{ui:FontIcon FontSize=10,
-                                                          FontFamily={StaticResource IconFontFamily},
-                                                          Glyph=&#xE8BB;}"
-                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                    Style="{StaticResource GhostButtonStyle}"
-                                    Visibility="{Binding IsClosable, Converter={StaticResource BoolToVisibilityConverter}}" />
-                            </Grid>
-                        </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
+            <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>
 
-                <Grid Margin="0,48,0,0" VerticalAlignment="Top">
-                    <AutoSuggestBox
-                        x:Name="SongSearchBox"
-                        x:Uid="MusicGalleryPageSongSearchBox"
-                        HorizontalAlignment="Stretch"
-                        QueryIcon="Find"
-                        Text="{x:Bind ViewModel.SongSearchQuery, Mode=TwoWay}" />
-                </Grid>
+            <controls:SwitchPresenter Margin="0,96,0,0" Value="{Binding ElementName=Segmented, Path=Tag, Mode=OneWay}">
+                <controls:SwitchPresenter.ContentTransitions>
+                    <TransitionCollection>
+                        <PopupThemeTransition />
+                    </TransitionCollection>
+                </controls:SwitchPresenter.ContentTransitions>
 
-                <Grid Margin="0,96,0,0" VerticalAlignment="Top">
-                    <StackPanel
-                        HorizontalAlignment="Left"
-                        Orientation="Horizontal"
-                        Spacing="12">
-                        <ToggleButton
-                            x:Name="SelectAllToggleButton"
-                            x:Uid="MusicGalleryPageSelectAll"
-                            Click="SelectAllToggleButton_Click" />
-                        <Button x:Uid="MusicGalleryPageAddToPlayingQueue">
-                            <Button.Flyout>
-                                <MenuFlyout>
-                                    <MenuFlyoutItem x:Uid="MusicGalleryPageAddToNext" Click="AddSongToQueueNextMenuFlyoutItem_Click" />
-                                    <MenuFlyoutItem x:Uid="MusicGalleryPageAddToEnd" Click="AddSongToQueueEndMenuFlyoutItem_Click" />
-                                </MenuFlyout>
-                            </Button.Flyout>
-                        </Button>
-                        <Button x:Uid="MusicGalleryPageAddToCustomList" Visibility="Collapsed">
-                            <Button.Flyout>
-                                <MenuFlyout>
-                                    <MenuFlyoutItem x:Uid="MusicGalleryPageNewPlaylist" Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE710;}" />
-                                </MenuFlyout>
-                            </Button.Flyout>
-                        </Button>
-                    </StackPanel>
-                    <StackPanel
-                        HorizontalAlignment="Right"
-                        Orientation="Horizontal"
-                        Spacing="12">
-                        <StackPanel Orientation="Horizontal" Spacing="12">
-                            <TextBlock
-                                x:Uid="MusicGalleryPageSortType"
-                                VerticalAlignment="Center"
-                                Style="{StaticResource BodyStrongTextBlockStyle}" />
-                            <controls:Segmented
-                                x:Name="Segmented"
-                                SelectedIndex="{x:Bind ViewModel.SongOrderType, Converter={StaticResource EnumToIntConverter}, Mode=TwoWay}"
-                                SelectionMode="Single">
-                                <controls:SegmentedItem x:Uid="MusicGalleryPageSortByTitle" Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEC4F;}" />
-                                <controls:SegmentedItem x:Uid="MusicGalleryPageSortByAlbum" Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE93C;}" />
-                                <controls:SegmentedItem x:Uid="MusicGalleryPageSortByArtist" Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEFA9;}" />
-                            </controls:Segmented>
-                        </StackPanel>
-                    </StackPanel>
-                </Grid>
+                <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 Margin="0,140,0,0">
-                    <SemanticZoom.ZoomedInView>
-                        <ListView
-                            x:Name="SongListView"
-                            ItemsSource="{x:Bind GroupedTracksCVS.View, Mode=OneWay}"
-                            SelectionChanged="SongListView_SelectionChanged"
-                            SelectionMode="Multiple">
-                            <ListView.ItemTemplate>
-                                <DataTemplate x:DataType="atl:Track">
-                                    <Grid Padding="12" RightTapped="SongListViewItemGrid_RightTapped">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="2*" />
-                                            <ColumnDefinition Width="1.5*" />
-                                            <ColumnDefinition Width="1.5*" />
-                                            <ColumnDefinition Width="1*" />
-                                            <ColumnDefinition Width="1*" />
-                                        </Grid.ColumnDefinitions>
+                        <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="0"
+                                                VerticalAlignment="Center"
+                                                Text="{Binding Title}"
+                                                TextWrapping="Wrap" />
 
-                                        <!--  歌手名  -->
-                                        <HyperlinkButton
-                                            Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            Click="ArtistHyperlibkButton_Click"
-                                            Tag="{Binding Artist}">
-                                            <TextBlock Text="{Binding Artist}" TextWrapping="Wrap" />
-                                        </HyperlinkButton>
+                                            <!--  歌手名  -->
+                                            <TextBlock
+                                                Grid.Column="1"
+                                                VerticalAlignment="Center"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Text="{Binding Artist}"
+                                                TextWrapping="Wrap" />
 
-                                        <!--  专辑名  -->
-                                        <HyperlinkButton
-                                            Grid.Column="2"
-                                            VerticalAlignment="Center"
-                                            Click="AlbumHyperlibkButton_Click"
-                                            Tag="{Binding Album}">
-                                            <TextBlock Text="{Binding Album}" TextWrapping="Wrap" />
-                                        </HyperlinkButton>
+                                            <!--  专辑名  -->
+                                            <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="3"
+                                                VerticalAlignment="Center"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Text="{Binding Year}"
+                                                TextWrapping="Wrap" />
 
-                                        <!--  歌曲时长  -->
-                                        <TextBlock
-                                            Grid.Column="4"
-                                            VerticalAlignment="Center"
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            Text="{Binding Duration, Converter={StaticResource SecondsToFormattedTimeConverter}}"
-                                            TextAlignment="Right"
-                                            TextWrapping="Wrap" />
-                                    </Grid>
-                                </DataTemplate>
-                            </ListView.ItemTemplate>
-                            <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 SubtitleTextBlockStyle}"
-                                                    Text="{Binding}" />
-                                            </Border>
-                                        </DataTemplate>
-                                    </GroupStyle.HeaderTemplate>
-                                </GroupStyle>
-                            </ListView.GroupStyle>
-                        </ListView>
-                    </SemanticZoom.ZoomedInView>
+                                            <!--  流派  -->
+                                            <TextBlock
+                                                Grid.Column="4"
+                                                VerticalAlignment="Center"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Text="{Binding Genre}"
+                                                TextWrapping="Wrap" />
 
-                    <SemanticZoom.ZoomedOutView>
-                        <GridView
-                            MaxWidth="500"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            ItemsSource="{x:Bind GroupedTracksCVS.View.CollectionGroups, Mode=OneWay}"
-                            ScrollViewer.IsHorizontalScrollChainingEnabled="False"
-                            SelectionMode="None">
-                            <GridView.ItemTemplate>
-                                <DataTemplate x:DataType="models:GroupInfoList">
-                                    <TextBlock Style="{ThemeResource TitleTextBlockStyle}" Text="{Binding}" />
-                                </DataTemplate>
-                            </GridView.ItemTemplate>
-                        </GridView>
-                    </SemanticZoom.ZoomedOutView>
-                </SemanticZoom>
+                                            <!--  歌曲时长  -->
+                                            <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>
 
-                <Grid Margin="0,140,0,0" Visibility="{x:Bind ViewModel.IsLocalMediaNotFound, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-                    <StackPanel
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Spacing="12">
-                        <Image MaxWidth="200" Source="/Assets/EmptyState.png" />
-                        <TextBlock
-                            x:Uid="MusicGalleryPageFileNotFound"
-                            HorizontalAlignment="Center"
-                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                    </StackPanel>
-                </Grid>
+                <controls:Case Value="Album">
+                    <ListView />
+                </controls:Case>
 
-            </Grid>
+                <controls:Case Value="Artist">
+                    <ListView />
+                </controls:Case>
 
-            <Grid
-                x:Name="PlayQueue"
-                Grid.Column="1"
-                Margin="0,0,12,0">
-
-                <StackPanel Margin="0,10,0,0" Spacing="12">
-                    <Grid Margin="0,6,0,0" VerticalAlignment="Top">
-                        <TextBlock x:Uid="MusicGalleryPagePlayingQueue" Style="{StaticResource BodyStrongTextBlockStyle}" />
-                        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind ViewModel.DisplayedPlayingSongIndex, Mode=OneWay}" />
-                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="/" />
-                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind ViewModel.TrackPlayingQueue.Count, Mode=OneWay}" />
-                        </StackPanel>
-                    </Grid>
-                    <StackPanel Orientation="Horizontal" Spacing="12">
-                        <Button x:Uid="MusicGalleryPageEmptyPlayingQueue" Click="EmptyPlayingQueueButton_Click" />
-                        <Button x:Uid="MusicGalleryPageScrollToPlayingItem" Click="ScrollToPlayingItemButton_Click" />
-                    </StackPanel>
-                    <controls:Segmented HorizontalAlignment="Stretch" SelectedIndex="{x:Bind ViewModel.PlaybackOrder, Converter={StaticResource EnumToIntConverter}, Mode=TwoWay}">
-                        <controls:Segmented.Items>
-                            <controls:SegmentedItem x:Uid="MusicGalleryPageQueueLoop" />
-                            <controls:SegmentedItem x:Uid="MusicGalleryPageSingleLoop" />
-                            <controls:SegmentedItem x:Uid="MusicGalleryPageQueueRandom" />
-                        </controls:Segmented.Items>
-                    </controls:Segmented>
-                </StackPanel>
-
-                <ListView
-                    x:Name="PlayingQueueListView"
-                    Margin="0,136,0,0"
-                    ItemsSource="{x:Bind ViewModel.TrackPlayingQueue, Mode=OneWay}"
-                    SelectedIndex="{x:Bind ViewModel.PlayingSongIndex, Mode=TwoWay}">
-                    <ListView.ItemTemplate>
-                        <DataTemplate>
-                            <Grid Padding="0,6">
-                                <Grid Tapped="PlayingQueueListVireItemGrid_Tapped">
-                                    <StackPanel>
-                                        <TextBlock Text="{Binding Track.Title}" TextWrapping="Wrap" />
-                                        <TextBlock
-                                            Foreground="{StaticResource TextFillColorSecondaryBrush}"
-                                            Text="{Binding Track.Artist}"
-                                            TextWrapping="Wrap" />
-                                    </StackPanel>
-                                </Grid>
-                                <Grid HorizontalAlignment="Right">
-                                    <Button
-                                        Click="RemoveFromPlayingQueueButton_Click"
-                                        Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                              FontSize=12,
-                                                              Glyph=&#xE738;}"
-                                        Style="{StaticResource GhostButtonStyle}">
-                                        <ToolTipService.ToolTip>
-                                            <TextBlock x:Uid="MusicGalleryPageRemoveFromPlayingQueue" />
-                                        </ToolTipService.ToolTip>
-                                    </Button>
-                                </Grid>
-                            </Grid>
-                        </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
-
-                <Grid Margin="0,136,0,0">
-                    <interactivity:Interaction.Behaviors>
-                        <interactivity:DataTriggerBehavior
-                            Binding="{x:Bind ViewModel.TrackPlayingQueue.Count, Mode=OneWay}"
-                            ComparisonCondition="Equal"
-                            Value="0">
-                            <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
-                        </interactivity:DataTriggerBehavior>
-                        <interactivity:DataTriggerBehavior
-                            Binding="{x:Bind ViewModel.TrackPlayingQueue.Count, Mode=OneWay}"
-                            ComparisonCondition="NotEqual"
-                            Value="0">
-                            <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
-                        </interactivity:DataTriggerBehavior>
-                    </interactivity:Interaction.Behaviors>
-                    <StackPanel
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Spacing="12">
-                        <Image MaxWidth="100" Source="/Assets/EmptyBox.png" />
-                        <TextBlock
-                            x:Uid="MusicGalleryPagePlayingQueueEmpty"
-                            HorizontalAlignment="Center"
-                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                    </StackPanel>
-                </Grid>
-            </Grid>
+            </controls:SwitchPresenter>
         </Grid>
 
         <Grid Background="{ThemeResource SolidBackgroundFillColorBaseBrush}" Visibility="{x:Bind ViewModel.IsDataLoading, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
@@ -414,10 +209,10 @@
                     <RowDefinition Height="12" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
-                <labs:Shimmer Grid.Row="0" CornerRadius="6" />
-                <labs:Shimmer Grid.Row="2" CornerRadius="6" />
-                <labs:Shimmer Grid.Row="4" CornerRadius="6" />
-                <labs:Shimmer Grid.Row="6" CornerRadius="6" />
+                <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>

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

@@ -1,10 +1,5 @@
-using ATL;
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using CommunityToolkit.WinUI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
@@ -19,7 +14,6 @@ using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
-using Windows.System;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -32,140 +26,35 @@ namespace BetterLyrics.WinUI3.Views
     public sealed partial class MusicGalleryPage : Page
     {
         public MusicGalleryViewModel ViewModel => (MusicGalleryViewModel)DataContext;
-
         public MusicGalleryPage()
         {
             InitializeComponent();
             DataContext = Ioc.Default.GetRequiredService<MusicGalleryViewModel>();
         }
 
-        private void SongListViewItemGrid_RightTapped(object sender, RightTappedRoutedEventArgs e)
-        {
-            ViewModel.TrackRightTapped = (Track)((FrameworkElement)sender).DataContext;
-            SongFileInfoFlyout.ShowAt(sender as FrameworkElement);
-        }
-
-        private async void SongPathHyperlinkButton_Click(object sender, RoutedEventArgs e)
-        {
-            await LauncherHelper.SelectAndShowFile($"{((HyperlinkButton)sender).Content}");
-        }
-
-        private void PlayingQueueListVireItemGrid_Tapped(object sender, TappedRoutedEventArgs e)
-        {
-            var item = (PlayQueueItem)((FrameworkElement)sender).DataContext;
-            ViewModel.PlayTrack(item);
-            PlayingQueueListView.ScrollIntoView(item);
-        }
-
-        private void EmptyPlayingQueueButton_Click(object sender, RoutedEventArgs e)
-        {
-            ViewModel.TrackPlayingQueue.Clear();
-            ViewModel.PlayingSongIndex = -1;
-            ViewModel.PlayTrackAt(ViewModel.PlayingSongIndex);
-        }
-
-        private void ScrollToPlayingItemButton_Click(object sender, RoutedEventArgs e)
-        {
-            if (ViewModel.PlayingQueueItem == null) return;
-            PlayingQueueListView.ScrollIntoView(ViewModel.PlayingQueueItem);
-        }
-
-        private void RemoveFromPlayingQueueButton_Click(object sender, RoutedEventArgs e)
-        {
-            bool playNext = false;
-            var item = (PlayQueueItem)((FrameworkElement)sender).DataContext;
-            int index = ViewModel.TrackPlayingQueue.IndexOf(item);
-            if (item == ViewModel.PlayingQueueItem)
-            {
-                playNext = true;
-            }
-            ViewModel.TrackPlayingQueue.Remove(item);
-            if (playNext)
-            {
-                if (ViewModel.TrackPlayingQueue.Count == 0)
-                {
-                    index = -1;
-                }
-                else if (index >= ViewModel.TrackPlayingQueue.Count)
-                {
-                    index = ViewModel.TrackPlayingQueue.Count - 1;
-                }
-                ViewModel.PlayingSongIndex = index;
-                ViewModel.PlayTrackAt(ViewModel.PlayingSongIndex);
-            }
-        }
-
-        private void SongFileInfoMenuFlyoutSubItem_Tapped(object sender, TappedRoutedEventArgs e)
-        {
-            SongFileInfoFlyout.ShowAt(sender as FrameworkElement);
-        }
-
-        private void AddSongToQueueNextMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
-        {
-            bool startPlaying = ViewModel.TrackPlayingQueue.Count == 0;
-            ViewModel.TrackPlayingQueue.InsertRange(ViewModel.PlayingSongIndex + 1, SongListView.SelectedItems.Cast<Track>().Select(x => new PlayQueueItem(x)));
-            if (startPlaying)
-            {
-                ViewModel.PlayingSongIndex = ViewModel.PlayingSongIndex + 1;
-                ViewModel.PlayTrackAt(ViewModel.PlayingSongIndex);
-            }
-        }
-
-        private void AddSongToQueueEndMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
-        {
-            bool startPlaying = ViewModel.TrackPlayingQueue.Count == 0;
-            ViewModel.TrackPlayingQueue.AddRange(SongListView.SelectedItems.Cast<Track>().Select(x => new PlayQueueItem(x)));
-            if (startPlaying)
-            {
-                ViewModel.PlayingSongIndex = ViewModel.PlayingSongIndex + 1;
-                ViewModel.PlayTrackAt(ViewModel.PlayingSongIndex);
-            }
-        }
-
         private void SongListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            ViewModel.SelectedTracks = SongListView.SelectedItems.Cast<Track>().ToList();
-            SelectAllToggleButton.IsChecked = SongListView.SelectedItems.Count == SongListView.Items.Count;
+            ViewModel.PlaySongAt((sender as ListView)?.SelectedIndex);
         }
 
-        private void SelectAllToggleButton_Click(object sender, RoutedEventArgs e)
+        private void Page_Loaded(object sender, RoutedEventArgs e)
         {
-            if (SelectAllToggleButton.IsChecked == true)
-            {
-                SongListView.SelectAll();
-            }
-            else
-            {
-                SongListView.SelectedItems.Clear();
-            }
+            ViewModel.RefreshSongs();
         }
 
-        private void ArtistHyperlibkButton_Click(object sender, RoutedEventArgs e)
+        private void SongSearchBox_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
         {
-            var artist = (string)((HyperlinkButton)sender).Tag;
-            var playlist = new SongsTabInfo(artist, "\uEFA9", true, CommonSongProperty.Artist, artist);
-            ViewModel.UpdateSelectedPlaylist(playlist);
+
         }
 
-        private void AlbumHyperlibkButton_Click(object sender, RoutedEventArgs e)
+        private void SongSearchBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
         {
-            var album = (string)((HyperlinkButton)sender).Tag;
-            var playlist = new SongsTabInfo(album, "\uE93C", true, CommonSongProperty.Album, album);
-            ViewModel.UpdateSelectedPlaylist(playlist);
+
         }
 
-        private void PlaylistGrid_Tapped(object sender, TappedRoutedEventArgs e)
+        private void SongSearchBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
         {
-            var playlist = (SongsTabInfo)((FrameworkElement)sender).DataContext;
-            ViewModel.UpdateSelectedPlaylist(playlist);
-        }
 
-        private void PlaylistCloseButton_Click(object sender, RoutedEventArgs e)
-        {
-            var playlist = (SongsTabInfo)((FrameworkElement)sender).DataContext;
-            ViewModel.SongsTabInfoList.Remove(playlist);
-            ViewModel.SelectedSongsTabInfoIndex = 0;
-            ViewModel.ApplyPlaylist();
         }
     }
 }

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

@@ -1,4 +1,3 @@
-using BetterLyrics.WinUI3.Helper;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -29,11 +28,9 @@ namespace BetterLyrics.WinUI3.Views
         public MusicGalleryWindow()
         {
             InitializeComponent();
-
-            Title = App.ResourceLoader?.GetString("MusicGalleryPageTitle");
+            Title = App.ResourceLoader!.GetString("MusicGalleryPageTitle");
             AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
-            AppWindow.SetIcons();
-
+            this.SetIcon(@"Assets/Logo.ico");
         }
     }
 }

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

@@ -123,10 +123,7 @@
                                 <TextBlock x:Uid="SettingsPageAppBehavior" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                                 <controls:SettingsCard x:Uid="SettingsPageAutoStart" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF71C;}">
-                                    <ToggleSwitch
-                                        x:Name="AutoStartupToggleSwitch"
-                                        Loaded="AutoStartupToggleSwitch_Loaded"
-                                        Unloaded="AutoStartupToggleSwitch_Unloaded" />
+                                    <ToggleSwitch x:Name="AutoStartupToggleSwitch" Loaded="AutoStartupToggleSwitch_Loaded" />
                                 </controls:SettingsCard>
 
                                 <controls:SettingsCard x:Uid="SettingsPageAutoStartWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE736;}">
@@ -194,22 +191,6 @@
                                     </StackPanel>
                                 </controls:SettingsCard>
 
-                                <!--  Dock mode  -->
-
-                                <TextBlock x:Uid="SettingsPageAppDock" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                                <controls:SettingsCard x:Uid="SettingsPageDockMonitor" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7F4;}">
-                                    <StackPanel Orientation="Horizontal" Spacing="6">
-                                        <Button
-                                            Command="{x:Bind ViewModel.RefreshMonitorDeviceNamesCommand}"
-                                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                                  FontSize=12,
-                                                                  Glyph=&#xE72C;}"
-                                            Style="{StaticResource GhostButtonStyle}" />
-                                        <ComboBox ItemsSource="{x:Bind ViewModel.MonitorDeviceNames, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedDockMonitorDeviceName, Mode=TwoWay}" />
-                                    </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" />
@@ -229,6 +210,10 @@
                                     </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" />
@@ -292,24 +277,6 @@
                                     </StackPanel>
                                 </controls:SettingsCard>
 
-                                <controls:SettingsCard x:Uid="SettingsPageBackgroundAcrylicEffectAmount" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE727;}">
-                                    <StackPanel Orientation="Horizontal">
-                                        <TextBlock x:Uid="SettingsPageSliderPrefix" VerticalAlignment="Center" />
-                                        <TextBlock
-                                            Margin="0,0,14,0"
-                                            VerticalAlignment="Center"
-                                            Text="{x:Bind ViewModel.CoverAcrylicEffectAmount, Mode=OneWay}" />
-                                        <Slider
-                                            Maximum="10"
-                                            Minimum="0"
-                                            SnapsTo="Ticks"
-                                            StepFrequency="1"
-                                            TickFrequency="1"
-                                            TickPlacement="Outside"
-                                            Value="{x:Bind ViewModel.CoverAcrylicEffectAmount, Mode=TwoWay}" />
-                                    </StackPanel>
-                                </controls:SettingsCard>
-
                             </StackPanel>
                         </controls:Case>
 
@@ -366,12 +333,18 @@
                                     CanDragItems="True"
                                     CanReorderItems="True"
                                     DragItemsCompleted="AlbumArtSearchProvidersListView_DragItemsCompleted"
-                                    ItemContainerStyle="{StaticResource ListViewStretchedItemContainerStyle}"
                                     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}">
@@ -703,60 +676,22 @@
                                     </interactivity:Interaction.Behaviors>
                                 </ColorPicker>
 
-                                <controls:SettingsCard x:Uid="SettingsPageLyricsStandardFontSize" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E9;}">
+                                <controls:SettingsCard x:Uid="SettingsPageLyricsFontSize" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E9;}">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock x:Uid="SettingsPageSliderPrefix" VerticalAlignment="Center" />
                                         <TextBlock
                                             Margin="0,0,14,0"
                                             VerticalAlignment="Center"
-                                            Text="{Binding ElementName=LyricsStandardFontSizeSlider, Path=Value, Mode=OneWay}" />
+                                            Text="{Binding ElementName=LyricsFontSizeSlider, Path=Value, Mode=OneWay}" />
                                         <Slider
-                                            x:Name="LyricsStandardFontSizeSlider"
+                                            x:Name="LyricsFontSizeSlider"
                                             Maximum="96"
                                             Minimum="12"
                                             SnapsTo="Ticks"
                                             StepFrequency="2"
                                             TickFrequency="2"
                                             TickPlacement="Outside"
-                                            Value="{x:Bind ViewModel.LyricsStandardFontSize, Mode=TwoWay}" />
-                                    </StackPanel>
-                                </controls:SettingsCard>
-
-                                <controls:SettingsCard x:Uid="SettingsPageLyricsDockFontSize" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E9;}">
-                                    <StackPanel Orientation="Horizontal">
-                                        <TextBlock x:Uid="SettingsPageSliderPrefix" VerticalAlignment="Center" />
-                                        <TextBlock
-                                            Margin="0,0,14,0"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding ElementName=LyricsDockFontSizeSlider, Path=Value, Mode=OneWay}" />
-                                        <Slider
-                                            x:Name="LyricsDockFontSizeSlider"
-                                            Maximum="96"
-                                            Minimum="12"
-                                            SnapsTo="Ticks"
-                                            StepFrequency="2"
-                                            TickFrequency="2"
-                                            TickPlacement="Outside"
-                                            Value="{x:Bind ViewModel.LyricsDockFontSize, Mode=TwoWay}" />
-                                    </StackPanel>
-                                </controls:SettingsCard>
-
-                                <controls:SettingsCard x:Uid="SettingsPageLyricsDesktopFontSize" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E9;}">
-                                    <StackPanel Orientation="Horizontal">
-                                        <TextBlock x:Uid="SettingsPageSliderPrefix" VerticalAlignment="Center" />
-                                        <TextBlock
-                                            Margin="0,0,14,0"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding ElementName=LyricsDesktopFontSizeSlider, Path=Value, Mode=OneWay}" />
-                                        <Slider
-                                            x:Name="LyricsDesktopFontSizeSlider"
-                                            Maximum="96"
-                                            Minimum="12"
-                                            SnapsTo="Ticks"
-                                            StepFrequency="2"
-                                            TickFrequency="2"
-                                            TickPlacement="Outside"
-                                            Value="{x:Bind ViewModel.LyricsDesktopFontSize, Mode=TwoWay}" />
+                                            Value="{x:Bind ViewModel.LyricsFontSize, Mode=TwoWay}" />
                                     </StackPanel>
                                 </controls:SettingsCard>
 
@@ -947,10 +882,9 @@
                                     x:Uid="SettingsPageTranslationConfig"
                                     HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                                              Glyph=&#xE8C1;}"
-                                    IsExpanded="{x:Bind ViewModel.IsLibreTranslateEnabled, Mode=OneWay}">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.IsLibreTranslateEnabled, Mode=TwoWay}" />
+                                    IsExpanded="True">
                                     <controls:SettingsExpander.Items>
-                                        <controls:SettingsCard x:Uid="SettingsPageLibreTranslateServer" IsEnabled="{x:Bind ViewModel.IsLibreTranslateEnabled, Mode=OneWay}">
+                                        <controls:SettingsCard x:Uid="SettingsPageLibreTranslateServer">
                                             <StackPanel Orientation="Horizontal" Spacing="12">
                                                 <TextBox
                                                     x:Name="LibreTranslateServerTextBox"
@@ -988,6 +922,7 @@
                                             <Paragraph>
                                                 <Run x:Uid="SettingsPageVersion" />
                                                 <Run Text="{x:Bind ViewModel.Version, Mode=OneWay}" />
+                                                <Run Text="{x:Bind ViewModel.BuildDate, Mode=OneWay}" />
                                             </Paragraph>
                                         </RichTextBlock>
                                     </controls:SettingsCard.Description>
@@ -1014,10 +949,6 @@
                                     <Button x:Uid="SettingsPageJoinNowButton" Click="DiscodGroupButton_Click" />
                                 </controls:SettingsCard>
 
-                                <controls:SettingsCard x:Uid="SettingsPageTelegram" HeaderIcon="{ui:BitmapIcon Source=ms-appx:///Assets/Telegram.png}">
-                                    <Button x:Uid="SettingsPageJoinNowButton" Click="TelegramGroupButton_Click" />
-                                </controls:SettingsCard>
-
                             </StackPanel>
                         </controls:Case>
 

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

@@ -7,6 +7,7 @@ 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
@@ -27,7 +28,7 @@ namespace BetterLyrics.WinUI3.Views
             {
                 if (toggleSwitch.DataContext is LocalMediaFolder localLyricsFolder)
                 {
-                    ViewModel.ToggleLocalLyricsFolder();
+                    ViewModel.ToggleLocalLyricsFolder(localLyricsFolder);
                 }
             }
         }
@@ -46,7 +47,7 @@ namespace BetterLyrics.WinUI3.Views
             {
                 if (toggleSwitch.DataContext is LyricsSearchProviderInfo providerInfo)
                 {
-                    ViewModel.ToggleLyricsSearchProvider();
+                    ViewModel.ToggleLyricsSearchProvider(providerInfo);
                 }
             }
         }
@@ -130,15 +131,5 @@ namespace BetterLyrics.WinUI3.Views
         {
             Launcher.LaunchUriAsync(new Uri(MetadataHelper.DiscordUrl));
         }
-
-        private void TelegramGroupButton_Click(object sender, RoutedEventArgs e)
-        {
-            Launcher.LaunchUriAsync(new Uri(MetadataHelper.TelegramUrl));
-        }
-
-        private void AutoStartupToggleSwitch_Unloaded(object sender, RoutedEventArgs e)
-        {
-            AutoStartupToggleSwitch.Toggled -= AutoStartupToggleSwitch_Toggled;
-        }
     }
 }

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

@@ -13,7 +13,7 @@
     </Window.SystemBackdrop>
 
     <Grid x:Name="RootGrid">
-        <Frame x:Name="RootFrame" />
+        <local:SettingsPage />
     </Grid>
 
 </Window>

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

@@ -1,4 +1,3 @@
-using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Windowing;
@@ -14,11 +13,9 @@ namespace BetterLyrics.WinUI3.Views
         public SettingsWindow()
         {
             InitializeComponent();
-            Title = App.ResourceLoader?.GetString("SettingsPageTitle");
+            Title = App.ResourceLoader!.GetString("SettingsPageTitle");
             AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
-            AppWindow.SetIcons();
-
-            RootFrame.Navigate(typeof(SettingsPage));
+            this.SetIcon(@"Assets/Logo.ico");
         }
     }
 }

FAQ/FAQ.md

@@ -0,0 +1,59 @@
+### I couldn't see any button that I can interact with / 我找不到任何可交互的按钮
+
+By default, all the buttons are shown but if you click on the "Immersive" button (as shown in the picture), all the buttons will disappear. But don't worry, one you hover again, it will shown up to you!
+
+默认情况下，所有按钮都会显示，但如果您点击 “沉浸” 按钮（如图左上位置所示），所有按钮都会消失。不过不用担心，当您再次将鼠标悬停在按钮上时，它们就会重新显示出来！
+
+![alt text](image-9.png)
+
+It is important to note that when you enter "Docked Mode", the action buttons are hidden. Hover your mouse over the top to access the "Immerse", "More", and "Close" buttons.
+
+需要特别注意的是，当您进入 “停靠模式” 时，会隐藏操作按钮。将鼠标悬停在顶部以访问 “沉浸” 按钮、“更多” 按钮以及 “关闭” 按钮
+
+![alt text](image-10.png)
+
+Hover the mouse slightly above the bottom edge of the window to display the white control floating window at the bottom
+
+将鼠标悬浮在窗口下边缘稍靠上位置以显示底部控制浮窗小白条
+
+![alt text](image-11.png)
+
+Tap the "little white bar" to display the bottom control bar in floating window form (including current playback progress view, timeline offset adjustment; previous song, pause/play, next song; translation, layout, settings)
+
+点按 “小白条” 即可以浮窗形式显示底部控制栏（包括当前播放进度查看、时间轴偏移调整；上一首、暂停/播放、下一首； 翻译、布局、设置）
+
+![alt text](image-12.png)
+
+### I have set up all the settings related to translation but there is no translation at all
+
+![alt text](image-8.png)
+
+Please make sure that you have already enable "Translation" function (at the bottom-right of the lyrics page, click to toggle).
+
+### How can I lock the window when switching to desktop mode
+
+![alt text](image-6.png)
+
+Again, hover you mouse on the top, click on the lock icon and you're good to go! Or, alternatively, press `Ctrl + Alt + U`.
+
+### How can I unlock the window in desktop mode
+
+![alt text](image-7.png)
+
+It's in the system tray, right-click on the icon and you'll see "Unlock the window". Or, alternatively, press `Ctrl + Alt + U`.
+
+### There's a delay in lyrics timeline
+
+Hover you mouse on the very bottom of the app,
+
+![alt text](image.png)
+
+And then click on the first icon button (Lyrics timeline offset), here you can adjust the offset freely.
+
+### The lyrics jump back and forth frequently / 歌词频繁前后跳动
+
+![alt text](image-2.png)
+
+Go to "Advanced options" section, increase the threshold value (marked with the bigger red rectangle) until the lyrics is working properly.
+
+---

README.CN.md

@@ -0,0 +1,169 @@
+> 注：以下内容使用 https://claude.ai/ 依照英文原文翻译
+
+<a href="https://github.com/jayfunc/BetterLyrics/blob/dev/README.md">_**🌐 Click here to see the English version**_</a>
+
+<a href="https://github.com/jayfunc/BetterLyrics/blob/dev/FAQ/FAQ.md">_**❓ 点击查看常见问题（FAQ）**_</a>
+
+<div align="center">
+  <img src="BetterLyrics.WinUI3/BetterLyrics.WinUI3/Assets/Logo.png" alt="" width="64"/>
+</div>
+
+<h2 align="center">
+BetterLyrics
+</h2>
+<h4 align="center">
+基于 WinUI 3 构建的流畅动态歌词显示工具
+</h3>
+
+## 🎉 本项目已获得少数派推荐！
+查看文章：[BetterLyrics – 专为 Windows 设计的沉浸式流畅歌词显示工具](https://sspai.com/post/101028)
+
+## 反馈交流群
+
+- [「BetterLyrics」反馈交流群（简体中文）](https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info) (1054700388) QQ群
+- [「BetterLyrics」反馈交流群（繁体中文/英语）](https://discord.gg/5yAQPnyCKv) Discord服务器
+
+## 核心特色功能
+
+- 动态模糊专辑封面作为背景
+- 流畅的歌词淡入淡出、缩放效果
+- 切换歌曲时界面平滑过渡
+- 逐字渐变卡拉OK效果（带光晕）
+- 沉浸式桌面歌词（悬浮模式）
+- 本地翻译（支持30种语言）
+
+> 本项目仍在开发中，最新版本可能存在bug和意外行为。
+
+## 支持的歌词来源
+
+- 本地存储
+  - 音乐文件（内嵌歌词）
+  - [.lrc](<https://en.wikipedia.org/wiki/LRC_(file_format)>) 文件（支持标准格式和增强格式）
+  - [.eslrc](https://github.com/ESLyric/release) 文件
+  - [.ttml](https://en.wikipedia.org/wiki/Timed_Text_Markup_Language) 文件
+
+（如需下载歌词，可使用 [LDDC](https://github.com/chenmozhijin/LDDC)）
+
+- 在线歌词提供商
+  - QQ音乐
+  - 网易云音乐
+  - 酷狗音乐
+  - [amll-ttml-db](https://github.com/Steve-xmh/amll-ttml-db)
+  - [LRCLIB](https://lrclib.net/)
+
+## 应用截图
+
+### 标准模式
+
+![alt text](Screenshots/image.png)
+
+![alt text](Screenshots/glow-float.gif)
+
+![alt text](Screenshots/fan.png)
+
+![alt text](Screenshots/lyrics-only.png)
+
+![alt text](Screenshots/album-art-only.png)
+
+### 悬浮模式
+
+![alt text](Screenshots/dock-1.png)
+
+![alt text](Screenshots/dock-2.png)
+
+### 桌面模式
+
+![alt text](Screenshots/desktop-1.png)
+
+![alt text](Screenshots/desktop-2.png)
+
+## 演示视频
+
+观看我们的介绍视频（2025年7月7日上传）：[B站链接](https://www.bilibili.com/video/BV1zjGjzfEXh)
+
+## 已测试的音乐播放器
+
+- 网易云音乐
+  - 请先安装 [BetterNCM 插件](https://microblock.cc/betterncm) 安装完成后如若弹出降级指引，请根据指引完成网易云音乐的降级操作（降级至 2.10.13）；
+  - 之后请在 PluginMarket 内安装 InfLink 插件，安装完成后请重启网易云音乐。至此，所有预备操作均已完成，尽情享用吧！
+- 酷狗音乐
+  - 请确保酷狗音乐设置项 “支持系统播放控件，如锁屏界面” 已开启
+  - 不会广播时间线信息，这意味着当您在酷狗音乐中更改播放进度时，BetterLyrics无法检测到此更改。
+- Apple Music
+  - 确保您在设置中将时间线阈值设置为约600毫秒（进入"设置"-"高级选项"进行更改），否则歌词会不断前后跳动。
+- foobar2000
+  - 确保您安装了 https://github.com/dumbie/foo_mediacontrol 插件
+- Spotify
+- QQ音乐
+- PotPlayer
+- 媒体播放器（系统自带）
+- LX 音乐
+  - 请确保您已在 LX 音乐设置页面启用“开放 API”
+  - 然后打开 BetterLyrics，进入设置，点击“高级选项”，输入您的 LX 音乐服务器地址（例如 http://127.0.0.1:23330）即可
+- MusicBee
+  - 使用前请安装 https://github.com/HenryPDT/mb_MediaControl
+- iTunes
+  - 请安装 https://github.com/thewizrd/iTunes-SMTC
+
+## 立即下载体验
+
+### Microsoft Store
+
+<a href="https://apps.microsoft.com/detail/9P1WCD1P597R?referrer=appbadge&mode=direct">
+	<img src="https://get.microsoft.com/images/en-us%20dark.svg" width="200"/>
+</a>
+
+**最简单**的获取方式，**无限制**免费试用或购买（免费版与付费版**功能完全相同**）
+
+☕ 如果您觉得有用，请考虑在**Microsoft Store**中购买支持🧧，我会非常感激的！🥰
+
+> 请注意，Microsoft Store中的版本可能不是最新版本。
+
+### Google Drive
+
+想要体验**最新**版本？从Google Drive获取（请查看[发布页面](https://github.com/jayfunc/BetterLyrics/releases)获取链接）
+
+> 请注意您下载的是".zip"文件，安装指南请参考[此文档](How2Install/How2Install.md)。
+
+## 特别感谢
+
+- [Lyricify-Lyrics-Helper](https://github.com/WXRIW/Lyricify-Lyrics-Helper)
+  - 提供QQ、网易、酷狗音源的歌词获取、解密和解析
+- [LRCLIB](https://lrclib.net/)
+  - LRCLIB歌词API提供商
+- [Audio Tools Library (ATL) for .NET](https://github.com/Zeugma440/atldotnet)
+  - 用于提取音乐文件中的图片
+- [WinUIEx](https://github.com/dotMorten/WinUIEx)
+  - 提供便捷的Win32 API窗口操作方式
+- [TagLib#](https://github.com/mono/taglib-sharp)
+  - 用于读取原始歌词内容
+- [Vanara](https://github.com/dahall/Vanara)
+  - Win32 API包装器
+- [Stackoverflow - How to animate Margin property in WPF](https://stackoverflow.com/a/21542882/11048731)
+- [DevWinUI](https://github.com/ghost1372/DevWinUI)
+- [Bilibili -【WinUI3】SystemBackdropController：定义云母、亚克力效果](https://www.bilibili.com/video/BV1PY4FevEkS)
+- [cnblogs - .NET App 与 Windows 系统媒体控制(SMTC)交互](https://www.cnblogs.com/TwilightLemon/p/18279496)
+- [Win2D 中的游戏循环：CanvasAnimatedControl](https://www.cnblogs.com/walterlv/p/10236395.html)
+- [r2d2rigo/Win2D-Samples](https://github.com/r2d2rigo/Win2D-Samples/blob/master/IrisBlurWin2D/IrisBlurWin2D/MainPage.xaml.cs)
+- [CommunityToolkit - 从入门到精通](https://mvvm.coldwind.top/)
+
+## 设计灵感来源
+
+- [refined-now-playing-netease](https://github.com/solstice23/refined-now-playing-netease)
+- [Lyricify-App](https://github.com/WXRIW/Lyricify-App)
+- [椒盐音乐 Salt Player](https://moriafly.com/program/salt-player)
+- [MyToolBar](https://github.com/TwilightLemon/MyToolBar)
+
+## ✍️ 帮助我们翻译成您的语言
+
+找不到您的语言？
+别担心！立即开始翻译，成为贡献者！😆
+点击[链接](https://crowdin.com/project/betterlyrics/invite?h=d767e4f2dbd832d8fcdb6f7e5a198b402502866)，立即通过 Crowdin 将这款应用翻译成您的语言！
+
+## Star 历史
+
+[![Star History Chart](https://api.star-history.com/svg?repos=jayfunc/BetterLyrics&type=Date)](https://www.star-history.com/#jayfunc/BetterLyrics&Date)
+
+## 欢迎提交问题和拉取请求
+
+如果您发现bug，请在issues中提交；如果您有任何想法，也欢迎在这里分享。

README.ja.md

@@ -1,271 +0,0 @@
-<div style="text-align: center;">
-
-[❓ よくある質問（FAQ）はこちらをクリック](#faq)
-
-</div>
-
-<div align="center">
-  <img src="BetterLyrics.WinUI3/BetterLyrics.WinUI3/Assets/Logo.png" alt="" width="64">
-</div>
-
-<h2 align="center">
-BetterLyrics
-</h2>
-
-<div style="text-align: center;">
-
-[![](https://img.shields.io/badge/zh--CN-%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.zh-CN.md) [![Static Badge](https://img.shields.io/badge/zh--TW-%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.zh-TW.md) [![Static Badge](https://img.shields.io/badge/ja-%E6%97%A5%E6%9C%AC%E8%AA%9E-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.ja.md) [![Static Badge](https://img.shields.io/badge/ko-%ED%95%9C%EA%B5%AD%EC%9D%B8-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.ko.md)
-
-</div>
-
-<div style="text-align: center;">
-
-![Static Badge](https://img.shields.io/badge/Language-C%23-purple) ![Static Badge](https://img.shields.io/badge/License-MIT-red) ![Static Badge](https://img.shields.io/badge/IDE-Visual%20Studio-purple) ![Static Badge](https://img.shields.io/badge/Framework-WinUI%203-blue)
-
-</div>
-
-<h4 align="center">
-WinUI 3とWin2Dで構築された動的歌詞表示ツール — ローカル再生や他のプレーヤーにも対応
-</h3>
-
-## 🎉 本プロジェクトはSSPAIで特集されました！
-
-記事はこちら：[BetterLyrics – Windows向けの没入型で滑らかな歌詞表示ツール](https://sspai.com/post/101028)
-
-## 🔈 フィードバック・チャットグループ
-
-- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\QQ.png" height="20"> QQ](https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info) (1054700388)
-- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\Discord.png" height="12"> Discord](https://discord.gg/5yAQPnyCKv)
-- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\Telegram.png" height="16"> Telegram](https://t.me/+svhSLZ7awPsxNGY1)
-
-## 🌟 主な特徴
-
-- 🌠 **美しいユーザーインターフェース**
-  - 滑らかなアニメーションとエフェクト
-- ↔️ **強力な歌詞翻訳**
-  - オフライン機械翻訳（30言語対応）
-  - ローカル歌詞ファイルの埋め込み翻訳を自動読み取り
-- 🧩 **多様な歌詞ソース**
-  - ローカルストレージ
-    - 音楽ファイル（埋め込み歌詞付き）
-    - [.lrc](<https://en.wikipedia.org/wiki/LRC_(file_format)>) ファイル（標準・拡張フォーマット対応）
-    - [.eslrc](https://github.com/ESLyric/release) ファイル
-    - [.ttml](https://en.wikipedia.org/wiki/Timed_Text_Markup_Language) ファイル
-  - オンライン歌詞プロバイダー
-    - QQ Music
-    - NetEase Cloud Music（网易云音乐）
-    - Kugou Music（酷狗音乐）
-    - [amll-ttml-db](https://github.com/Steve-xmh/amll-ttml-db)
-    - [LRCLIB](https://lrclib.net/)
-- 🎶 **複数の音楽プレーヤーに対応**
-
-  - <details><summary>⚠️ NetEase Cloud Music</summary>
-
-    - まず[BetterNCMプラグイン](https://microblock.cc/betterncm)をインストールしてください。インストール後にダウングレード案内が表示された場合は、案内に従いNetEase Cloud Musicを2.10.13にダウングレードしてください。
-    - その後、PluginMarketでInfLinkプラグインをインストールし、NetEase Cloud Musicを再起動してください。
-    - ⚠️ プラグインの問題によりタイムラインに不具合がある場合があります
-
-    </details>
-
-  - <details><summary>⚠️ Kugou Music</summary>
-
-    - Kugou Musicの設定で「システム再生コントロール（ロック画面など）をサポート」を有効にしてください
-    - Kugou Musicはタイムライン情報を送信しないため、再生位置を変更してもBetterLyricsは検出できません
-    - ⚠️ タイムラインの問題はKugou自体の制限です
-
-    </details>
-
-  - <details><summary>⚠️ Apple Music</summary>
-
-    - 設定の「詳細オプション」でタイムラインしきい値を約600msに設定してください。そうしないと歌詞が前後に揺れ続けます。
-    - ⚠️ 歌詞の揺れを防ぐには追加設定が必要です（詳細は末尾FAQ参照）
-
-    </details>
-
-  - <details><summary>⚠️ foobar2000</summary>
-
-    - https://github.com/dumbie/foo_mediacontrol をインストールしてください
-    - ⚠️ プラグインの問題によりタイムラインに不具合がある場合があります
-
-    </details>
-
-  - Spotify
-  - QQ Music
-  - PotPlayer
-  - メディアプレーヤー（システム）
-
-  - <details><summary>LX Music</summary>
-
-    - LX Musicの設定ページで「Open API」を有効にしてください
-    - BetterLyricsの設定→詳細オプションでLX Musicサーバーアドレス（通常は http://127.0.0.1:23330）を入力してください
-
-    </details>
-
-  - <details><summary>MusicBee</summary>
-
-    - https://github.com/HenryPDT/mb_MediaControl をインストールしてください
-
-    </details>
-
-  - <details><summary>iTunes</summary>
-
-    - https://github.com/thewizrd/iTunes-SMTC をインストールしてください
-
-    </details>
-
-  - <details><summary>AIMP</summary>
-
-    - https://www.aimp.ru/?do=catalog&rec_id=1097 をインストールしてください
-
-    </details>
-
-- 🪟 **多様な表示モード**
-  - **標準モード**
-    - 没入感のある歌詞アニメーションと動的背景
-  - **ドックモード**
-    - 画面端に固定されるスマートな歌詞バー
-  - **デスクトップモード**
-    - アプリの上に歌詞をフロート表示
-- 🧠 **スマートな動作**
-  - 音楽が一時停止すると自動的に非表示
-
-> 本プロジェクトは開発中です。最新ブランチにはバグや予期しない動作が含まれる場合があります。
-
-## スクリーンショット
-
-### 標準モード
-
-![alt text](Screenshots/image.png)
-
-![alt text](Screenshots/glow-float.gif)
-
-![alt text](Screenshots/fan.png)
-
-![alt text](Screenshots/lyrics-only.png)
-
-![alt text](Screenshots/album-art-only.png)
-
-### ドックモード
-
-![alt text](Screenshots/dock-1.png)
-
-![alt text](Screenshots/dock-2.png)
-
-### デスクトップモード
-
-![alt text](Screenshots/desktop-1.png)
-
-![alt text](Screenshots/desktop-2.png)
-
-## デモ
-
-Bilibiliで紹介動画を見る（2025年7月7日アップロード）：[こちら](https://www.bilibili.com/video/BV1zjGjzfEXh)
-
-## 今すぐ試す
-
-### Microsoft Store
-
-<a href="https://apps.microsoft.com/detail/9P1WCD1P597R?referrer=appbadge&mode=direct">
-	<img src="https://get.microsoft.com/images/en-us%20dark.svg" width="200"/>
-</a>
-
-**最も簡単**な入手方法。**無制限**の無料トライアルまたは購入（無料版と有料版の違いはありません）
-
-☕ 役に立ったら、ぜひ **Microsoft Store** でご購入・ご支援ください！🥰
-
-> 安定版がリリースされると、Microsoft Storeが最初に更新されます。
-
-### Google Drive
-
-Google Driveからも入手可能です（[リリース](https://github.com/jayfunc/BetterLyrics/releases)ページ参照）
-
-> ダウンロードするのは「.zip」ファイルです。インストール方法は[こちらのドキュメント](How2Install/How2Install.md)をご参照ください。
-
-## 💖 特別感謝
-
-- [Lyricify-Lyrics-Helper](https://github.com/WXRIW/Lyricify-Lyrics-Helper)
-  - QQ、NetEase、Kugouの歌詞取得・復号・解析を提供
-- [lrclib](https://github.com/tranxuanthang/lrclib)
-  - LRCLIB歌詞APIプロバイダー
-- [Audio Tools Library (ATL) for .NET](https://github.com/Zeugma440/atldotnet)
-  - 音楽ファイルから画像抽出に使用
-- [WinUIEx](https://github.com/dotMorten/WinUIEx)
-  - Win32ウィンドウAPIへの簡単なアクセスを提供
-- [TagLib#](https://github.com/mono/taglib-sharp)
-  - 元の歌詞内容の読み取りに使用
-- [Vanara](https://github.com/dahall/Vanara)
-  - Win32 APIラッパー
-- [LibreTranslate](https://github.com/LibreTranslate/LibreTranslate)
-  - オフライン歌詞翻訳機能を提供
-- [Stackoverflow - WPFでMarginプロパティをアニメーション化する方法](https://stackoverflow.com/a/21542882/11048731)
-- [DevWinUI](https://github.com/ghost1372/DevWinUI)
-- [Bilibili -【WinUI3】SystemBackdropController：雲母・アクリル効果の定義](https://www.bilibili.com/video/BV1PY4FevEkS)
-- [cnblogs - .NETアプリとWindowsシステムメディアコントロール(SMTC)の連携](https://www.cnblogs.com/TwilightLemon/p/18279496)
-- [Win2Dのゲームループ：CanvasAnimatedControl](https://www.cnblogs.com/walterlv/p/10236395.html)
-- [r2d2rigo/Win2D-Samples](https://github.com/r2d2rigo/Win2D-Samples/blob/master/IrisBlurWin2D/IrisBlurWin2D/MainPage.xaml.cs)
-- [CommunityToolkit - 入門から上級まで](https://mvvm.coldwind.top/)
-
-## インスピレーションを受けたプロジェクト
-
-- [refined-now-playing-netease](https://github.com/solstice23/refined-now-playing-netease)
-- [Lyricify-App](https://github.com/WXRIW/Lyricify-App)
-- [塩音楽 Salt Player](https://moriafly.com/program/salt-player)
-- [MyToolBar](https://github.com/TwilightLemon/MyToolBar)
-
-## ✍️ 翻訳にご協力ください
-
-ご希望の言語が見つかりませんか？
-ご安心ください！翻訳に参加してコントリビューターになりましょう！😆
-[こちらのリンク](https://crowdin.com/project/betterlyrics/invite?h=d767e4f2dbd832d8fcdb6f7e5a198b402502866)からCrowdinで翻訳にご参加いただけます。
-
-## Star履歴
-
-[![](https://api.star-history.com/svg?repos=jayfunc/BetterLyrics&type=Date)](https://www.star-history.com/#jayfunc/BetterLyrics&Date)
-
-## 不具合・PR歓迎
-
-バグを見つけた場合はissuesでご報告ください。アイデアもお気軽にお寄せください。
-
----
-
-## FAQ
-
-### ドックモードでボタンが見えない
-
-「ドックモード」に入ると操作ボタンは非表示になります。ウィンドウ上部にマウスを重ねると「没入」「その他」「閉じる」ボタンが表示されます。
-
-![alt text](FAQ/image-10.png)
-
-ウィンドウ下端の少し上にマウスを重ねると、下部に白いコントロールフローティングウィンドウが表示されます
-
-![alt text](FAQ/image-11.png)
-
-「小さな白いバー」をクリックすると、下部のフローティングコントロールバー（再生進行状況、タイムラインオフセット調整、前の曲/一時停止/次の曲、翻訳、レイアウト、設定）が表示されます
-
-![alt text](FAQ/image-12.png)
-
-### デスクトップモードでウィンドウをロックする方法
-
-![alt text](FAQ/image-6.png)
-
-上部にマウスを重ねてロックアイコンをクリック、または `Ctrl + Alt + U` を押してください。
-
-### デスクトップモードでウィンドウのロックを解除する方法
-
-![alt text](FAQ/image-7.png)
-
-システムトレイのアイコンを右クリックし、「ウィンドウのロック解除」を選択、または `Ctrl + Alt + U` を押してください。
-
-### 歌詞のタイムラインに遅延がある
-
-アプリの一番下にマウスを重ねてください。
-
-![alt text](FAQ/image.png)
-
-最初のアイコンボタン（歌詞タイムラインオフセット）をクリックすると、オフセットを自由に調整できます。
-
-### 歌詞が頻繁に前後にジャンプする（例：Apple Music）
-
-![alt text](FAQ/image-2.png)
-
-「詳細オプション」セクションでしきい値（赤い四角でマーク）を上げると、歌詞が正常に動作します。

README.ko.md

@@ -1,271 +0,0 @@
-<div style="text-align: center;">
-
-[❓ 자주 묻는 질문(FAQ) 보러가기](#faq)
-
-</div>
-
-<div align="center">
-  <img src="BetterLyrics.WinUI3/BetterLyrics.WinUI3/Assets/Logo.png" alt="" width="64">
-</div>
-
-<h2 align="center">
-BetterLyrics
-</h2>
-
-<div style="text-align: center;">
-
-[![](https://img.shields.io/badge/zh--CN-%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.zh-CN.md) [![Static Badge](https://img.shields.io/badge/zh--TW-%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.zh-TW.md) [![Static Badge](https://img.shields.io/badge/ja-%E6%97%A5%E6%9C%AC%E8%AA%9E-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.ja.md) [![Static Badge](https://img.shields.io/badge/ko-%ED%95%9C%EA%B5%AD%EC%9D%B8-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.ko.md)
-
-</div>
-
-<div style="text-align: center;">
-
-![Static Badge](https://img.shields.io/badge/Language-C%23-purple) ![Static Badge](https://img.shields.io/badge/License-MIT-red) ![Static Badge](https://img.shields.io/badge/IDE-Visual%20Studio-purple) ![Static Badge](https://img.shields.io/badge/Framework-WinUI%203-blue)
-
-</div>
-
-<h4 align="center">
-WinUI 3와 Win2D로 제작된 동적 가사 디스플레이 도구 — 로컬 재생 및 다양한 플레이어 지원
-</h3>
-
-## 🎉 이 프로젝트는 SSPAI에 소개되었습니다!
-
-기사 보기: [BetterLyrics – Windows용 몰입감 있고 부드러운 가사 디스플레이 도구](https://sspai.com/post/101028)
-
-## 🔈 피드백 및 채팅 그룹
-
-- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\QQ.png" height="20"> QQ](https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info) (1054700388)
-- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\Discord.png" height="12"> Discord](https://discord.gg/5yAQPnyCKv)
-- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\Telegram.png" height="16"> Telegram](https://t.me/+svhSLZ7awPsxNGY1)
-
-## 🌟 주요 기능
-
-- 🌠 **아름다운 사용자 인터페이스**
-  - 부드러운 애니메이션과 효과
-- ↔️ **강력한 가사 번역**
-  - 오프라인 기계 번역(30개 언어 지원)
-  - 로컬 가사 파일에서 내장 번역 자동 읽기
-- 🧩 **다양한 가사 소스**
-  - 로컬 저장소
-    - 음악 파일(내장 가사 포함)
-    - [.lrc](<https://en.wikipedia.org/wiki/LRC_(file_format)>) 파일(표준 및 확장 형식 지원)
-    - [.eslrc](https://github.com/ESLyric/release) 파일
-    - [.ttml](https://en.wikipedia.org/wiki/Timed_Text_Markup_Language) 파일
-  - 온라인 가사 제공자
-    - QQ Music
-    - NetEase Cloud Music(网易云音乐)
-    - Kugou Music(酷狗音乐)
-    - [amll-ttml-db](https://github.com/Steve-xmh/amll-ttml-db)
-    - [LRCLIB](https://lrclib.net/)
-- 🎶 **다양한 음악 플레이어 지원**
-
-  - <details><summary>⚠️ NetEase Cloud Music</summary>
-
-    - 먼저 [BetterNCM 플러그인](https://microblock.cc/betterncm)을 설치하세요. 설치 후 다운그레이드 안내가 나오면 안내에 따라 NetEase Cloud Music을 2.10.13으로 다운그레이드하세요.
-    - 그 후 PluginMarket에서 InfLink 플러그인을 설치하고 NetEase Cloud Music을 재시작하세요.
-    - ⚠️ 플러그인 문제로 타임라인에 이슈가 있을 수 있습니다
-
-    </details>
-
-  - <details><summary>⚠️ Kugou Music</summary>
-
-    - Kugou Music 설정에서 "시스템 재생 컨트롤(잠금 화면 등) 지원"을 켜세요
-    - Kugou Music은 타임라인 정보를 전송하지 않아, 재생 위치를 변경해도 BetterLyrics에서 감지할 수 없습니다
-    - ⚠️ 타임라인 문제는 Kugou 자체의 한계입니다
-
-    </details>
-
-  - <details><summary>⚠️ Apple Music</summary>
-
-    - 설정의 "고급 옵션"에서 타임라인 임계값을 약 600ms로 설정하세요. 그렇지 않으면 가사가 계속 앞뒤로 흔들립니다.
-    - ⚠️ 가사 흔들림을 방지하려면 추가 설정이 필요합니다(자세한 내용은 문서 하단 FAQ 참조)
-
-    </details>
-
-  - <details><summary>⚠️ foobar2000</summary>
-
-    - https://github.com/dumbie/foo_mediacontrol 을 설치하세요
-    - ⚠️ 플러그인 문제로 타임라인에 이슈가 있을 수 있습니다
-
-    </details>
-
-  - Spotify
-  - QQ Music
-  - PotPlayer
-  - 미디어 플레이어(시스템)
-
-  - <details><summary>LX Music</summary>
-
-    - LX Music 설정 페이지에서 "Open API"를 활성화하세요
-    - BetterLyrics 설정-고급 옵션에서 LX Music 서버 주소(보통 http://127.0.0.1:23330)를 입력하세요
-
-    </details>
-
-  - <details><summary>MusicBee</summary>
-
-    - https://github.com/HenryPDT/mb_MediaControl 을 설치하세요
-
-    </details>
-
-  - <details><summary>iTunes</summary>
-
-    - https://github.com/thewizrd/iTunes-SMTC 를 설치하세요
-
-    </details>
-
-  - <details><summary>AIMP</summary>
-
-    - https://www.aimp.ru/?do=catalog&rec_id=1097 을 설치하세요
-
-    </details>
-
-- 🪟 **다양한 표시 모드**
-  - **표준 모드**
-    - 몰입감 있는 가사 애니메이션과 동적 배경
-  - **도킹 모드**
-    - 화면 가장자리에 고정되는 스마트 가사 바
-  - **데스크톱 모드**
-    - 앱 위에 가사를 띄워서 표시
-- 🧠 **스마트 동작**
-  - 음악이 일시정지되면 자동으로 숨김
-
-> 본 프로젝트는 개발 중입니다. 최신 브랜치에는 버그나 예기치 않은 동작이 있을 수 있습니다.
-
-## 스크린샷
-
-### 표준 모드
-
-![alt text](Screenshots/image.png)
-
-![alt text](Screenshots/glow-float.gif)
-
-![alt text](Screenshots/fan.png)
-
-![alt text](Screenshots/lyrics-only.png)
-
-![alt text](Screenshots/album-art-only.png)
-
-### 도킹 모드
-
-![alt text](Screenshots/dock-1.png)
-
-![alt text](Screenshots/dock-2.png)
-
-### 데스크톱 모드
-
-![alt text](Screenshots/desktop-1.png)
-
-![alt text](Screenshots/desktop-2.png)
-
-## 데모
-
-Bilibili에서 소개 영상을 시청하세요(2025년 7월 7일 업로드): [여기서 보기](https://www.bilibili.com/video/BV1zjGjzfEXh)
-
-## 지금 사용해보세요
-
-### Microsoft Store
-
-<a href="https://apps.microsoft.com/detail/9P1WCD1P597R?referrer=appbadge&mode=direct">
-	<img src="https://get.microsoft.com/images/en-us%20dark.svg" width="200"/>
-</a>
-
-**가장 쉬운** 설치 방법. **무제한** 무료 체험 또는 구매(무료와 유료 버전 차이 없음)
-
-☕ 유용하다면 **Microsoft Store**에서 구매로 응원해 주세요! 🥰
-
-> 안정 버전이 출시되면 Microsoft Store가 가장 먼저 업데이트됩니다.
-
-### Google Drive
-
-Google Drive에서도 다운로드할 수 있습니다([릴리즈](https://github.com/jayfunc/BetterLyrics/releases) 페이지 참조)
-
-> ".zip" 파일을 다운로드합니다. 설치 방법은 [이 문서](How2Install/How2Install.md)를 참고하세요.
-
-## 💖 특별 감사
-
-- [Lyricify-Lyrics-Helper](https://github.com/WXRIW/Lyricify-Lyrics-Helper)
-  - QQ, NetEase, Kugou 가사 가져오기, 복호화, 파싱 지원
-- [lrclib](https://github.com/tranxuanthang/lrclib)
-  - LRCLIB 가사 API 제공자
-- [Audio Tools Library (ATL) for .NET](https://github.com/Zeugma440/atldotnet)
-  - 음악 파일에서 이미지 추출에 사용
-- [WinUIEx](https://github.com/dotMorten/WinUIEx)
-  - Win32 창 API에 쉽게 접근 가능
-- [TagLib#](https://github.com/mono/taglib-sharp)
-  - 원본 가사 내용 읽기에 사용
-- [Vanara](https://github.com/dahall/Vanara)
-  - Win32 API 래퍼
-- [LibreTranslate](https://github.com/LibreTranslate/LibreTranslate)
-  - 오프라인 가사 번역 기능 제공
-- [Stackoverflow - WPF에서 Margin 속성 애니메이션 적용 방법](https://stackoverflow.com/a/21542882/11048731)
-- [DevWinUI](https://github.com/ghost1372/DevWinUI)
-- [Bilibili -【WinUI3】SystemBackdropController: 운모, 아크릴 효과 정의](https://www.bilibili.com/video/BV1PY4FevEkS)
-- [cnblogs - .NET 앱과 Windows 시스템 미디어 컨트롤(SMTC) 연동](https://www.cnblogs.com/TwilightLemon/p/18279496)
-- [Win2D의 게임 루프: CanvasAnimatedControl](https://www.cnblogs.com/walterlv/p/10236395.html)
-- [r2d2rigo/Win2D-Samples](https://github.com/r2d2rigo/Win2D-Samples/blob/master/IrisBlurWin2D/IrisBlurWin2D/MainPage.xaml.cs)
-- [CommunityToolkit - 입문부터 고급까지](https://mvvm.coldwind.top/)
-
-## 영감 받은 프로젝트
-
-- [refined-now-playing-netease](https://github.com/solstice23/refined-now-playing-netease)
-- [Lyricify-App](https://github.com/WXRIW/Lyricify-App)
-- [소금 음악 Salt Player](https://moriafly.com/program/salt-player)
-- [MyToolBar](https://github.com/TwilightLemon/MyToolBar)
-
-## ✍️ 번역에 참여해 주세요
-
-원하는 언어가 없나요?
-걱정 마세요! 번역에 참여해 기여자가 되어 주세요! 😆
-[이 링크](https://crowdin.com/project/betterlyrics/invite?h=d767e4f2dbd832d8fcdb6f7e5a198b402502866)에서 Crowdin으로 번역에 참여할 수 있습니다.
-
-## Star 기록
-
-[![](https://api.star-history.com/svg?repos=jayfunc/BetterLyrics&type=Date)](https://www.star-history.com/#jayfunc/BetterLyrics&Date)
-
-## 이슈 및 PR 환영
-
-버그를 발견하면 issues에 남겨주시고, 아이디어도 자유롭게 공유해 주세요.
-
----
-
-## FAQ
-
-### 도킹 모드에서 버튼이 보이지 않아요
-
-"도킹 모드"에 들어가면 동작 버튼이 숨겨집니다. 창 상단에 마우스를 올리면 "몰입", "더보기", "닫기" 버튼이 나타납니다.
-
-![alt text](FAQ/image-10.png)
-
-창 하단 가장자리 바로 위에 마우스를 올리면 하단에 흰색 컨트롤 플로팅 창이 표시됩니다
-
-![alt text](FAQ/image-11.png)
-
-"작은 흰색 바"를 클릭하면 하단 플로팅 컨트롤 바(재생 진행, 타임라인 오프셋 조정, 이전곡/일시정지/다음곡, 번역, 레이아웃, 설정 포함)가 표시됩니다
-
-![alt text](FAQ/image-12.png)
-
-### 데스크톱 모드에서 창을 잠그는 방법
-
-![alt text](FAQ/image-6.png)
-
-상단에 마우스를 올리고 자물쇠 아이콘을 클릭하거나 `Ctrl + Alt + U`를 누르세요.
-
-### 데스크톱 모드에서 창 잠금 해제 방법
-
-![alt text](FAQ/image-7.png)
-
-시스템 트레이 아이콘을 우클릭해 "창 잠금 해제"를 선택하거나 `Ctrl + Alt + U`를 누르세요.
-
-### 가사 타임라인이 지연될 때
-
-앱 맨 아래에 마우스를 올리세요.
-
-![alt text](FAQ/image.png)
-
-첫 번째 아이콘 버튼(가사 타임라인 오프셋)을 클릭하면 오프셋을 자유롭게 조정할 수 있습니다.
-
-### 가사가 자주 앞뒤로 움직여요(예: Apple Music)
-
-![alt text](FAQ/image-2.png)
-
-"고급 옵션"에서 임계값(빨간 사각형 표시)을 늘리면 가사가 정상적으로 표시됩니다.

README.md

@@ -1,136 +1,54 @@
-<div style="text-align: center;">
+<a href="https://github.com/jayfunc/BetterLyrics/blob/dev/README.CN.md">_**🌐 点此处查看中文说明**_</a>
 
-[❓ Click here to view frequently asked questions (FAQ)](#faq)
-
-</div>
+<a href="https://github.com/jayfunc/BetterLyrics/blob/dev/FAQ/FAQ.md">_**❓ Click here to view frequently asked questions (FAQ)**_</a>
 
 <div align="center">
-  <img src="BetterLyrics.WinUI3/BetterLyrics.WinUI3/Assets/Logo.png" alt="" width="64">
+  <img src="BetterLyrics.WinUI3/BetterLyrics.WinUI3/Assets/Logo.png" alt="" width="64"/>
 </div>
 
 <h2 align="center">
 BetterLyrics
 </h2>
-
-<div style="text-align: center;">
-
-[![](https://img.shields.io/badge/zh--CN-%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.zh-CN.md) [![Static Badge](https://img.shields.io/badge/zh--TW-%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.zh-TW.md) [![Static Badge](https://img.shields.io/badge/ja-%E6%97%A5%E6%9C%AC%E8%AA%9E-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.ja.md) [![Static Badge](https://img.shields.io/badge/ko-%ED%95%9C%EA%B5%AD%EC%9D%B8-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.ko.md)
-
-</div>
-
-<div style="text-align: center;">
-
-![Static Badge](https://img.shields.io/badge/Language-C%23-purple) ![Static Badge](https://img.shields.io/badge/License-MIT-red) ![Static Badge](https://img.shields.io/badge/IDE-Visual%20Studio-purple) ![Static Badge](https://img.shields.io/badge/Framework-WinUI%203-blue)
-
-</div>
-
 <h4 align="center">
-Your dynamic lyrics display tool built with WinUI 3 and Win2D — works with local playback and other players
+Your smooth dynamic lyrics display tool built with WinUI 3
 </h3>
 
 ## 🎉 This project was featured by SSPAI!
-
 Check out the article: [BetterLyrics – An immersive and smooth lyrics display tool designed for Windows](https://sspai.com/post/101028)
 
-## 🔈 Feedback and chat group
+## Feedback and chat group
 
-- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\QQ.png" height="20"> QQ](https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info) (1054700388)
-- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\Discord.png" height="12"> Discord](https://discord.gg/5yAQPnyCKv)
-- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\Telegram.png" height="16"> Telegram](https://t.me/+svhSLZ7awPsxNGY1)
+- [「BetterLyrics」反馈交流群（简体中文）](https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info) (1054700388) on QQ
+- [「BetterLyrics」Feedback Chat Group (Traditional Chinese / English)](https://discord.gg/5yAQPnyCKv) on Discord
 
-## 🌟 Highlighted features
+## Highlighted features
 
-- 🌠 **Pleasing User Interface**
-  - Fluent animations and effects
-- ↔️ **Strong Lyrics Translation**
-  - Offline machine translation (supporting 30 languages)
-  - Auto reading local lyrics files for embedded translation
-- 🧩 **Various Lyrics Source**
-  - Local storage
-    - Music files (with embedded lyrics)
-    - [.lrc](<https://en.wikipedia.org/wiki/LRC_(file_format)>) files (with both core format and enhanced format)
-    - [.eslrc](https://github.com/ESLyric/release) files
-    - [.ttml](https://en.wikipedia.org/wiki/Timed_Text_Markup_Language) files
-  - Online lyrics providers
-    - QQ Music
-    - 网易云音乐 NetEase Cloud Music
-    - 酷狗音乐 Kugou Music
-    - [amll-ttml-db](https://github.com/Steve-xmh/amll-ttml-db)
-    - [LRCLIB](https://lrclib.net/)
-- 🎶 **Multiple Music Players Supported**
-
-  - <details><summary>⚠️ NetEase Cloud Music</summary>
-
-    - Please install the [BetterNCM plugin](https://microblock.cc/betterncm) first. If a downgrade guide pops up after the installation, please follow the guide to complete the downgrade of NetEase Cloud Music (downgrade to 2.10.13);
-    - After that, please install the InfLink plugin in PluginMarket. After the installation is complete, please restart NetEase Cloud Music. At this point, all preparatory operations have been completed, enjoy it!
-    - ⚠️ Please note that there is issues with timeline due to plugin issue
-
-    </details>
-
-  - <details><summary>⚠️ Kugou Music</summary>
-
-    - Please make sure that the Kugou Music setting "Support system playback controls, such as lock screen interface" is turned on
-    - No timeline information broadcasted, which means when you change timeline position in Kugou Music, BetterLyrics has no way to detect this change.
-    - ⚠️ Please note that there is issues with timeline due to Kugou itself
-
-    </details>
-
-  - <details><summary>⚠️ Apple Music</summary>
-
-    - Make sure you have set timeline threshold to around 600 ms in settings (Go to "Settings" - "Advanced option" to change), otherwise, the lyrics will be moving forward and afterward constantly.
-    - ⚠️ Please note that you need additional settings to stop from seeing shaking lyrics (see FAQ at the end of this document for more information)
-
-    </details>
-
-  - <details><summary>⚠️ foobar2000</summary>
-
-    - Make sure you have https://github.com/dumbie/foo_mediacontrol installed with it
-    - ⚠️ Please note that there is issues with timeline due to plugin issue
-
-    </details>
-
-  - Spotify
-  - QQ Music
-  - PotPlayer
-  - Media Player (System)
-
-  - <details><summary>LX Music</summary>
-
-    - Please make sure you have enabled "Open API" in LX Music settings page
-    - Then open BetterLyrics, go to settings, go to "Advanced options", input your LX Music server address (mostly like http://127.0.0.1:23330) and there you go!
-
-    </details>
-
-  - <details><summary>MusicBee</summary>
-
-    - Please install https://github.com/HenryPDT/mb_MediaControl before using
-
-    </details>
-
-  - <details><summary>iTunes</summary>
-
-    - Please install https://github.com/thewizrd/iTunes-SMTC before using
-
-    </details>
-
-  - <details><summary>AIMP</summary>
-
-    - Please install https://www.aimp.ru/?do=catalog&rec_id=1097 before using
-
-    </details>
-
-- 🪟 **Multiple Display Modes**
-  - **Standard Mode**
-    - Enjoy an immersive listening journey with rich lyrics animations and beautifully dynamic backgrounds
-  - **Dock Mode**
-    - A smart animated lyrics bar docked to your screen edge
-  - **Desktop Mode**
-    - Enjoy immersive lyrics floating above your apps
-- 🧠 **Smart Behaviors**
-  - Auto hide when music paused
+- Dynamic blur album art as background
+- Smooth lyrics fade in/out, zoom in/out effects
+- Smooth user interface change from song to song
+- Gradient Karaoke (with glow) effect on every single character
+- Immersive desktop lyrics (dock mode)
+- Local translation (supporting 30 languages)
 
 > This project is still under development, bugs and unexpected behaviors may be existed in the latest branch.
 
+## Supported lyrics source
+
+- From your local storage
+  - Music files (with embedded lyrics)
+  - [.lrc](<https://en.wikipedia.org/wiki/LRC_(file_format)>) files (with both core format and enhanced format)
+  - [.eslrc](https://github.com/ESLyric/release) files
+  - [.ttml](https://en.wikipedia.org/wiki/Timed_Text_Markup_Language) files
+
+(For lyrics downloading, you can use [LDDC](https://github.com/chenmozhijin/LDDC))
+
+- From online lyrics providers
+  - QQ Music
+  - 网易云音乐 NetEase Cloud Music
+  - 酷狗音乐 Kugou Music
+  - [amll-ttml-db](https://github.com/Steve-xmh/amll-ttml-db)
+  - [LRCLIB](https://lrclib.net/)
+
 ## Screenshots
 
 ### Standard mode
@@ -161,6 +79,30 @@ Check out the article: [BetterLyrics – An immersive and smooth lyrics display
 
 Watch our introduction video (uploaded on 7 July 2025) on Bilibili [here](https://www.bilibili.com/video/BV1zjGjzfEXh).
 
+## Tested music player
+
+- NetEase Cloud Music
+  - Please install the [BetterNCM plugin](https://microblock.cc/betterncm) first. If a downgrade guide pops up after the installation, please follow the guide to complete the downgrade of NetEase Cloud Music (downgrade to 2.10.13);
+  - After that, please install the InfLink plugin in PluginMarket. After the installation is complete, please restart NetEase Cloud Music. At this point, all preparatory operations have been completed, enjoy it!
+- Kugou Music
+  - Please make sure that the Kugou Music setting "Support system playback controls, such as lock screen interface" is turned on
+  - No timeline information broadcasted, which means when you change timeline position in Kugou Music, BetterLyrics has no way to detect this change. 
+- Apple Music
+  - Make sure you have set timeline threshold to around 600 ms in settings (Go to "Settings" - "Advanced option" to change), otherwise, the lyrics will be moving forward and afterward constantly.
+- foobar2000
+  - Make sure you have https://github.com/dumbie/foo_mediacontrol installed with it
+- Spotify
+- QQ Music
+- PotPlayer
+- Media Player (System)
+- LX Music
+  - Please make sure you have enabled "Open API" in LX Music settings page
+  - Then open BetterLyrics, go to settings, go to "Advanced options", input your LX Music server address (mostly like http://127.0.0.1:23330) and there you go!
+- MusicBee
+  - Please install https://github.com/HenryPDT/mb_MediaControl before using
+- iTunes
+  - Please install https://github.com/thewizrd/iTunes-SMTC before using
+
 ## Try it now
 
 ### Microsoft Store
@@ -171,21 +113,21 @@ Watch our introduction video (uploaded on 7 July 2025) on Bilibili [here](https:
 
 **Easiest** way to get it. **Unlimited** free trail or purchase (there is **no difference** between free and paid version)
 
-☕ If you find it useful, please consider purchasing 🧧 it in **Microsoft Store**, I'll appreciate it! 🥰
+☕ If you find it helpful, please consider purchasing 🧧 it in **Microsoft Store**, I'll appreciate it! 🥰
 
-> When there's a stable version built, Microsoft Store will be the first channel to get updated.
+> Please note that the version in Microsoft Store may not be the latest.
 
 ### Google Drive
 
-Or get it from Google Drive (see [release](https://github.com/jayfunc/BetterLyrics/releases) page for the link)
+Wanna try the **latest** version? get it from Google Drive (see [release](https://github.com/jayfunc/BetterLyrics/releases) page for the link)
 
 > Please note you are downloading ".zip" file, for guide on how to install it, please kindly follow [this doc](How2Install/How2Install.md).
 
-## 💖 Many thanks to
+## Many thanks to
 
 - [Lyricify-Lyrics-Helper](https://github.com/WXRIW/Lyricify-Lyrics-Helper)
   - Provide lyrics fetch, decryption, and parse for QQ, Netease, Kugou sources
-- [lrclib](https://github.com/tranxuanthang/lrclib)
+- [LRCLIB](https://lrclib.net/)
   - LRCLIB lyrics API provider
 - [Audio Tools Library (ATL) for .NET](https://github.com/Zeugma440/atldotnet)
   - Used for extracting pictures in music files
@@ -195,8 +137,6 @@ Or get it from Google Drive (see [release](https://github.com/jayfunc/BetterLyri
   - Used for reading original lyrics content
 - [Vanara](https://github.com/dahall/Vanara)
   - Win32 API wrapper
-- [LibreTranslate](https://github.com/LibreTranslate/LibreTranslate)
-  - Provide the ability for offline lyrics translation
 - [Stackoverflow - How to animate Margin property in WPF](https://stackoverflow.com/a/21542882/11048731)
 - [DevWinUI](https://github.com/ghost1372/DevWinUI)
 - [Bilibili -【WinUI3】SystemBackdropController：定义云母、亚克力效果](https://www.bilibili.com/video/BV1PY4FevEkS)
@@ -218,54 +158,10 @@ Cannot find your language?
 Don't worry! Start translating and become one of the contributors! 😆
 Click the [link](https://crowdin.com/project/betterlyrics/invite?h=d767e4f2dbd832d8fcdb6f7e5a198b402502866) to translate this app into your language via Crowdin now!
 
-## Star history
+## Star History
 
-[![](https://api.star-history.com/svg?repos=jayfunc/BetterLyrics&type=Date)](https://www.star-history.com/#jayfunc/BetterLyrics&Date)
+[![Star History Chart](https://api.star-history.com/svg?repos=jayfunc/BetterLyrics&type=Date)](https://www.star-history.com/#jayfunc/BetterLyrics&Date)
 
 ## Any issues and PRs are welcomed
 
-If you find a bug please file it in issues or if you have any ideas feel free to share it here.
-
----
-
-## FAQ
-
-### I couldn't see any button in dock mode
-
-It is important to note that when you enter "Docked Mode", the action buttons are hidden. Hover your mouse over the top to access the "Immerse", "More", and "Close" buttons.
-
-![alt text](FAQ/image-10.png)
-
-Hover the mouse slightly above the bottom edge of the window to display the white control floating window at the bottom
-
-![alt text](FAQ/image-11.png)
-
-Tap the "little white bar" to display the bottom control bar in floating window form (including current playback progress view, timeline offset adjustment; previous song, pause/play, next song; translation, layout, settings)
-
-![alt text](FAQ/image-12.png)
-
-### How can I lock the window in desktop mode
-
-![alt text](FAQ/image-6.png)
-
-Hover you mouse on the top, click on the lock icon and you're good to go! Or, alternatively, press `Ctrl + Alt + U`.
-
-### How can I unlock the window in desktop mode
-
-![alt text](FAQ/image-7.png)
-
-It's in the system tray, right-click on the icon and you'll see "Unlock the window". Or, alternatively, press `Ctrl + Alt + U`.
-
-### There's a delay in lyrics timeline
-
-Hover you mouse on the very bottom of the app,
-
-![alt text](FAQ/image.png)
-
-And then click on the first icon button (Lyrics timeline offset), here you can adjust the offset freely.
-
-### The lyrics jump back and forth frequently (e.g. Apple Music)
-
-![alt text](FAQ/image-2.png)
-
-Go to "Advanced options" section, increase the threshold value (marked with the bigger red rectangle) until the lyrics is working properly.
+If you find a bug please file it in issues or if you have any ideas feel free to share it here.

README.zh-CN.md

@@ -1,271 +0,0 @@
-<div style="text-align: center;">
-
-[❓ 点击此处查看常见问题 (FAQ)](#faq)
-
-</div>
-
-<div align="center">
-  <img src="BetterLyrics.WinUI3/BetterLyrics.WinUI3/Assets/Logo.png" alt="" width="64">
-</div>
-
-<h2 align="center">
-BetterLyrics
-</h2>
-
-<div style="text-align: center;">
-
-[![](https://img.shields.io/badge/zh--CN-%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.zh-CN.md) [![Static Badge](https://img.shields.io/badge/zh--TW-%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.zh-TW.md) [![Static Badge](https://img.shields.io/badge/ja-%E6%97%A5%E6%9C%AC%E8%AA%9E-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.ja.md) [![Static Badge](https://img.shields.io/badge/ko-%ED%95%9C%EA%B5%AD%EC%9D%B8-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.ko.md)
-
-</div>
-
-<div style="text-align: center;">
-
-![Static Badge](https://img.shields.io/badge/Language-C%23-purple) ![Static Badge](https://img.shields.io/badge/License-MIT-red) ![Static Badge](https://img.shields.io/badge/IDE-Visual%20Studio-purple) ![Static Badge](https://img.shields.io/badge/Framework-WinUI%203-blue)
-
-</div>
-
-<h4 align="center">
-你的动态歌词显示工具，基于 WinUI 3 和 Win2D 构建 —— 支持本地播放及多种播放器
-</h3>
-
-## 🎉 本项目被少数派推荐！
-
-查看文章：[BetterLyrics – 一款为 Windows 设计的沉浸式流畅歌词显示工具](https://sspai.com/post/101028)
-
-## 🔈 反馈与交流群
-
-- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\QQ.png" height="20"> QQ](https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info) (1054700388)
-- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\Discord.png" height="12"> Discord](https://discord.gg/5yAQPnyCKv)
-- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\Telegram.png" height="16"> Telegram](https://t.me/+svhSLZ7awPsxNGY1)
-
-## 🌟 主要特性
-
-- 🌠 **美观的用户界面**
-  - 流畅的动画与特效
-- ↔️ **强大的歌词翻译**
-  - 离线机器翻译（支持 30 种语言）
-  - 自动读取本地歌词文件中的嵌入翻译
-- 🧩 **多样的歌词来源**
-  - 本地存储
-    - 音乐文件（含嵌入歌词）
-    - [.lrc](<https://en.wikipedia.org/wiki/LRC_(file_format)>) 文件（支持标准与增强格式）
-    - [.eslrc](https://github.com/ESLyric/release) 文件
-    - [.ttml](https://en.wikipedia.org/wiki/Timed_Text_Markup_Language) 文件
-  - 在线歌词源
-    - QQ 音乐
-    - 网易云音乐 NetEase Cloud Music
-    - 酷狗音乐 Kugou Music
-    - [amll-ttml-db](https://github.com/Steve-xmh/amll-ttml-db)
-    - [LRCLIB](https://lrclib.net/)
-- 🎶 **支持多种音乐播放器**
-
-  - <details><summary>⚠️ 网易云音乐</summary>
-
-    - 请先安装 [BetterNCM 插件](https://microblock.cc/betterncm)。如安装后弹出降级指引，请按指引将网易云音乐降级至 2.10.13；
-    - 然后在插件市场安装 InfLink 插件，安装完成后重启网易云音乐即可。
-    - ⚠️ 由于插件问题，时间轴可能存在异常
-
-    </details>
-
-  - <details><summary>⚠️ 酷狗音乐</summary>
-
-    - 请确保酷狗音乐设置中“支持系统播放控制（如锁屏界面）”已开启
-    - 酷狗音乐不会广播时间轴信息，导致切换进度时 BetterLyrics 无法检测
-    - ⚠️ 时间轴问题为酷狗本身限制
-
-    </details>
-
-  - <details><summary>⚠️ Apple Music</summary>
-
-    - 请在设置中将时间轴阈值设为约 600ms（“设置”-“高级选项”），否则歌词会不断前后跳动
-    - ⚠️ 需额外设置以避免歌词抖动（详见文末 FAQ）
-
-    </details>
-
-  - <details><summary>⚠️ foobar2000</summary>
-
-    - 请安装 https://github.com/dumbie/foo_mediacontrol
-    - ⚠️ 由于插件问题，时间轴可能存在异常
-
-    </details>
-
-  - Spotify
-  - QQ 音乐
-  - PotPlayer
-  - 媒体播放器（系统）
-
-  - <details><summary>LX Music</summary>
-
-    - 请确保已在 LX Music 设置页开启“Open API”
-    - 然后在 BetterLyrics 设置-高级选项中填写 LX Music 服务器地址（通常为 http://127.0.0.1:23330）即可
-
-    </details>
-
-  - <details><summary>MusicBee</summary>
-
-    - 请安装 https://github.com/HenryPDT/mb_MediaControl
-
-    </details>
-
-  - <details><summary>iTunes</summary>
-
-    - 请安装 https://github.com/thewizrd/iTunes-SMTC
-
-    </details>
-
-  - <details><summary>AIMP</summary>
-
-    - 请安装 https://www.aimp.ru/?do=catalog&rec_id=1097
-
-    </details>
-
-- 🪟 **多种显示模式**
-  - **标准模式**
-    - 沉浸式歌词动画与动态背景
-  - **停靠模式**
-    - 智能歌词条停靠屏幕边缘
-  - **桌面模式**
-    - 歌词悬浮于桌面应用之上
-- 🧠 **智能行为**
-  - 音乐暂停时自动隐藏
-
-> 本项目仍在开发中，最新分支可能存在 bug 或异常行为。
-
-## 截图
-
-### 标准模式
-
-![alt text](Screenshots/image.png)
-
-![alt text](Screenshots/glow-float.gif)
-
-![alt text](Screenshots/fan.png)
-
-![alt text](Screenshots/lyrics-only.png)
-
-![alt text](Screenshots/album-art-only.png)
-
-### 停靠模式
-
-![alt text](Screenshots/dock-1.png)
-
-![alt text](Screenshots/dock-2.png)
-
-### 桌面模式
-
-![alt text](Screenshots/desktop-1.png)
-
-![alt text](Screenshots/desktop-2.png)
-
-## 演示
-
-在 B 站观看我们的介绍视频（2025 年 7 月 7 日上传）：[点此观看](https://www.bilibili.com/video/BV1zjGjzfEXh)
-
-## 立即体验
-
-### Microsoft Store
-
-<a href="https://apps.microsoft.com/detail/9P1WCD1P597R?referrer=appbadge&mode=direct">
-	<img src="https://get.microsoft.com/images/en-us%20dark.svg" width="200"/>
-</a>
-
-**最简单**的获取方式。**无限制**免费试用或购买（免费与付费无差别）
-
-☕ 如果觉得好用，欢迎在 **Microsoft Store** 购买支持 🧧，感谢！🥰
-
-> 稳定版发布后，Microsoft Store 会第一时间更新。
-
-### Google Drive
-
-也可通过 Google Drive 获取（见 [release](https://github.com/jayfunc/BetterLyrics/releases) 页面）
-
-> 下载的是 ".zip" 文件，安装方法请参考 [此文档](How2Install/How2Install.md)。
-
-## 💖 特别感谢
-
-- [Lyricify-Lyrics-Helper](https://github.com/WXRIW/Lyricify-Lyrics-Helper)
-  - 提供 QQ、网易云、酷狗歌词获取、解密与解析
-- [lrclib](https://github.com/tranxuanthang/lrclib)
-  - LRCLIB 歌词 API 提供方
-- [Audio Tools Library (ATL) for .NET](https://github.com/Zeugma440/atldotnet)
-  - 用于提取音乐文件中的图片
-- [WinUIEx](https://github.com/dotMorten/WinUIEx)
-  - 提供便捷的 Win32 窗口 API
-- [TagLib#](https://github.com/mono/taglib-sharp)
-  - 用于读取原始歌词内容
-- [Vanara](https://github.com/dahall/Vanara)
-  - Win32 API 封装库
-- [LibreTranslate](https://github.com/LibreTranslate/LibreTranslate)
-  - 提供离线歌词翻译能力
-- [Stackoverflow - 如何在 WPF 中动画化 Margin 属性](https://stackoverflow.com/a/21542882/11048731)
-- [DevWinUI](https://github.com/ghost1372/DevWinUI)
-- [Bilibili -【WinUI3】SystemBackdropController：定义云母、亚克力效果](https://www.bilibili.com/video/BV1PY4FevEkS)
-- [cnblogs - .NET App 与 Windows 系统媒体控制(SMTC)交互](https://www.cnblogs.com/TwilightLemon/p/18279496)
-- [Win2D 中的游戏循环：CanvasAnimatedControl](https://www.cnblogs.com/walterlv/p/10236395.html)
-- [r2d2rigo/Win2D-Samples](https://github.com/r2d2rigo/Win2D-Samples/blob/master/IrisBlurWin2D/IrisBlurWin2D/MainPage.xaml.cs)
-- [CommunityToolkit - 从入门到精通](https://mvvm.coldwind.top/)
-
-## 灵感来源
-
-- [refined-now-playing-netease](https://github.com/solstice23/refined-now-playing-netease)
-- [Lyricify-App](https://github.com/WXRIW/Lyricify-App)
-- [椒盐音乐 Salt Player](https://moriafly.com/program/salt-player)
-- [MyToolBar](https://github.com/TwilightLemon/MyToolBar)
-
-## ✍️ 欢迎协助翻译
-
-没有找到你的语言？
-别担心！快来参与翻译，成为贡献者之一吧！😆
-点击[此链接](https://crowdin.com/project/betterlyrics/invite?h=d767e4f2dbd832d8fcdb6f7e5a198b402502866)通过 Crowdin 翻译本应用！
-
-## Star 记录
-
-[![](https://api.star-history.com/svg?repos=jayfunc/BetterLyrics&type=Date)](https://www.star-history.com/#jayfunc/BetterLyrics&Date)
-
-## 欢迎提 issue 和 PR
-
-如发现 bug 请在 issues 提出，或有想法欢迎在此分享。
-
----
-
-## FAQ
-
-### 停靠模式下看不到按钮
-
-进入“停靠模式”后，操作按钮会隐藏。将鼠标悬停在窗口顶部即可显示“沉浸”、“更多”、“关闭”按钮。
-
-![alt text](FAQ/image-10.png)
-
-将鼠标悬停在窗口底部边缘稍上方，会显示底部白色悬浮控制窗口
-
-![alt text](FAQ/image-11.png)
-
-点击“小白条”可显示底部悬浮控制栏（含当前播放进度、时间轴偏移调整、上一曲/暂停/下一曲、翻译、布局、设置）
-
-![alt text](FAQ/image-12.png)
-
-### 桌面模式如何锁定窗口
-
-![alt text](FAQ/image-6.png)
-
-将鼠标悬停在顶部，点击锁定图标即可，或按 `Ctrl + Alt + U`。
-
-### 桌面模式如何解锁窗口
-
-![alt text](FAQ/image-7.png)
-
-在系统托盘右键图标，选择“解锁窗口”，或按 `Ctrl + Alt + U`。
-
-### 歌词时间轴有延迟
-
-将鼠标悬停在应用底部，
-
-![alt text](FAQ/image.png)
-
-点击第一个图标按钮（歌词时间轴偏移），即可自由调整偏移量。
-
-### 歌词频繁跳动（如 Apple Music）
-
-![alt text](FAQ/image-2.png)
-
-进入“高级选项”，增大阈值（红框标记处），直至歌词正常。

README.zh-TW.md

@@ -1,271 +0,0 @@
-<div style="text-align: center;">
-
-[❓ 點此查看常見問題 (FAQ)](#faq)
-
-</div>
-
-<div align="center">
-  <img src="BetterLyrics.WinUI3/BetterLyrics.WinUI3/Assets/Logo.png" alt="" width="64">
-</div>
-
-<h2 align="center">
-BetterLyrics
-</h2>
-
-<div style="text-align: center;">
-
-[![](https://img.shields.io/badge/zh--CN-%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.zh-CN.md) [![Static Badge](https://img.shields.io/badge/zh--TW-%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.zh-TW.md) [![Static Badge](https://img.shields.io/badge/ja-%E6%97%A5%E6%9C%AC%E8%AA%9E-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.ja.md) [![Static Badge](https://img.shields.io/badge/ko-%ED%95%9C%EA%B5%AD%EC%9D%B8-blue)](https://github.com/jayfunc/BetterLyrics/blob/dev/README.ko.md)
-
-</div>
-
-<div style="text-align: center;">
-
-![Static Badge](https://img.shields.io/badge/Language-C%23-purple) ![Static Badge](https://img.shields.io/badge/License-MIT-red) ![Static Badge](https://img.shields.io/badge/IDE-Visual%20Studio-purple) ![Static Badge](https://img.shields.io/badge/Framework-WinUI%203-blue)
-
-</div>
-
-<h4 align="center">
-你的動態歌詞顯示工具，基於 WinUI 3 和 Win2D 構建 —— 支援本地播放及多種播放器
-</h3>
-
-## 🎉 本專案被少數派推薦！
-
-查看文章：[BetterLyrics – 一款為 Windows 設計的沉浸式流暢歌詞顯示工具](https://sspai.com/post/101028)
-
-## 🔈 反饋與交流群
-
-- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\QQ.png" height="20"> QQ](https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info) (1054700388)
-- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\Discord.png" height="12"> Discord](https://discord.gg/5yAQPnyCKv)
-- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\Telegram.png" height="16"> Telegram](https://t.me/+svhSLZ7awPsxNGY1)
-
-## 🌟 主要特色
-
-- 🌠 **美觀的使用者介面**
-  - 流暢動畫與特效
-- ↔️ **強大的歌詞翻譯**
-  - 離線機器翻譯（支援 30 種語言）
-  - 自動讀取本地歌詞檔案中的嵌入翻譯
-- 🧩 **多樣的歌詞來源**
-  - 本地儲存
-    - 音樂檔案（含嵌入歌詞）
-    - [.lrc](<https://en.wikipedia.org/wiki/LRC_(file_format)>) 檔案（支援標準與增強格式）
-    - [.eslrc](https://github.com/ESLyric/release) 檔案
-    - [.ttml](https://en.wikipedia.org/wiki/Timed_Text_Markup_Language) 檔案
-  - 線上歌詞來源
-    - QQ 音樂
-    - 網易雲音樂 NetEase Cloud Music
-    - 酷狗音樂 Kugou Music
-    - [amll-ttml-db](https://github.com/Steve-xmh/amll-ttml-db)
-    - [LRCLIB](https://lrclib.net/)
-- 🎶 **支援多種音樂播放器**
-
-  - <details><summary>⚠️ 網易雲音樂</summary>
-
-    - 請先安裝 [BetterNCM 插件](https://microblock.cc/betterncm)。如安裝後彈出降級指引，請依指引將網易雲音樂降級至 2.10.13；
-    - 然後在插件市集安裝 InfLink 插件，安裝完成後重啟網易雲音樂即可。
-    - ⚠️ 由於插件問題，時間軸可能存在異常
-
-    </details>
-
-  - <details><summary>⚠️ 酷狗音樂</summary>
-
-    - 請確保酷狗音樂設定中「支援系統播放控制（如鎖屏介面）」已開啟
-    - 酷狗音樂不會廣播時間軸資訊，導致切換進度時 BetterLyrics 無法偵測
-    - ⚠️ 時間軸問題為酷狗本身限制
-
-    </details>
-
-  - <details><summary>⚠️ Apple Music</summary>
-
-    - 請在設定中將時間軸閾值設為約 600ms（「設定」-「進階選項」），否則歌詞會不斷前後跳動
-    - ⚠️ 需額外設定以避免歌詞抖動（詳見文末 FAQ）
-
-    </details>
-
-  - <details><summary>⚠️ foobar2000</summary>
-
-    - 請安裝 https://github.com/dumbie/foo_mediacontrol
-    - ⚠️ 由於插件問題，時間軸可能存在異常
-
-    </details>
-
-  - Spotify
-  - QQ 音樂
-  - PotPlayer
-  - 媒體播放器（系統）
-
-  - <details><summary>LX Music</summary>
-
-    - 請確保已在 LX Music 設定頁開啟「Open API」
-    - 然後在 BetterLyrics 設定-進階選項中填寫 LX Music 伺服器位址（通常為 http://127.0.0.1:23330）即可
-
-    </details>
-
-  - <details><summary>MusicBee</summary>
-
-    - 請安裝 https://github.com/HenryPDT/mb_MediaControl
-
-    </details>
-
-  - <details><summary>iTunes</summary>
-
-    - 請安裝 https://github.com/thewizrd/iTunes-SMTC
-
-    </details>
-
-  - <details><summary>AIMP</summary>
-
-    - 請安裝 https://www.aimp.ru/?do=catalog&rec_id=1097
-
-    </details>
-
-- 🪟 **多種顯示模式**
-  - **標準模式**
-    - 沉浸式歌詞動畫與動態背景
-  - **停靠模式**
-    - 智慧歌詞條停靠螢幕邊緣
-  - **桌面模式**
-    - 歌詞懸浮於桌面應用之上
-- 🧠 **智慧行為**
-  - 音樂暫停時自動隱藏
-
-> 本專案仍在開發中，最新分支可能存在 bug 或異常行為。
-
-## 截圖
-
-### 標準模式
-
-![alt text](Screenshots/image.png)
-
-![alt text](Screenshots/glow-float.gif)
-
-![alt text](Screenshots/fan.png)
-
-![alt text](Screenshots/lyrics-only.png)
-
-![alt text](Screenshots/album-art-only.png)
-
-### 停靠模式
-
-![alt text](Screenshots/dock-1.png)
-
-![alt text](Screenshots/dock-2.png)
-
-### 桌面模式
-
-![alt text](Screenshots/desktop-1.png)
-
-![alt text](Screenshots/desktop-2.png)
-
-## 演示
-
-在 B 站觀看我們的介紹影片（2025 年 7 月 7 日上傳）：[點此觀看](https://www.bilibili.com/video/BV1zjGjzfEXh)
-
-## 立即體驗
-
-### Microsoft Store
-
-<a href="https://apps.microsoft.com/detail/9P1WCD1P597R?referrer=appbadge&mode=direct">
-	<img src="https://get.microsoft.com/images/en-us%20dark.svg" width="200"/>
-</a>
-
-**最簡單**的獲取方式。**無限制**免費試用或購買（免費與付費無差別）
-
-☕ 如果覺得好用，歡迎在 **Microsoft Store** 購買支持 🧧，感謝！🥰
-
-> 穩定版發布後，Microsoft Store 會第一時間更新。
-
-### Google Drive
-
-也可透過 Google Drive 取得（見 [release](https://github.com/jayfunc/BetterLyrics/releases) 頁面）
-
-> 下載的是 ".zip" 檔案，安裝方法請參考 [此文件](How2Install/How2Install.md)。
-
-## 💖 特別感謝
-
-- [Lyricify-Lyrics-Helper](https://github.com/WXRIW/Lyricify-Lyrics-Helper)
-  - 提供 QQ、網易雲、酷狗歌詞獲取、解密與解析
-- [lrclib](https://github.com/tranxuanthang/lrclib)
-  - LRCLIB 歌詞 API 提供方
-- [Audio Tools Library (ATL) for .NET](https://github.com/Zeugma440/atldotnet)
-  - 用於提取音樂檔案中的圖片
-- [WinUIEx](https://github.com/dotMorten/WinUIEx)
-  - 提供便捷的 Win32 視窗 API
-- [TagLib#](https://github.com/mono/taglib-sharp)
-  - 用於讀取原始歌詞內容
-- [Vanara](https://github.com/dahall/Vanara)
-  - Win32 API 封裝庫
-- [LibreTranslate](https://github.com/LibreTranslate/LibreTranslate)
-  - 提供離線歌詞翻譯能力
-- [Stackoverflow - 如何在 WPF 中動畫化 Margin 屬性](https://stackoverflow.com/a/21542882/11048731)
-- [DevWinUI](https://github.com/ghost1372/DevWinUI)
-- [Bilibili -【WinUI3】SystemBackdropController：定義雲母、壓克力效果](https://www.bilibili.com/video/BV1PY4FevEkS)
-- [cnblogs - .NET App 與 Windows 系統媒體控制(SMTC)互動](https://www.cnblogs.com/TwilightLemon/p/18279496)
-- [Win2D 中的遊戲循環：CanvasAnimatedControl](https://www.cnblogs.com/walterlv/p/10236395.html)
-- [r2d2rigo/Win2D-Samples](https://github.com/r2d2rigo/Win2D-Samples/blob/master/IrisBlurWin2D/IrisBlurWin2D/MainPage.xaml.cs)
-- [CommunityToolkit - 從入門到精通](https://mvvm.coldwind.top/)
-
-## 靈感來源
-
-- [refined-now-playing-netease](https://github.com/solstice23/refined-now-playing-netease)
-- [Lyricify-App](https://github.com/WXRIW/Lyricify-App)
-- [椒鹽音樂 Salt Player](https://moriafly.com/program/salt-player)
-- [MyToolBar](https://github.com/TwilightLemon/MyToolBar)
-
-## ✍️ 歡迎協助翻譯
-
-沒有找到你的語言？
-別擔心！快來參與翻譯，成為貢獻者之一吧！😆
-點擊[此連結](https://crowdin.com/project/betterlyrics/invite?h=d767e4f2dbd832d8fcdb6f7e5a198b402502866)透過 Crowdin 翻譯本應用！
-
-## Star 記錄
-
-[![](https://api.star-history.com/svg?repos=jayfunc/BetterLyrics&type=Date)](https://www.star-history.com/#jayfunc/BetterLyrics&Date)
-
-## 歡迎提 issue 和 PR
-
-如發現 bug 請在 issues 提出，或有想法歡迎在此分享。
-
----
-
-## FAQ
-
-### 停靠模式下看不到按鈕
-
-進入「停靠模式」後，操作按鈕會隱藏。將滑鼠懸停在視窗頂部即可顯示「沉浸」、「更多」、「關閉」按鈕。
-
-![alt text](FAQ/image-10.png)
-
-將滑鼠懸停在視窗底部邊緣稍上方，會顯示底部白色懸浮控制視窗
-
-![alt text](FAQ/image-11.png)
-
-點擊「小白條」可顯示底部懸浮控制欄（含目前播放進度、時間軸偏移調整、上一曲/暫停/下一曲、翻譯、佈局、設定）
-
-![alt text](FAQ/image-12.png)
-
-### 桌面模式如何鎖定視窗
-
-![alt text](FAQ/image-6.png)
-
-將滑鼠懸停在頂部，點擊鎖定圖示即可，或按 `Ctrl + Alt + U`。
-
-### 桌面模式如何解鎖視窗
-
-![alt text](FAQ/image-7.png)
-
-在系統匣右鍵圖示，選擇「解鎖視窗」，或按 `Ctrl + Alt + U`。
-
-### 歌詞時間軸有延遲
-
-將滑鼠懸停在應用底部，
-
-![alt text](FAQ/image.png)
-
-點擊第一個圖示按鈕（歌詞時間軸偏移），即可自由調整偏移量。
-
-### 歌詞頻繁跳動（如 Apple Music）
-
-![alt text](FAQ/image-2.png)
-
-進入「進階選項」，增大閾值（紅框標記處），直到歌詞正常。

crowdin.yml

@@ -1,3 +1,3 @@
 files:
-  - source: /BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
+  - source: /BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
     translation: /BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/%locale%/Resources.resw