Merge pull request #51 from jayfunc/dev

v1.0.20.0

.github/FUNDING.yml

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

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

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

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

@@ -5,52 +5,62 @@
   xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
   xmlns:uap18="http://schemas.microsoft.com/appx/manifest/uap/windows10/18"
   IgnorableNamespaces="uap rescap uap18">
 
-  <Identity
-    Name="37412.BetterLyrics"
-    Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-    Version="1.0.6.0" />
+	<Identity
+	  Name="37412.BetterLyrics"
+	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
+	  Version="1.0.20.0" />
 
-  <mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
-  <Properties>
-    <DisplayName>BetterLyrics</DisplayName>
-    <PublisherDisplayName>founchoo</PublisherDisplayName>
-    <Logo>Images\StoreLogo.png</Logo>
-  </Properties>
+	<Properties>
+		<DisplayName>BetterLyrics</DisplayName>
+		<PublisherDisplayName>founchoo</PublisherDisplayName>
+		<Logo>Images\StoreLogo.png</Logo>
+	</Properties>
 
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
-  </Dependencies>
+	<Dependencies>
+		<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
+		<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
+	</Dependencies>
 
-  <Resources>
-	  <Resource Language="en-US"/>
-	  <Resource Language="zh-CN"/>
-	  <Resource Language="zh-TW"/>
-	  <Resource Language="ja-JP"/>
-	  <Resource Language="ko-KR"/>
-  </Resources>
+	<Resources>
+		<Resource Language="en-US"/>
+		<Resource Language="zh-CN"/>
+		<Resource Language="zh-TW"/>
+		<Resource Language="ja-JP"/>
+		<Resource Language="ko-KR"/>
+	</Resources>
 
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="$targetentrypoint$">
-      <uap:VisualElements
-        DisplayName="BetterLyrics"
-        Description="BetterLyrics.WinUI3 (Package)"
-        BackgroundColor="transparent"
-        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png"  Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png"/>
-        <uap:SplashScreen Image="Images\SplashScreen.png" />
-      </uap:VisualElements>
-    </Application>
-  </Applications>
+	<Applications>
+		<Application Id="App"
+		  Executable="$targetnametoken$.exe"
+		  EntryPoint="$targetentrypoint$">
+			<uap:VisualElements
+			  DisplayName="BetterLyrics"
+			  Description="BetterLyrics.WinUI3 (Package)"
+			  BackgroundColor="transparent"
+			  Square150x150Logo="Images\Square150x150Logo.png"
+			  Square44x44Logo="Images\Square44x44Logo.png">
+				<uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png"  Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png"/>
+				<uap:SplashScreen Image="Images\SplashScreen.png" />
+			</uap:VisualElements>
+			<Extensions>
+				<uap5:Extension
+				  Category="windows.startupTask">
+					<uap5:StartupTask
+					  TaskId="AutoStartup"
+					  Enabled="false"
+					  DisplayName="BetterLyrics" />
+				</uap5:Extension>
+			</Extensions>
+		</Application>
+	</Applications>
 
-  <Capabilities>
-    <rescap:Capability Name="runFullTrust" />
-  </Capabilities>
+	<Capabilities>
+		<rescap:Capability Name="runFullTrust" />
+	</Capabilities>
 </Package>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml

@@ -12,6 +12,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
                 <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.SettingsControls/SettingsExpander/SettingsExpander.xaml" />
+                <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.Segmented/Segmented/Segmented.xaml" />
                 <!--  Other merged dictionaries here  -->
             </ResourceDictionary.MergedDictionaries>
 
@@ -47,13 +48,15 @@
             <converter:IntToCornerRadius x:Key="IntToCornerRadius" />
             <converter:CornerRadiusToDoubleConverter x:Key="CornerRadiusToDoubleConverter" />
             <converter:LyricsSearchProviderToDisplayNameConverter x:Key="LyricsSearchProviderToDisplayNameConverter" />
+            <converter:AlbumArtSearchProviderToDisplayNameConverter x:Key="AlbumArtSearchProviderToDisplayNameConverter" />
+            <converter:SecondsToFormattedTimeConverter x:Key="SecondsToFormattedTimeConverter" />
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
             <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
             <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayNameConverter" />
 
             <x:Double x:Key="SettingsCardSpacing">4</x:Double>
 
-            <!--  Style (inc. the correct spacing) of a section header  -->
+            <!--  Style  -->
             <Style
                 x:Key="SettingsSectionHeaderTextBlockStyle"
                 BasedOn="{StaticResource BodyStrongTextBlockStyle}"
@@ -63,14 +66,16 @@
                 </Style.Setters>
             </Style>
             <Style x:Key="TitleBarButtonStyle" TargetType="Button">
-                <Setter Property="VerticalAlignment" Value="Stretch" />
+                <Setter Property="VerticalAlignment" Value="Top" />
                 <Setter Property="CornerRadius" Value="4" />
                 <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Padding" Value="16,0" />
+                <Setter Property="Padding" Value="16,9,16,11" />
+                <Setter Property="Margin" Value="0" />
                 <Setter Property="Background" Value="Transparent" />
             </Style>
             <Style x:Key="GhostButtonStyle" TargetType="Button">
                 <Setter Property="VerticalAlignment" Value="Stretch" />
+                <Setter Property="Padding" Value="8" />
                 <Setter Property="CornerRadius" Value="4" />
                 <Setter Property="BorderThickness" Value="0" />
                 <Setter Property="Background" Value="Transparent" />
@@ -79,18 +84,399 @@
                 <Setter Property="CornerRadius" Value="4" />
                 <Setter Property="VerticalAlignment" Value="Stretch" />
                 <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Padding" Value="16,0" />
+                <Setter Property="Padding" Value="16,9,16,11" />
                 <Setter Property="Background" Value="Transparent" />
             </Style>
             <Style x:Key="GhostToggleButtonStyle" TargetType="ToggleButton">
                 <Setter Property="CornerRadius" Value="4" />
                 <Setter Property="VerticalAlignment" Value="Stretch" />
                 <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="Padding" Value="8" />
                 <Setter Property="Background" Value="Transparent" />
             </Style>
+            <Style x:Key="CardGridStyle" TargetType="Grid">
+                <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
+                <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
+                <Setter Property="BorderThickness" Value="1" />
+                <Setter Property="CornerRadius" Value="6" />
+            </Style>
+
+            <Style x:Key="GhostSliderStyle" TargetType="Slider">
+                <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
+                <Setter Property="BorderThickness" Value="{ThemeResource SliderBorderThemeThickness}" />
+                <Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
+                <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+                <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+                <Setter Property="ManipulationMode" Value="None" />
+                <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+                <Setter Property="FocusVisualMargin" Value="-7,0,-7,0" />
+                <Setter Property="IsFocusEngagementEnabled" Value="True" />
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="Slider">
+                            <Grid Margin="{TemplateBinding Padding}">
+                                <Grid.Resources>
+                                    <Style x:Key="SliderThumbStyle" TargetType="Thumb">
+                                        <Setter Property="BorderThickness" Value="0" />
+                                        <Setter Property="Background" Value="{ThemeResource TextFillColorPrimaryBrush}" />
+                                        <Setter Property="Template">
+                                            <Setter.Value>
+                                                <ControlTemplate TargetType="Thumb">
+                                                    <Border
+                                                        Background="{TemplateBinding Background}"
+                                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                                        CornerRadius="0,1,1,0" />
+                                                </ControlTemplate>
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Style>
+                                </Grid.Resources>
+
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="*" />
+                                </Grid.RowDefinitions>
+                                <ContentPresenter
+                                    x:Name="HeaderContentPresenter"
+                                    Grid.Row="0"
+                                    Margin="{ThemeResource SliderTopHeaderMargin}"
+                                    x:DeferLoadStrategy="Lazy"
+                                    Content="{TemplateBinding Header}"
+                                    ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                    FontWeight="{ThemeResource SliderHeaderThemeFontWeight}"
+                                    Foreground="{ThemeResource SliderHeaderForeground}"
+                                    TextWrapping="Wrap"
+                                    Visibility="Collapsed" />
+                                <Grid
+                                    x:Name="SliderContainer"
+                                    Grid.Row="1"
+                                    Background="{ThemeResource SliderContainerBackground}"
+                                    Control.IsTemplateFocusTarget="True">
+                                    <Grid x:Name="HorizontalTemplate" MinHeight="{ThemeResource SliderHorizontalHeight}">
+
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="{ThemeResource SliderPreContentMargin}" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="{ThemeResource SliderPostContentMargin}" />
+                                        </Grid.RowDefinitions>
+                                        <Rectangle
+                                            x:Name="HorizontalTrackRect"
+                                            Grid.Row="1"
+                                            Grid.ColumnSpan="3"
+                                            Height="2"
+                                            Fill="{TemplateBinding Background}" />
+                                        <Rectangle
+                                            x:Name="HorizontalDecreaseRect"
+                                            Grid.Row="1"
+                                            Fill="{TemplateBinding Foreground}" />
+                                        <TickBar
+                                            x:Name="TopTickBar"
+                                            Grid.ColumnSpan="3"
+                                            Height="{ThemeResource SliderOutsideTickBarThemeHeight}"
+                                            Margin="0,0,0,4"
+                                            VerticalAlignment="Bottom"
+                                            Fill="{ThemeResource SliderTickBarFill}"
+                                            Visibility="Collapsed" />
+                                        <TickBar
+                                            x:Name="HorizontalInlineTickBar"
+                                            Grid.Row="1"
+                                            Grid.ColumnSpan="3"
+                                            Height="2"
+                                            Fill="{ThemeResource SliderInlineTickBarFill}"
+                                            Visibility="Collapsed" />
+                                        <TickBar
+                                            x:Name="BottomTickBar"
+                                            Grid.Row="2"
+                                            Grid.ColumnSpan="3"
+                                            Height="{ThemeResource SliderOutsideTickBarThemeHeight}"
+                                            Margin="0,4,0,0"
+                                            VerticalAlignment="Top"
+                                            Fill="{ThemeResource SliderTickBarFill}"
+                                            Visibility="Collapsed" />
+                                        <Thumb
+                                            x:Name="HorizontalThumb"
+                                            Grid.Row="0"
+                                            Grid.RowSpan="3"
+                                            Grid.Column="1"
+                                            Width="2"
+                                            Height="2"
+                                            AutomationProperties.AccessibilityView="Raw"
+                                            DataContext="{TemplateBinding Value}"
+                                            FocusVisualMargin="-14,-6,-14,-6"
+                                            Style="{StaticResource SliderThumbStyle}" />
+                                    </Grid>
+                                    <Grid
+                                        x:Name="VerticalTemplate"
+                                        MinWidth="{ThemeResource SliderVerticalWidth}"
+                                        Visibility="Collapsed">
+
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                        </Grid.RowDefinitions>
+
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="{ThemeResource SliderPreContentMargin}" />
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="{ThemeResource SliderPostContentMargin}" />
+                                        </Grid.ColumnDefinitions>
+                                        <Rectangle
+                                            x:Name="VerticalTrackRect"
+                                            Grid.RowSpan="3"
+                                            Grid.Column="1"
+                                            Width="{ThemeResource SliderTrackThemeHeight}"
+                                            Fill="{TemplateBinding Background}" />
+                                        <Rectangle
+                                            x:Name="VerticalDecreaseRect"
+                                            Grid.Row="2"
+                                            Grid.Column="1"
+                                            Fill="{TemplateBinding Foreground}" />
+                                        <TickBar
+                                            x:Name="LeftTickBar"
+                                            Grid.RowSpan="3"
+                                            Width="{ThemeResource SliderOutsideTickBarThemeHeight}"
+                                            Margin="0,0,4,0"
+                                            HorizontalAlignment="Right"
+                                            Fill="{ThemeResource SliderTickBarFill}"
+                                            Visibility="Collapsed" />
+                                        <TickBar
+                                            x:Name="VerticalInlineTickBar"
+                                            Grid.RowSpan="3"
+                                            Grid.Column="1"
+                                            Width="{ThemeResource SliderTrackThemeHeight}"
+                                            Fill="{ThemeResource SliderInlineTickBarFill}"
+                                            Visibility="Collapsed" />
+                                        <TickBar
+                                            x:Name="RightTickBar"
+                                            Grid.RowSpan="3"
+                                            Grid.Column="2"
+                                            Width="{ThemeResource SliderOutsideTickBarThemeHeight}"
+                                            Margin="4,0,0,0"
+                                            HorizontalAlignment="Left"
+                                            Fill="{ThemeResource SliderTickBarFill}"
+                                            Visibility="Collapsed" />
+                                        <Thumb
+                                            x:Name="VerticalThumb"
+                                            Grid.Row="1"
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="3"
+                                            Width="24"
+                                            Height="8"
+                                            AutomationProperties.AccessibilityView="Raw"
+                                            DataContext="{TemplateBinding Value}"
+                                            FocusVisualMargin="-6,-14,-6,-14"
+                                            Style="{StaticResource SliderThumbStyle}" />
+                                    </Grid>
+
+                                </Grid>
+
+                            </Grid>
+
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+
+            <Style x:Key="TransparentSliderStyle" TargetType="Slider">
+                <Setter Property="Background" Value="Transparent" />
+                <Setter Property="BorderThickness" Value="{ThemeResource SliderBorderThemeThickness}" />
+                <Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
+                <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+                <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+                <Setter Property="ManipulationMode" Value="None" />
+                <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+                <Setter Property="FocusVisualMargin" Value="-7,0,-7,0" />
+                <Setter Property="IsFocusEngagementEnabled" Value="True" />
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="Slider">
+                            <Grid Margin="{TemplateBinding Padding}">
+                                <Grid.Resources>
+                                    <Style x:Key="SliderThumbStyle" TargetType="Thumb">
+                                        <Setter Property="BorderThickness" Value="0" />
+                                        <Setter Property="Background" Value="{ThemeResource TextFillColorPrimaryBrush}" />
+                                        <Setter Property="Template">
+                                            <Setter.Value>
+                                                <ControlTemplate TargetType="Thumb">
+                                                    <Border
+                                                        Background="{TemplateBinding Background}"
+                                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                                        CornerRadius="0,1,1,0" />
+                                                </ControlTemplate>
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Style>
+                                </Grid.Resources>
+
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="*" />
+                                </Grid.RowDefinitions>
+                                <ContentPresenter
+                                    x:Name="HeaderContentPresenter"
+                                    Grid.Row="0"
+                                    Margin="{ThemeResource SliderTopHeaderMargin}"
+                                    x:DeferLoadStrategy="Lazy"
+                                    Content="{TemplateBinding Header}"
+                                    ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                    FontWeight="{ThemeResource SliderHeaderThemeFontWeight}"
+                                    Foreground="{ThemeResource SliderHeaderForeground}"
+                                    TextWrapping="Wrap"
+                                    Visibility="Collapsed" />
+                                <Grid
+                                    x:Name="SliderContainer"
+                                    Grid.Row="1"
+                                    Background="{ThemeResource SliderContainerBackground}"
+                                    Control.IsTemplateFocusTarget="True">
+                                    <Grid x:Name="HorizontalTemplate" MinHeight="{ThemeResource SliderHorizontalHeight}">
+
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="{ThemeResource SliderPreContentMargin}" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="{ThemeResource SliderPostContentMargin}" />
+                                        </Grid.RowDefinitions>
+                                        <Rectangle
+                                            x:Name="HorizontalTrackRect"
+                                            Grid.Row="1"
+                                            Grid.ColumnSpan="3"
+                                            Height="2"
+                                            Fill="{TemplateBinding Background}" />
+                                        <Rectangle
+                                            x:Name="HorizontalDecreaseRect"
+                                            Grid.Row="1"
+                                            Fill="{TemplateBinding Foreground}" />
+                                        <TickBar
+                                            x:Name="TopTickBar"
+                                            Grid.ColumnSpan="3"
+                                            Height="{ThemeResource SliderOutsideTickBarThemeHeight}"
+                                            Margin="0,0,0,4"
+                                            VerticalAlignment="Bottom"
+                                            Fill="{ThemeResource SliderTickBarFill}"
+                                            Visibility="Collapsed" />
+                                        <TickBar
+                                            x:Name="HorizontalInlineTickBar"
+                                            Grid.Row="1"
+                                            Grid.ColumnSpan="3"
+                                            Height="2"
+                                            Fill="{ThemeResource SliderInlineTickBarFill}"
+                                            Visibility="Collapsed" />
+                                        <TickBar
+                                            x:Name="BottomTickBar"
+                                            Grid.Row="2"
+                                            Grid.ColumnSpan="3"
+                                            Height="{ThemeResource SliderOutsideTickBarThemeHeight}"
+                                            Margin="0,4,0,0"
+                                            VerticalAlignment="Top"
+                                            Fill="{ThemeResource SliderTickBarFill}"
+                                            Visibility="Collapsed" />
+                                        <Thumb
+                                            x:Name="HorizontalThumb"
+                                            Grid.Row="0"
+                                            Grid.RowSpan="3"
+                                            Grid.Column="1"
+                                            Width="2"
+                                            Height="2"
+                                            AutomationProperties.AccessibilityView="Raw"
+                                            DataContext="{TemplateBinding Value}"
+                                            FocusVisualMargin="-14,-6,-14,-6"
+                                            Style="{StaticResource SliderThumbStyle}" />
+                                    </Grid>
+                                    <Grid
+                                        x:Name="VerticalTemplate"
+                                        MinWidth="{ThemeResource SliderVerticalWidth}"
+                                        Visibility="Collapsed">
+
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                        </Grid.RowDefinitions>
+
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="{ThemeResource SliderPreContentMargin}" />
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="{ThemeResource SliderPostContentMargin}" />
+                                        </Grid.ColumnDefinitions>
+                                        <Rectangle
+                                            x:Name="VerticalTrackRect"
+                                            Grid.RowSpan="3"
+                                            Grid.Column="1"
+                                            Width="{ThemeResource SliderTrackThemeHeight}"
+                                            Fill="{TemplateBinding Background}" />
+                                        <Rectangle
+                                            x:Name="VerticalDecreaseRect"
+                                            Grid.Row="2"
+                                            Grid.Column="1"
+                                            Fill="{TemplateBinding Foreground}" />
+                                        <TickBar
+                                            x:Name="LeftTickBar"
+                                            Grid.RowSpan="3"
+                                            Width="{ThemeResource SliderOutsideTickBarThemeHeight}"
+                                            Margin="0,0,4,0"
+                                            HorizontalAlignment="Right"
+                                            Fill="{ThemeResource SliderTickBarFill}"
+                                            Visibility="Collapsed" />
+                                        <TickBar
+                                            x:Name="VerticalInlineTickBar"
+                                            Grid.RowSpan="3"
+                                            Grid.Column="1"
+                                            Width="{ThemeResource SliderTrackThemeHeight}"
+                                            Fill="{ThemeResource SliderInlineTickBarFill}"
+                                            Visibility="Collapsed" />
+                                        <TickBar
+                                            x:Name="RightTickBar"
+                                            Grid.RowSpan="3"
+                                            Grid.Column="2"
+                                            Width="{ThemeResource SliderOutsideTickBarThemeHeight}"
+                                            Margin="4,0,0,0"
+                                            HorizontalAlignment="Left"
+                                            Fill="{ThemeResource SliderTickBarFill}"
+                                            Visibility="Collapsed" />
+                                        <Thumb
+                                            x:Name="VerticalThumb"
+                                            Grid.Row="1"
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="3"
+                                            Width="24"
+                                            Height="8"
+                                            AutomationProperties.AccessibilityView="Raw"
+                                            DataContext="{TemplateBinding Value}"
+                                            FocusVisualMargin="-6,-14,-6,-14"
+                                            Style="{StaticResource SliderThumbStyle}" />
+                                    </Grid>
+
+                                </Grid>
+
+                            </Grid>
+
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+
+            <StaticResource x:Key="ToggleButtonBackgroundChecked" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ToggleButtonBackgroundCheckedPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ToggleButtonBackgroundCheckedPressed" ResourceKey="TextFillColorPrimaryBrush" />
 
             <!--  Dimensions  -->
 
+            <!--  Fonts  -->
+            <FontFamily x:Key="IconFontFamily">ms-appx:///Assets/Segoe Fluent Icons.ttf#Segoe Fluent Icons</FontFamily>
         </ResourceDictionary>
     </Application.Resources>
 </Application>

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

@@ -1,13 +1,10 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
-using System.Text;
-using System.Threading.Tasks;
-using BetterInAppLyrics.WinUI3.ViewModels;
+using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Services;
-using BetterLyrics.WinUI3.Services.BetterLyrics.WinUI3.Services;
 using BetterLyrics.WinUI3.ViewModels;
+using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -15,34 +12,27 @@ using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.Windows.ApplicationModel.Resources;
 using Serilog;
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
+using ShadowViewer.Controls;
+using System;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3
 {
-    /// <summary>
-    /// Provides application-specific behavior to supplement the default Application class
-    /// </summary>
     public partial class App : Application
     {
-        #region Fields
 
-        /// <summary>
-        /// Defines the _logger
-        /// </summary>
         private readonly ILogger<App> _logger;
 
-        #endregion
+        public static new App Current => (App)Application.Current;
+        public static DispatcherQueue? DispatcherQueue { get; private set; }
+        public static DispatcherQueueTimer? DispatcherQueueTimer { get; private set; }
+        public static ResourceLoader? ResourceLoader { get; private set; }
 
-        #region Constructors
+        public NotificationPanel? LyricsWindowNotificationPanel { get; set; }
+        public NotificationPanel? SettingsWindowNotificationPanel { get; set; }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="App"/> class.
-        /// </summary>
         public App()
         {
             this.InitializeComponent();
@@ -52,10 +42,10 @@ namespace BetterLyrics.WinUI3
             ResourceLoader = new ResourceLoader();
 
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-            AppInfo.EnsureDirectories();
+            PathHelper.EnsureDirectories();
             ConfigureServices();
 
-            _logger = Ioc.Default.GetService<ILogger<App>>()!;
+            _logger = Ioc.Default.GetRequiredService<ILogger<App>>();
 
             UnhandledException += App_UnhandledException;
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
@@ -63,51 +53,21 @@ namespace BetterLyrics.WinUI3
             TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;
         }
 
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets the Current
-        /// </summary>
-        public static new App Current => (App)Application.Current;
-
-        /// <summary>
-        /// Gets the DispatcherQueue
-        /// </summary>
-        public static DispatcherQueue? DispatcherQueue { get; private set; }
-
-        /// <summary>
-        /// Gets the DispatcherQueueTimer
-        /// </summary>
-        public static DispatcherQueueTimer? DispatcherQueueTimer { get; private set; }
-
-        /// <summary>
-        /// Gets the ResourceLoader
-        /// </summary>
-        public static ResourceLoader? ResourceLoader { get; private set; }
-
-        #endregion
-
-        #region Methods
-
-        /// <summary>
-        /// Invoked when the application is launched
-        /// </summary>
-        /// <param name="args">Details about the launch request and process</param>
         protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
-            WindowHelper.OpenLyricsWindow();
+            WindowHelper.OpenWindow<LyricsWindow>();
+            var lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
+            if (lyricsWindow == null) return;
+
+            lyricsWindow.ViewModel.InitLockHotKey();
+            lyricsWindow.AutoSelectLyricsMode();
         }
 
-        /// <summary>
-        /// The ConfigureServices
-        /// </summary>
         private static void ConfigureServices()
         {
             Log.Logger = new LoggerConfiguration()
-                .MinimumLevel.Debug()
-                .WriteTo.File(AppInfo.LogFilePattern, rollingInterval: RollingInterval.Day)
+                .MinimumLevel.Is(Serilog.Events.LogEventLevel.Verbose)
+                .WriteTo.File(PathHelper.LogFilePattern, rollingInterval: RollingInterval.Day)
                 .CreateLogger();
 
             // Register services
@@ -121,72 +81,41 @@ namespace BetterLyrics.WinUI3
                     // Services
                     .AddSingleton<ISettingsService, SettingsService>()
                     .AddSingleton<IPlaybackService, PlaybackService>()
-                    .AddSingleton<IMusicSearchService, MusicSearchService>()
+                    .AddSingleton<IAlbumArtSearchService, AlbumArtSearchService>()
+                    .AddSingleton<ILyricsSearchService, LyricsSearchService>()
                     .AddSingleton<ILibWatcherService, LibWatcherService>()
+                    .AddSingleton<ITranslateService, TranslateService>()
                     // ViewModels
-                    .AddTransient<HostWindowViewModel>()
+                    .AddSingleton<LyricsWindowViewModel>()
+                    .AddSingleton<SettingsWindowViewModel>()
                     .AddSingleton<SystemTrayViewModel>()
-                    .AddSingleton<SettingsViewModel>()
+                    .AddSingleton<SettingsPageViewModel>()
                     .AddSingleton<LyricsPageViewModel>()
+                    .AddSingleton<MusicGalleryViewModel>()
                     .AddSingleton<LyricsRendererViewModel>()
-                    .AddSingleton<LyricsSettingsControlViewModel>()
                     .BuildServiceProvider()
             );
         }
 
-        /// <summary>
-        /// The App_UnhandledException
-        /// </summary>
-        /// <param name="sender">The sender<see cref="object"/></param>
-        /// <param name="e">The e<see cref="Microsoft.UI.Xaml.UnhandledExceptionEventArgs"/></param>
-        private void App_UnhandledException(
-            object sender,
-            Microsoft.UI.Xaml.UnhandledExceptionEventArgs e
-        )
+        private void App_UnhandledException(object sender, Microsoft.UI.Xaml.UnhandledExceptionEventArgs e)
         {
             _logger.LogError(e.Exception, "App_UnhandledException");
             e.Handled = true;
         }
 
-        /// <summary>
-        /// The CurrentDomain_FirstChanceException
-        /// </summary>
-        /// <param name="sender">The sender<see cref="object?"/></param>
-        /// <param name="e">The e<see cref="System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs"/></param>
-        private void CurrentDomain_FirstChanceException(
-            object? sender,
-            System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs e
-        )
+        private void CurrentDomain_FirstChanceException(object? sender, System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs e)
         {
-            _logger.LogError(e.Exception, "TaskScheduler_UnobservedTaskException");
+            _logger.LogError(e.Exception, "CurrentDomain_FirstChanceException");
         }
 
-        /// <summary>
-        /// The CurrentDomain_UnhandledException
-        /// </summary>
-        /// <param name="sender">The sender<see cref="object"/></param>
-        /// <param name="e">The e<see cref="System.UnhandledExceptionEventArgs"/></param>
-        private void CurrentDomain_UnhandledException(
-            object sender,
-            System.UnhandledExceptionEventArgs e
-        )
+        private void CurrentDomain_UnhandledException(object sender, System.UnhandledExceptionEventArgs e)
         {
             _logger.LogError(e.ExceptionObject.ToString(), "CurrentDomain_UnhandledException");
         }
 
-        /// <summary>
-        /// The TaskScheduler_UnobservedTaskException
-        /// </summary>
-        /// <param name="sender">The sender<see cref="object?"/></param>
-        /// <param name="e">The e<see cref="UnobservedTaskExceptionEventArgs"/></param>
-        private void TaskScheduler_UnobservedTaskException(
-            object? sender,
-            UnobservedTaskExceptionEventArgs e
-        )
+        private void TaskScheduler_UnobservedTaskException(object? sender, UnobservedTaskExceptionEventArgs e)
         {
-            //_logger.LogError(e.Exception, "TaskScheduler_UnobservedTaskException");
+            _logger.LogError(e.Exception, "TaskScheduler_UnobservedTaskException");
         }
-
-        #endregion
     }
 }

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

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DependenciesSettingsExpander.xaml

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UserControl
-    x:Class="BetterLyrics.WinUI3.Controls.DependenciesSettingsExpander"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:BetterLyrics.WinUI3.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="using:CommunityToolkit.WinUI"
-    mc:Ignorable="d">
-
-    <controls:SettingsExpander
-        x:Uid="DependenciesSettingsExpander"
-        HeaderIcon="{ui:FontIcon Glyph=&#xE7B8;}"
-        IsExpanded="True">
-        <controls:SettingsExpander.Items>
-            <controls:SettingsCard Header="CommunityToolkit.Labs.WinUI.MarqueeText">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/CommunityToolkit.Labs.WinUI.MarqueeText" NavigateUri="https://www.nuget.org/packages/CommunityToolkit.Labs.WinUI.MarqueeText" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="CommunityToolkit.Labs.WinUI.OpacityMaskView">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/CommunityToolkit.Labs.WinUI.OpacityMaskView" NavigateUri="https://www.nuget.org/packages/CommunityToolkit.Labs.WinUI.OpacityMaskView" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="CommunityToolkit.Mvvm">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/CommunityToolkit.Mvvm" NavigateUri="https://www.nuget.org/packages/CommunityToolkit.Mvvm" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="CommunityToolkit.WinUI.Behaviors">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/CommunityToolkit.WinUI.Behaviors" NavigateUri="https://www.nuget.org/packages/CommunityToolkit.WinUI.Behaviors" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="CommunityToolkit.WinUI.Controls.Primitives">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/CommunityToolkit.WinUI.Controls.Primitives" NavigateUri="https://www.nuget.org/packages/CommunityToolkit.WinUI.Controls.Primitives" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="CommunityToolkit.WinUI.Controls.Segmented">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/CommunityToolkit.WinUI.Controls.Segmented" NavigateUri="https://www.nuget.org/packages/CommunityToolkit.WinUI.Controls.Segmented" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="CommunityToolkit.WinUI.Controls.SettingsControls">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/CommunityToolkit.WinUI.Controls.SettingsControls" NavigateUri="https://www.nuget.org/packages/CommunityToolkit.WinUI.Controls.SettingsControls" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="CommunityToolkit.WinUI.Converters">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/CommunityToolkit.WinUI.Converters" NavigateUri="https://www.nuget.org/packages/CommunityToolkit.WinUI.Converters" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="CommunityToolkit.WinUI.Extensions">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/CommunityToolkit.WinUI.Extensions" NavigateUri="https://www.nuget.org/packages/CommunityToolkit.WinUI.Extensions" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="CommunityToolkit.WinUI.Helpers">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/CommunityToolkit.WinUI.Helpers" NavigateUri="https://www.nuget.org/packages/CommunityToolkit.WinUI.Helpers" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="CommunityToolkit.WinUI.Media">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/CommunityToolkit.WinUI.Media" NavigateUri="https://www.nuget.org/packages/CommunityToolkit.WinUI.Media" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="H.NotifyIcon.WinUI">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/H.NotifyIcon.WinUI" NavigateUri="https://www.nuget.org/packages/H.NotifyIcon.WinUI" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="Lyricify.Lyrics.Helper-NativeAot">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/Lyricify.Lyrics.Helper-NativeAot" NavigateUri="https://www.nuget.org/packages/Lyricify.Lyrics.Helper-NativeAot" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="Microsoft.Extensions.DependencyInjection">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/Microsoft.Extensions.DependencyInjection" NavigateUri="https://www.nuget.org/packages/Microsoft.Extensions.DependencyInjection" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="Microsoft.Extensions.Logging">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/Microsoft.Extensions.Logging" NavigateUri="https://www.nuget.org/packages/Microsoft.Extensions.Logging" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="Microsoft.Graphics.Win2D">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/Microsoft.Graphics.Win2D" NavigateUri="https://www.nuget.org/packages/Microsoft.Graphics.Win2D" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="Microsoft.Windows.SDK.BuildTools">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/Microsoft.Windows.SDK.BuildTools" NavigateUri="https://www.nuget.org/packages/Microsoft.Windows.SDK.BuildTools" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="Microsoft.WindowsAppSDK">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/Microsoft.WindowsAppSDK" NavigateUri="https://www.nuget.org/packages/Microsoft.WindowsAppSDK" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="Microsoft.Xaml.Behaviors.WinUI.Managed">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/Microsoft.Xaml.Behaviors.WinUI.Managed" NavigateUri="https://www.nuget.org/packages/Microsoft.Xaml.Behaviors.WinUI.Managed" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="Serilog.Extensions.Logging">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/Serilog.Extensions.Logging" NavigateUri="https://www.nuget.org/packages/Serilog.Extensions.Logging" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="Serilog.Sinks.File">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/Serilog.Sinks.File" NavigateUri="https://www.nuget.org/packages/Serilog.Sinks.File" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="System.Drawing.Common">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/System.Drawing.Common" NavigateUri="https://www.nuget.org/packages/System.Drawing.Common" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="System.Text.Encoding.CodePages">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/System.Text.Encoding.CodePages" NavigateUri="https://www.nuget.org/packages/System.Text.Encoding.CodePages" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="TagLibSharp">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/TagLibSharp" NavigateUri="https://www.nuget.org/packages/TagLibSharp" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="Ude.NetStandard">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/Ude.NetStandard" NavigateUri="https://www.nuget.org/packages/Ude.NetStandard" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="WinUIEx">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/WinUIEx" NavigateUri="https://www.nuget.org/packages/WinUIEx" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-            <controls:SettingsCard Header="z440.atl.core">
-                <controls:SettingsCard.Description>
-                    <HyperlinkButton Content="https://www.nuget.org/packages/z440.atl.core" NavigateUri="https://www.nuget.org/packages/z440.atl.core" />
-                </controls:SettingsCard.Description>
-            </controls:SettingsCard>
-        </controls:SettingsExpander.Items>
-    </controls:SettingsExpander>
-
-</UserControl>

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

@@ -1,22 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
 
 namespace BetterLyrics.WinUI3.Controls
 {

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

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ColorToBrushConverter.cs

@@ -7,21 +7,8 @@ using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Converter
 {
-    /// <summary>
-    /// Defines the <see cref="ColorToBrushConverter" />
-    /// </summary>
     public partial class ColorToBrushConverter : IValueConverter
     {
-        #region Methods
-
-        /// <summary>
-        /// The Convert
-        /// </summary>
-        /// <param name="value">The value<see cref="object"/></param>
-        /// <param name="targetType">The targetType<see cref="Type"/></param>
-        /// <param name="parameter">The parameter<see cref="object"/></param>
-        /// <param name="language">The language<see cref="string"/></param>
-        /// <returns>The <see cref="object"/></returns>
         public object Convert(object value, Type targetType, object parameter, string language)
         {
             if (value is Color color)
@@ -31,19 +18,9 @@ namespace BetterLyrics.WinUI3.Converter
             return new SolidColorBrush();
         }
 
-        /// <summary>
-        /// The ConvertBack
-        /// </summary>
-        /// <param name="value">The value<see cref="object"/></param>
-        /// <param name="targetType">The targetType<see cref="Type"/></param>
-        /// <param name="parameter">The parameter<see cref="object"/></param>
-        /// <param name="language">The language<see cref="string"/></param>
-        /// <returns>The <see cref="object"/></returns>
         public object ConvertBack(object value, Type targetType, object parameter, string language)
         {
             throw new NotImplementedException();
         }
-
-        #endregion
     }
 }

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

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.UI.Xaml.Data;
 
 namespace BetterLyrics.WinUI3.Converter
@@ -13,10 +9,9 @@ namespace BetterLyrics.WinUI3.Converter
         {
             if (value is Microsoft.UI.Xaml.CornerRadius cornerRadius)
             {
-                // Convert CornerRadius to an integer value, e.g., using the top-left radius
                 return (double)cornerRadius.TopLeft;
             }
-            return .0; // or handle the case where value is not a CornerRadius
+            return .0;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, string language)

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

@@ -5,21 +5,8 @@ using Microsoft.UI.Xaml.Data;
 
 namespace BetterLyrics.WinUI3.Converter
 {
-    /// <summary>
-    /// Defines the <see cref="EnumToIntConverter" />
-    /// </summary>
     internal partial class EnumToIntConverter : IValueConverter
     {
-        #region Methods
-
-        /// <summary>
-        /// The Convert
-        /// </summary>
-        /// <param name="value">The value<see cref="object"/></param>
-        /// <param name="targetType">The targetType<see cref="Type"/></param>
-        /// <param name="parameter">The parameter<see cref="object"/></param>
-        /// <param name="language">The language<see cref="string"/></param>
-        /// <returns>The <see cref="object"/></returns>
         public object Convert(object value, Type targetType, object parameter, string language)
         {
             if (value is Enum)
@@ -29,14 +16,6 @@ namespace BetterLyrics.WinUI3.Converter
             return 0;
         }
 
-        /// <summary>
-        /// The ConvertBack
-        /// </summary>
-        /// <param name="value">The value<see cref="object"/></param>
-        /// <param name="targetType">The targetType<see cref="Type"/></param>
-        /// <param name="parameter">The parameter<see cref="object"/></param>
-        /// <param name="language">The language<see cref="string"/></param>
-        /// <returns>The <see cref="object"/></returns>
         public object ConvertBack(object value, Type targetType, object parameter, string language)
         {
             if (value is int && targetType.IsEnum)
@@ -45,7 +24,5 @@ namespace BetterLyrics.WinUI3.Converter
             }
             return Enum.ToObject(targetType, 0);
         }
-
-        #endregion
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToCornerRadius.cs

@@ -5,21 +5,8 @@ using Microsoft.UI.Xaml.Data;
 
 namespace BetterLyrics.WinUI3.Converter
 {
-    /// <summary>
-    /// Defines the <see cref="IntToCornerRadius" />
-    /// </summary>
     public partial class IntToCornerRadius : IValueConverter
     {
-        #region Methods
-
-        /// <summary>
-        /// The Convert
-        /// </summary>
-        /// <param name="value">The value<see cref="object"/></param>
-        /// <param name="targetType">The targetType<see cref="Type"/></param>
-        /// <param name="parameter">The parameter<see cref="object"/></param>
-        /// <param name="language">The language<see cref="string"/></param>
-        /// <returns>The <see cref="object"/></returns>
         public object Convert(object value, Type targetType, object parameter, string language)
         {
             if (value is int intValue && parameter is double controlHeight)
@@ -29,19 +16,9 @@ namespace BetterLyrics.WinUI3.Converter
             return new Microsoft.UI.Xaml.CornerRadius(0);
         }
 
-        /// <summary>
-        /// The ConvertBack
-        /// </summary>
-        /// <param name="value">The value<see cref="object"/></param>
-        /// <param name="targetType">The targetType<see cref="Type"/></param>
-        /// <param name="parameter">The parameter<see cref="object"/></param>
-        /// <param name="language">The language<see cref="string"/></param>
-        /// <returns>The <see cref="object"/></returns>
         public object ConvertBack(object value, Type targetType, object parameter, string language)
         {
             throw new NotImplementedException();
         }
-
-        #endregion
     }
 }

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

@@ -6,73 +6,32 @@ using Microsoft.UI.Xaml.Data;
 
 namespace BetterLyrics.WinUI3.Converter
 {
-    /// <summary>
-    /// Defines the <see cref="LyricsSearchProviderToDisplayNameConverter" />
-    /// </summary>
     public partial class LyricsSearchProviderToDisplayNameConverter : IValueConverter
     {
-        #region Methods
-
-        /// <summary>
-        /// The Convert
-        /// </summary>
-        /// <param name="value">The value<see cref="object"/></param>
-        /// <param name="targetType">The targetType<see cref="Type"/></param>
-        /// <param name="parameter">The parameter<see cref="object"/></param>
-        /// <param name="language">The language<see cref="string"/></param>
-        /// <returns>The <see cref="object"/></returns>
         public object Convert(object value, Type targetType, object parameter, string language)
         {
             if (value is LyricsSearchProvider provider)
             {
                 return provider switch
                 {
-                    LyricsSearchProvider.LrcLib => App.ResourceLoader!.GetString(
-                        "LyricsSearchProviderLrcLib"
-                    ),
-                    LyricsSearchProvider.QQ => App.ResourceLoader!.GetString(
-                        "LyricsSearchProviderQQ"
-                    ),
-                    LyricsSearchProvider.Netease => App.ResourceLoader!.GetString(
-                        "LyricsSearchProviderNetease"
-                    ),
-                    LyricsSearchProvider.Kugou => App.ResourceLoader!.GetString(
-                        "LyricsSearchProviderKugou"
-                    ),
-                    LyricsSearchProvider.AmllTtmlDb => App.ResourceLoader!.GetString(
-                        "LyricsSearchProviderAmllTtmlDb"
-                    ),
-                    LyricsSearchProvider.LocalLrcFile => App.ResourceLoader!.GetString(
-                        "LyricsSearchProviderLocalLrcFile"
-                    ),
-                    LyricsSearchProvider.LocalMusicFile => App.ResourceLoader!.GetString(
-                        "LyricsSearchProviderLocalMusicFile"
-                    ),
-                    LyricsSearchProvider.LocalEslrcFile => App.ResourceLoader!.GetString(
-                        "LyricsSearchProviderEslrcFile"
-                    ),
-                    LyricsSearchProvider.LocalTtmlFile => App.ResourceLoader!.GetString(
-                        "LyricsSearchProviderTtmlFile"
-                    ),
+                    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"),
                     _ => "",
                 };
             }
             return "";
         }
 
-        /// <summary>
-        /// The ConvertBack
-        /// </summary>
-        /// <param name="value">The value<see cref="object"/></param>
-        /// <param name="targetType">The targetType<see cref="Type"/></param>
-        /// <param name="parameter">The parameter<see cref="object"/></param>
-        /// <param name="language">The language<see cref="string"/></param>
-        /// <returns>The <see cref="object"/></returns>
         public object ConvertBack(object value, Type targetType, object parameter, string language)
         {
             throw new NotImplementedException();
         }
-
-        #endregion
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MatchedLocalFilesPathToVisibilityConverter.cs

@@ -6,21 +6,8 @@ using Microsoft.UI.Xaml.Data;
 
 namespace BetterLyrics.WinUI3.Converter
 {
-    /// <summary>
-    /// Defines the <see cref="MatchedLocalFilesPathToVisibilityConverter" />
-    /// </summary>
     public partial class MatchedLocalFilesPathToVisibilityConverter : IValueConverter
     {
-        #region Methods
-
-        /// <summary>
-        /// The Convert
-        /// </summary>
-        /// <param name="value">The value<see cref="object"/></param>
-        /// <param name="targetType">The targetType<see cref="Type"/></param>
-        /// <param name="parameter">The parameter<see cref="object"/></param>
-        /// <param name="language">The language<see cref="string"/></param>
-        /// <returns>The <see cref="object"/></returns>
         public object Convert(object value, Type targetType, object parameter, string language)
         {
             if (value is string path)
@@ -37,19 +24,9 @@ namespace BetterLyrics.WinUI3.Converter
             return Visibility.Collapsed;
         }
 
-        /// <summary>
-        /// The ConvertBack
-        /// </summary>
-        /// <param name="value">The value<see cref="object"/></param>
-        /// <param name="targetType">The targetType<see cref="Type"/></param>
-        /// <param name="parameter">The parameter<see cref="object"/></param>
-        /// <param name="language">The language<see cref="string"/></param>
-        /// <returns>The <see cref="object"/></returns>
         public object ConvertBack(object value, Type targetType, object parameter, string language)
         {
             throw new NotImplementedException();
         }
-
-        #endregion
     }
 }

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

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

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

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AutoStartWindowType.cs

@@ -2,23 +2,10 @@
 
 namespace BetterLyrics.WinUI3.Enums
 {
-    #region Enums
-
-    /// <summary>
-    /// Defines the AutoStartWindowType
-    /// </summary>
     public enum AutoStartWindowType
     {
-        /// <summary>
-        /// Defines the StandardMode
-        /// </summary>
         StandardMode,
-
-        /// <summary>
-        /// Defines the DockMode
-        /// </summary>
         DockMode,
+        DesktopMode,
     }
-
-    #endregion
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/BackdropType.cs

@@ -1,45 +1,13 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace BetterLyrics.WinUI3.Enums
 {
-    #region Enums
-
-    /// <summary>
-    /// Defines the BackdropType
-    /// </summary>
     public enum BackdropType
     {
-        /// <summary>
-        /// Defines the None
-        /// </summary>
         None = 0,
-
-        /// <summary>
-        /// Defines the Mica
-        /// </summary>
         Mica = 1,
-
-        /// <summary>
-        /// Defines the MicaAlt
-        /// </summary>
         MicaAlt = 2,
-
-        /// <summary>
-        /// Defines the DesktopAcrylic
-        /// </summary>
         DesktopAcrylic = 3,
-
-        /// <summary>
-        /// Defines the Transparent
-        /// </summary>
         Transparent = 4,
     }
-
-    #endregion
 }

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

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/EasingType.cs

@@ -2,38 +2,19 @@
 
 namespace BetterLyrics.WinUI3.Enums
 {
-    #region Enums
-
-    /// <summary>
-    /// Defines the EasingType
-    /// </summary>
     public enum EasingType
     {
-        /// <summary>
-        /// Defines the EaseInOutQuad
-        /// </summary>
-        EaseInOutQuad,
-
-        /// <summary>
-        /// Defines the EaseInQuad
-        /// </summary>
-        EaseInQuad,
-
-        /// <summary>
-        /// Defines the EaseOutQuad
-        /// </summary>
-        EaseOutQuad,
-
-        /// <summary>
-        /// Defines the Linear
-        /// </summary>
         Linear,
-
-        /// <summary>
-        /// Defines the SmootherStep
-        /// </summary>
-        SmootherStep,
+        SmoothStep,
+        EaseInOutSine,
+        EaseInOutQuad,
+        EaseInOutCubic,
+        EaseInOutQuart,
+        EaseInOutQuint,
+        EaseInOutExpo,
+        EaseInOutCirc,
+        EaseInOutBack,
+        EaseInOutElastic,
+        EaseInOutBounce,
     }
-
-    #endregion
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/Language.cs

@@ -8,43 +8,13 @@ using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Enums
 {
-    #region Enums
-
-    /// <summary>
-    /// Defines the Language
-    /// </summary>
     public enum Language
     {
-        /// <summary>
-        /// Defines the FollowSystem
-        /// </summary>
         FollowSystem,
-
-        /// <summary>
-        /// Defines the English
-        /// </summary>
         English,
-
-        /// <summary>
-        /// Defines the SimplifiedChinese
-        /// </summary>
         SimplifiedChinese,
-
-        /// <summary>
-        /// Defines the TraditionalChinese
-        /// </summary>
         TraditionalChinese,
-
-        /// <summary>
-        /// Defines the Japanese
-        /// </summary>
         Japanese,
-
-        /// <summary>
-        /// Defines the Korean
-        /// </summary>
         Korean,
     }
-
-    #endregion
 }

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

@@ -2,20 +2,10 @@
 
 namespace BetterLyrics.WinUI3.Enums
 {
-    #region Enums
-
-    /// <summary>
-    /// Defines the LineMaskType
-    /// </summary>
     public enum LineRenderingType
     {
-        UntilCurrentChar,
-
-        /// <summary>
-        /// Current char only
-        /// </summary>
-        CurrentCharOnly,
+        CurrentChar,
+        LineStartToCurrentChar,
+        CurrentLine
     }
-
-    #endregion
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LocalSearchTargetProps.cs

@@ -1,30 +1,10 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace BetterLyrics.WinUI3.Enums
 {
-    #region Enums
-
-    /// <summary>
-    /// Defines the LocalSearchTargetProps
-    /// </summary>
     public enum LocalSearchTargetProps
     {
-        /// <summary>
-        /// Defines the LyricsOnly
-        /// </summary>
         LyricsOnly,
-
-        /// <summary>
-        /// Defines the LyricsAndAlbumArt
-        /// </summary>
         LyricsAndAlbumArt,
     }
-
-    #endregion
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsAlignmentType.cs

@@ -1,35 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    #region Enums
-
-    /// <summary>
-    /// Defines the LyricsAlignmentType
-    /// </summary>
-    public enum LyricsAlignmentType
-    {
-        /// <summary>
-        /// Defines the Left
-        /// </summary>
-        Left,
-
-        /// <summary>
-        /// Defines the Center
-        /// </summary>
-        Center,
-
-        /// <summary>
-        /// Defines the Right
-        /// </summary>
-        Right,
-    }
-
-    #endregion
-}

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

@@ -2,33 +2,10 @@
 
 namespace BetterLyrics.WinUI3.Enums
 {
-    #region Enums
-
-    /// <summary>
-    /// Defines the LyricsDisplayType
-    /// </summary>
     public enum LyricsDisplayType
     {
-        /// <summary>
-        /// Defines the AlbumArtOnly
-        /// </summary>
         AlbumArtOnly,
-
-        /// <summary>
-        /// Defines the LyricsOnly
-        /// </summary>
         LyricsOnly,
-
-        /// <summary>
-        /// Defines the SplitView
-        /// </summary>
         SplitView,
-
-        /// <summary>
-        /// Defines the PlaceholderOnly
-        /// </summary>
-        PlaceholderOnly,
     }
-
-    #endregion
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsFontColorType.cs

@@ -1,30 +1,11 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace BetterLyrics.WinUI3.Enums
 {
-    #region Enums
-
-    /// <summary>
-    /// Defines the LyricsFontColorType
-    /// </summary>
     public enum LyricsFontColorType
     {
-        /// <summary>
-        /// Defines the Default
-        /// </summary>
-        Default,
-
-        /// <summary>
-        /// Defines the Dominant
-        /// </summary>
-        Dominant,
+        AdaptiveColored,
+        AdaptiveGrayed,
+        Custom,
     }
-
-    #endregion
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsFontWeight.cs

@@ -1,92 +1,28 @@
 // 2025/6/23 by Zhe Fang
 
-using Microsoft.UI.Text;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Microsoft.UI.Text;
 using Windows.UI.Text;
 
 namespace BetterLyrics.WinUI3.Enums
 {
-    #region Enums
-
-    /// <summary>
-    /// Defines the LyricsFontWeight
-    /// </summary>
     public enum LyricsFontWeight
     {
-        /// <summary>
-        /// Defines the Thin
-        /// </summary>
         Thin,
-
-        /// <summary>
-        /// Defines the ExtraLight
-        /// </summary>
         ExtraLight,
-
-        /// <summary>
-        /// Defines the Light
-        /// </summary>
         Light,
-
-        /// <summary>
-        /// Defines the SemiLight
-        /// </summary>
         SemiLight,
-
-        /// <summary>
-        /// Defines the Normal
-        /// </summary>
         Normal,
-
-        /// <summary>
-        /// Defines the Medium
-        /// </summary>
         Medium,
-
-        /// <summary>
-        /// Defines the SemiBold
-        /// </summary>
         SemiBold,
-
-        /// <summary>
-        /// Defines the Bold
-        /// </summary>
         Bold,
-
-        /// <summary>
-        /// Defines the ExtraBold
-        /// </summary>
         ExtraBold,
-
-        /// <summary>
-        /// Defines the Black
-        /// </summary>
         Black,
-
-        /// <summary>
-        /// Defines the ExtraBlack
-        /// </summary>
         ExtraBlack,
     }
 
-    #endregion
-
-    /// <summary>
-    /// Defines the <see cref="LyricsFontWeightExtensions" />
-    /// </summary>
     public static class LyricsFontWeightExtensions
     {
-        #region Methods
-
-        /// <summary>
-        /// The ToFontWeight
-        /// </summary>
-        /// <param name="weight">The weight<see cref="LyricsFontWeight"/></param>
-        /// <returns>The <see cref="FontWeight"/></returns>
         public static FontWeight ToFontWeight(this LyricsFontWeight weight)
         {
             return weight switch
@@ -102,14 +38,8 @@ namespace BetterLyrics.WinUI3.Enums
                 LyricsFontWeight.ExtraBold => FontWeights.ExtraBold,
                 LyricsFontWeight.Black => FontWeights.Black,
                 LyricsFontWeight.ExtraBlack => FontWeights.ExtraBlack,
-                LyricsFontWeight _ => throw new ArgumentOutOfRangeException(
-                    nameof(weight),
-                    weight,
-                    null
-                ),
+                LyricsFontWeight _ => throw new ArgumentOutOfRangeException(nameof(weight), weight, null),
             };
         }
-
-        #endregion
     }
 }

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

@@ -1,70 +1,51 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace BetterLyrics.WinUI3.Enums
 {
-    #region Enums
-
-    /// <summary>
-    /// Defines the LyricsFormat
-    /// </summary>
     public enum LyricsFormat
     {
-        /// <summary>
-        /// Defines the Lrc
-        /// </summary>
         Lrc,
-
-        /// <summary>
-        /// Defines the Eslrc
-        /// </summary>
         Eslrc,
-
-        /// <summary>
-        /// Defines the Ttml
-        /// </summary>
         Ttml,
         Qrc,
         Krc,
         NotSpecified,
     }
 
-    #endregion
-
-    /// <summary>
-    /// Defines the <see cref="LyricsFormatExtensions" />
-    /// </summary>
     public static class LyricsFormatExtensions
     {
-        #region Methods
-
-        /// <summary>
-        /// The Detect
-        /// </summary>
-        /// <param name="content">The content<see cref="string"/></param>
-        /// <returns>The <see cref="LyricsFormat?"/></returns>
         public static LyricsFormat? DetectFormat(this string content)
         {
-            if (
-                content.StartsWith("<?xml")
-                && System.Text.RegularExpressions.Regex.IsMatch(content, @"<tt(:\w+)?\b")
-            )
+            if (string.IsNullOrWhiteSpace(content))
+                return null;
+
+            // TTML: 检查 <tt ... xmlns="http://www.w3.org/ns/ttml"
+            if (System.Text.RegularExpressions.Regex.IsMatch(
+                    content,
+                    @"<tt\b[^>]*\bxmlns\s*=\s*[""']http://www\.w3\.org/ns/ttml[""']",
+                    System.Text.RegularExpressions.RegexOptions.IgnoreCase))
             {
                 return LyricsFormat.Ttml;
             }
-            // 检测标准LRC和增强型LRC
-            else if (
-                System.Text.RegularExpressions.Regex.IsMatch(content, @"\[\d{1,2}:\d{2}")
-                || System.Text.RegularExpressions.Regex.IsMatch(
-                    content,
-                    @"<\d{1,2}:\d{2}\.\d{2,3}>"
-                )
-            )
+            // KRC: 检测主内容格式 [start,duration]<offset,duration,0>字...
+            else if (System.Text.RegularExpressions.Regex.IsMatch(
+                         content,
+                         @"^\[\d+,\d+\](<\d+,\d+,0>.+)+",
+                         System.Text.RegularExpressions.RegexOptions.Multiline))
+            {
+                return LyricsFormat.Krc;
+            }
+            // QRC: 检测主内容格式 [start,duration]字(offset,duration)
+            else if (System.Text.RegularExpressions.Regex.IsMatch(
+                         content,
+                         @"^\[\d+,\d+\].*?\(\d+,\d+\)",
+                         System.Text.RegularExpressions.RegexOptions.Multiline))
+            {
+                return LyricsFormat.Qrc;
+            }
+            // 标准LRC和增强型LRC
+            else if (System.Text.RegularExpressions.Regex.IsMatch(content, @"\[\d{1,2}:\d{2}") ||
+                     System.Text.RegularExpressions.Regex.IsMatch(content, @"<\d{1,2}:\d{2}\.\d{2,3}>"))
             {
                 return LyricsFormat.Lrc;
             }
@@ -74,11 +55,6 @@ namespace BetterLyrics.WinUI3.Enums
             }
         }
 
-        /// <summary>
-        /// The ToFileExtension
-        /// </summary>
-        /// <param name="format">The format<see cref="LyricsFormat"/></param>
-        /// <returns>The <see cref="string"/></returns>
         public static string ToFileExtension(this LyricsFormat format)
         {
             return format switch
@@ -91,7 +67,5 @@ namespace BetterLyrics.WinUI3.Enums
                 _ => ".*",
             };
         }
-
-        #endregion
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsPlayingState.cs

@@ -1,35 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    #region Enums
-
-    /// <summary>
-    /// Defines the LyricsPlayingState
-    /// </summary>
-    public enum LyricsPlayingState
-    {
-        /// <summary>
-        /// Defines the NotPlayed
-        /// </summary>
-        NotPlayed,
-
-        /// <summary>
-        /// Defines the Playing
-        /// </summary>
-        Playing,
-
-        /// <summary>
-        /// Defines the Played
-        /// </summary>
-        Played,
-    }
-
-    #endregion
-}

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

@@ -4,71 +4,30 @@ using BetterLyrics.WinUI3.Helper;
 
 namespace BetterLyrics.WinUI3.Enums
 {
-    #region Enums
-
-    /// <summary>
-    /// Defines the LyricsSearchProvider
-    /// </summary>
     public enum LyricsSearchProvider
     {
         QQ,
         Kugou,
         Netease,
         LrcLib,
-
         AmllTtmlDb,
-
-        /// <summary>
-        /// Defines the LocalMusicFile
-        /// </summary>
         LocalMusicFile,
-
-        /// <summary>
-        /// Defines the LocalLrcFile
-        /// </summary>
         LocalLrcFile,
-
-        /// <summary>
-        /// Defines the LocalEslrcFile
-        /// </summary>
         LocalEslrcFile,
-
-        /// <summary>
-        /// Defines the LocalTtmlFile
-        /// </summary>
         LocalTtmlFile,
     }
 
     public static class LyricsSearchProviderExtensions
     {
-        /// <summary>
-        /// The IsLocal
-        /// </summary>
-        /// <param name="provider">The provider<see cref="LyricsSearchProvider"/></param>
-        /// <returns>The <see cref="bool"/></returns>
-        public static bool IsLocal(this LyricsSearchProvider provider)
-        {
-            return provider
-                is LyricsSearchProvider.LocalMusicFile
-                    or LyricsSearchProvider.LocalLrcFile
-                    or LyricsSearchProvider.LocalEslrcFile
-                    or LyricsSearchProvider.LocalTtmlFile;
-        }
-
-        public static bool IsRemote(this LyricsSearchProvider provider)
-        {
-            return !provider.IsLocal();
-        }
-
         public static string GetCacheDirectory(this LyricsSearchProvider provider)
         {
             return provider switch
             {
-                LyricsSearchProvider.LrcLib => AppInfo.LrcLibLyricsCacheDirectory,
-                LyricsSearchProvider.QQ => AppInfo.QQLyricsCacheDirectory,
-                LyricsSearchProvider.Netease => AppInfo.NeteaseLyricsCacheDirectory,
-                LyricsSearchProvider.Kugou => AppInfo.KugouLyricsCacheDirectory,
-                LyricsSearchProvider.AmllTtmlDb => AppInfo.AmllTtmlDbLyricsCacheDirectory,
+                LyricsSearchProvider.LrcLib => PathHelper.LrcLibLyricsCacheDirectory,
+                LyricsSearchProvider.QQ => PathHelper.QQLyricsCacheDirectory,
+                LyricsSearchProvider.Netease => PathHelper.NeteaseLyricsCacheDirectory,
+                LyricsSearchProvider.Kugou => PathHelper.KugouLyricsCacheDirectory,
+                LyricsSearchProvider.AmllTtmlDb => PathHelper.AmllTtmlDbLyricsCacheDirectory,
                 _ => throw new System.ArgumentOutOfRangeException(nameof(provider)),
             };
         }
@@ -88,7 +47,19 @@ namespace BetterLyrics.WinUI3.Enums
                 _ => LyricsFormat.NotSpecified,
             };
         }
-    }
 
-    #endregion
+        public static bool IsLocal(this LyricsSearchProvider provider)
+        {
+            return provider
+                is LyricsSearchProvider.LocalMusicFile
+                    or LyricsSearchProvider.LocalLrcFile
+                    or LyricsSearchProvider.LocalEslrcFile
+                    or LyricsSearchProvider.LocalTtmlFile;
+        }
+
+        public static bool IsRemote(this LyricsSearchProvider provider)
+        {
+            return !provider.IsLocal();
+        }
+    }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsStatus.cs

@@ -1,35 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    #region Enums
-
-    /// <summary>
-    /// Defines the LyricsStatus
-    /// </summary>
-    public enum LyricsStatus
-    {
-        /// <summary>
-        /// Defines the NotFound
-        /// </summary>
-        NotFound,
-
-        /// <summary>
-        /// Defines the Found
-        /// </summary>
-        Found,
-
-        /// <summary>
-        /// Defines the Loading
-        /// </summary>
-        Loading,
-    }
-
-    #endregion
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsType.cs

@@ -1,30 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    #region Enums
-
-    /// <summary>
-    /// Defines the LyricsType
-    /// </summary>
-    public enum LyricsType
-    {
-        /// <summary>
-        /// Defines the InAppLyrics
-        /// </summary>
-        InAppLyrics,
-
-        /// <summary>
-        /// Defines the DesktopLyrics
-        /// </summary>
-        DesktopLyrics,
-    }
-
-    #endregion
-}

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

@@ -1,24 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    #region Enums
-
-    /// <summary>
-    /// Defines the MusicSearchMatchMode
-    /// </summary>
-    public enum MusicSearchMatchMode
-    {
-        /// <summary>
-        /// Defines the TitleAndArtist
-        /// </summary>
-        TitleAndArtist,
-
-        /// <summary>
-        /// Defines the TitleArtistAlbumAndDuration
-        /// </summary>
-        TitleArtistAlbumAndDuration,
-    }
-
-    #endregion
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TextAlignmentType.cs

@@ -0,0 +1,28 @@
+// 2025/6/23 by Zhe Fang
+
+using Microsoft.Graphics.Canvas.Text;
+using System;
+
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum TextAlignmentType
+    {
+        Left,
+        Center,
+        Right,
+    }
+
+    public static class LyricsAlignmentTypeExtensions
+    {
+        public static CanvasHorizontalAlignment ToCanvasHorizontalAlignment(this TextAlignmentType alignmentType)
+        {
+            return alignmentType switch
+            {
+                TextAlignmentType.Left => CanvasHorizontalAlignment.Left,
+                TextAlignmentType.Center => CanvasHorizontalAlignment.Center,
+                TextAlignmentType.Right => CanvasHorizontalAlignment.Right,
+                _ => throw new ArgumentOutOfRangeException(nameof(alignmentType), alignmentType, null),
+            };
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TitleBarType.cs

@@ -1,59 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    #region Enums
-
-    /// <summary>
-    /// Defines the TitleBarType
-    /// </summary>
-    public enum TitleBarType
-    {
-        /// <summary>
-        /// Defines the Compact
-        /// </summary>
-        Compact,
-
-        /// <summary>
-        /// Defines the Extended
-        /// </summary>
-        Extended,
-    }
-
-    #endregion
-
-    /// <summary>
-    /// Defines the <see cref="TitleBarTypeExtensions" />
-    /// </summary>
-    public static class TitleBarTypeExtensions
-    {
-        #region Methods
-
-        /// <summary>
-        /// The GetHeight
-        /// </summary>
-        /// <param name="titleBarType">The titleBarType<see cref="TitleBarType"/></param>
-        /// <returns>The <see cref="double"/></returns>
-        public static double GetHeight(this TitleBarType titleBarType)
-        {
-            return titleBarType switch
-            {
-                TitleBarType.Compact => 32.0,
-                TitleBarType.Extended => 48.0,
-                _ => throw new ArgumentOutOfRangeException(
-                    nameof(titleBarType),
-                    titleBarType,
-                    null
-                ),
-            };
-        }
-
-        #endregion
-    }
-}

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

@@ -0,0 +1,10 @@
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum WindowPixelSampleMode
+    {
+        BelowWindow,
+        AboveWindow,
+        WindowArea,
+        WindowEdge,
+    }
+}

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

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/IsPlayingChangedEventArgs.cs

@@ -4,18 +4,8 @@ using System;
 
 namespace BetterLyrics.WinUI3.Events
 {
-    /// <summary>
-    /// Defines the <see cref="IsPlayingChangedEventArgs" />
-    /// </summary>
     public class IsPlayingChangedEventArgs(bool isPlaying) : EventArgs
     {
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets a value indicating whether IsPlaying
-        /// </summary>
         public bool IsPlaying { get; set; } = isPlaying;
-
-        #endregion
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LibChangedEventArgs.cs

@@ -9,45 +9,10 @@ using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Events
 {
-    /// <summary>
-    /// Defines the <see cref="LibChangedEventArgs" />
-    /// </summary>
-    public class LibChangedEventArgs : EventArgs
+    public class LibChangedEventArgs(string folder, string filePath, WatcherChangeTypes changeType) : EventArgs
     {
-        #region Constructors
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LibChangedEventArgs"/> class.
-        /// </summary>
-        /// <param name="folder">The folder<see cref="string"/></param>
-        /// <param name="filePath">The filePath<see cref="string"/></param>
-        /// <param name="changeType">The changeType<see cref="WatcherChangeTypes"/></param>
-        public LibChangedEventArgs(string folder, string filePath, WatcherChangeTypes changeType)
-        {
-            Folder = folder;
-            FilePath = filePath;
-            ChangeType = changeType;
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets the ChangeType
-        /// </summary>
-        public WatcherChangeTypes ChangeType { get; }
-
-        /// <summary>
-        /// Gets the FilePath
-        /// </summary>
-        public string FilePath { get; }
-
-        /// <summary>
-        /// Gets the Folder
-        /// </summary>
-        public string Folder { get; }
-
-        #endregion
+        public WatcherChangeTypes ChangeType { get; } = changeType;
+        public string FilePath { get; } = filePath;
+        public string Folder { get; } = folder;
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs

@@ -0,0 +1,14 @@
+using BetterLyrics.WinUI3.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Events
+{
+    public class MediaSourceProvidersInfoEventArgs(List<MediaSourceProviderInfo> sessionIds):EventArgs
+    {
+        public List<MediaSourceProviderInfo> MediaSourceProviersInfo { get; set; } = sessionIds;
+    }
+}

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

@@ -4,18 +4,8 @@ using System;
 
 namespace BetterLyrics.WinUI3.Events
 {
-    /// <summary>
-    /// Defines the <see cref="PositionChangedEventArgs" />
-    /// </summary>
     public class PositionChangedEventArgs(TimeSpan position) : EventArgs()
     {
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets the Position
-        /// </summary>
         public TimeSpan Position { get; set; } = position;
-
-        #endregion
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/SongInfoChangedEventArgs.cs

@@ -1,26 +1,12 @@
 // 2025/6/23 by Zhe Fang
 
-using BetterLyrics.WinUI3.Models;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using BetterLyrics.WinUI3.Models;
 
 namespace BetterLyrics.WinUI3.Events
 {
-    /// <summary>
-    /// Defines the <see cref="SongInfoChangedEventArgs" />
-    /// </summary>
     public class SongInfoChangedEventArgs(SongInfo? songInfo) : EventArgs
     {
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets the SongInfo
-        /// </summary>
         public SongInfo? SongInfo { get; set; } = songInfo;
-
-        #endregion
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/AnimationHelper.cs

@@ -1,239 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
-using BetterLyrics.WinUI3.Enums;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    /// <summary>
-    /// Defines the <see cref="AnimationHelper" />
-    /// </summary>
-    public class AnimationHelper
-    {
-        #region Constants
-
-        /// <summary>
-        /// Defines the DebounceDefaultDuration
-        /// </summary>
-        public const int DebounceDefaultDuration = 200;
-
-        /// <summary>
-        /// Defines the StackedNotificationsShowingDuration
-        /// </summary>
-        public const int StackedNotificationsShowingDuration = 3900;
-
-        /// <summary>
-        /// Defines the StoryboardDefaultDuration
-        /// </summary>
-        public const int StoryboardDefaultDuration = 200;
-
-        #endregion
-    }
-
-    /// <summary>
-    /// Defines the <see cref="ValueTransition{T}" />
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public class ValueTransition<T>
-        where T : struct
-    {
-        #region Fields
-
-        /// <summary>
-        /// Defines the _currentValue
-        /// </summary>
-        private T _currentValue;
-
-        /// <summary>
-        /// Defines the _durationSeconds
-        /// </summary>
-        private float _durationSeconds;
-
-        /// <summary>
-        /// Defines the _interpolator
-        /// </summary>
-        private Func<T, T, float, T> _interpolator;
-
-        /// <summary>
-        /// Defines the _isTransitioning
-        /// </summary>
-        private bool _isTransitioning;
-
-        /// <summary>
-        /// Defines the _progress
-        /// </summary>
-        private float _progress;
-
-        /// <summary>
-        /// Defines the _startValue
-        /// </summary>
-        private T _startValue;
-
-        /// <summary>
-        /// Defines the _targetValue
-        /// </summary>
-        private T _targetValue;
-
-        private EasingType? _easingType;
-
-        #endregion
-
-        #region Constructors
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ValueTransition{T}"/> class.
-        /// </summary>
-        /// <param name="initialValue">The initialValue<see cref="T"/></param>
-        /// <param name="durationSeconds">The durationSeconds<see cref="float"/></param>
-        /// <param name="interpolator">The interpolator<see cref="Func{T, T, float, T}"/></param>
-        public ValueTransition(
-            T initialValue,
-            float durationSeconds,
-            Func<T, T, float, T>? interpolator = null,
-            EasingType? easingType = null
-        )
-        {
-            _currentValue = initialValue;
-            _startValue = initialValue;
-            _targetValue = initialValue;
-            _durationSeconds = durationSeconds;
-            _progress = 1f;
-            _isTransitioning = false;
-
-            if (interpolator != null)
-            {
-                _interpolator = interpolator;
-                _easingType = null;
-            }
-            else if (easingType.HasValue)
-            {
-                _easingType = easingType;
-                _interpolator = GetInterpolatorByEasingType(easingType.Value);
-            }
-            else
-            {
-                _interpolator = GetInterpolatorByEasingType(EasingType.Linear);
-                _easingType = EasingType.Linear;
-            }
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets a value indicating whether IsTransitioning
-        /// </summary>
-        public bool IsTransitioning => _isTransitioning;
-
-        /// <summary>
-        /// Gets the Value
-        /// </summary>
-        public T Value => _currentValue;
-
-        #endregion
-
-        #region Methods
-
-        private Func<T, T, float, T> GetInterpolatorByEasingType(EasingType type)
-        {
-            // 这里只以float为例，实际可根据T类型扩展
-            if (typeof(T) == typeof(float))
-            {
-                return (start, end, progress) =>
-                {
-                    float s = (float)(object)start;
-                    float e = (float)(object)end;
-                    float t = progress;
-                    switch (type)
-                    {
-                        case EasingType.EaseInOutQuad:
-                            t = EasingHelper.EaseInOutQuad(t);
-                            break;
-                        case EasingType.EaseInQuad:
-                            t = EasingHelper.EaseInQuad(t);
-                            break;
-                        case EasingType.EaseOutQuad:
-                            t = EasingHelper.EaseOutQuad(t);
-                            break;
-                        case EasingType.Linear:
-                            t = EasingHelper.Linear(t);
-                            break;
-                        case EasingType.SmootherStep:
-                            t = EasingHelper.SmootherStep(t);
-                            break;
-                        default:
-                            break;
-                    }
-                    return (T)(object)(s + (e - s) * t);
-                };
-            }
-            throw new NotSupportedException("当前类型未实现默认缓动插值");
-        }
-
-        /// <summary>
-        /// The Reset
-        /// </summary>
-        /// <param name="value">The value<see cref="T"/></param>
-        public void Reset(T value)
-        {
-            _currentValue = value;
-            _startValue = value;
-            _targetValue = value;
-            _progress = 0f;
-            _isTransitioning = false;
-        }
-
-        /// <summary>
-        /// The StartTransition
-        /// </summary>
-        /// <param name="targetValue">The targetValue<see cref="T"/></param>
-        public void StartTransition(T targetValue)
-        {
-            if (!targetValue.Equals(_currentValue))
-            {
-                _startValue = _currentValue;
-                _targetValue = targetValue;
-                _progress = 0f;
-                _isTransitioning = true;
-            }
-        }
-
-        /// <summary>
-        /// 立即跳转到指定值，无动画
-        /// </summary>
-        /// <param name="value">目标值</param>
-        public void JumpTo(T value)
-        {
-            _currentValue = value;
-            _startValue = value;
-            _targetValue = value;
-            _progress = 1f;
-            _isTransitioning = false;
-        }
-
-        /// <summary>
-        /// The Update
-        /// </summary>
-        /// <param name="elapsedTime">The elapsedTime<see cref="TimeSpan"/></param>
-        public void Update(TimeSpan elapsedTime)
-        {
-            if (!_isTransitioning)
-                return;
-
-            _progress += (float)elapsedTime.TotalSeconds / _durationSeconds;
-            if (_progress >= 1f)
-            {
-                _progress = 1f;
-                _currentValue = _targetValue;
-                _isTransitioning = false;
-            }
-            else
-            {
-                _currentValue = _interpolator(_startValue, _targetValue, _progress);
-            }
-        }
-
-        #endregion
-    }
-}

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

@@ -1,131 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    using System.IO;
-    using Windows.ApplicationModel;
-    using Windows.Storage;
-
-    /// <summary>
-    /// Defines the <see cref="AppInfo" />
-    /// </summary>
-    public static class AppInfo
-    {
-        #region Constants
-
-        /// <summary>
-        /// Defines the AppAuthor
-        /// </summary>
-        public const string AppAuthor = "Zhe Fang";
-
-        /// <summary>
-        /// Defines the AppDisplayName
-        /// </summary>
-        public const string AppDisplayName = "Better Lyrics";
-
-        // App Metadata
-
-        /// <summary>
-        /// Defines the AppName
-        /// </summary>
-        public const string AppName = "BetterLyrics";
-
-        /// <summary>
-        /// Defines the GithubUrl
-        /// </summary>
-        public const string GithubUrl = "https://github.com/jayfunc/BetterLyrics";
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets the AppVersion
-        /// </summary>
-        public static string AppVersion
-        {
-            get
-            {
-                var version = Package.Current.Id.Version;
-                return $"{version.Major}.{version.Minor}.{version.Build}.{version.Revision}";
-            }
-        }
-
-        /// <summary>
-        /// Gets the AssetsFolder
-        /// </summary>
-        public static string AssetsFolder => Path.Combine(Package.Current.InstalledPath, "Assets");
-
-        /// <summary>
-        /// Gets the CacheFolder
-        /// </summary>
-        public static string CacheFolder => ApplicationData.Current.LocalCacheFolder.Path;
-
-        // Environment Info
-
-        // Data Files
-
-        /// <summary>
-        /// Gets the LogDirectory
-        /// </summary>
-        public static string LogDirectory => Path.Combine(CacheFolder, "logs");
-
-        /// <summary>
-        /// Gets the LogFilePattern
-        /// </summary>
-        public static string LogFilePattern => Path.Combine(LogDirectory, "log-.txt");
-
-        /// <summary>
-        /// Gets the OnlineLyricsCacheDirectory
-        /// </summary>
-        public static string LrcLibLyricsCacheDirectory =>
-            Path.Combine(CacheFolder, "lrclib-lyrics");
-
-        public static string AmllTtmlDbLyricsCacheDirectory =>
-            Path.Combine(CacheFolder, "amll-ttml-db-lyrics");
-        public static string QQLyricsCacheDirectory => Path.Combine(CacheFolder, "qq-lyrics");
-        public static string KugouLyricsCacheDirectory => Path.Combine(CacheFolder, "kugou-lyrics");
-        public static string NeteaseLyricsCacheDirectory =>
-            Path.Combine(CacheFolder, "netease-lyrics");
-
-        public static string AmllTtmlDbIndexPath =>
-            Path.Combine(CacheFolder, "amll-ttml-db-index.json");
-
-        /// <summary>
-        /// Gets the TestMusicPath
-        /// </summary>
-        public static string TestMusicPath => Path.Combine(AssetsFolder, TestMusicFileName);
-
-        // Base Folders
-
-        /// <summary>
-        /// Gets the LocalFolder
-        /// </summary>
-        private static string LocalFolder => ApplicationData.Current.LocalFolder.Path;
-
-        /// <summary>
-        /// Gets the TestMusicFileName
-        /// </summary>
-        private static string TestMusicFileName => "AI - 甜度爆表.mp3";
-
-        #endregion
-
-        #region Methods
-
-        /// <summary>
-        /// The EnsureDirectories
-        /// </summary>
-        public static void EnsureDirectories()
-        {
-            Directory.CreateDirectory(LocalFolder);
-            Directory.CreateDirectory(LogDirectory);
-            Directory.CreateDirectory(LrcLibLyricsCacheDirectory);
-            Directory.CreateDirectory(QQLyricsCacheDirectory);
-            Directory.CreateDirectory(KugouLyricsCacheDirectory);
-            Directory.CreateDirectory(NeteaseLyricsCacheDirectory);
-            Directory.CreateDirectory(AmllTtmlDbLyricsCacheDirectory);
-        }
-
-        #endregion
-    }
-}

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

@@ -1,34 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    /// <summary>
-    /// Defines the <see cref="CollectionHelper" />
-    /// </summary>
-    public static class CollectionHelper
-    {
-        #region Methods
-
-        /// <summary>
-        /// The SafeGet
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="list">The list<see cref="IList{T}"/></param>
-        /// <param name="index">The index<see cref="int"/></param>
-        /// <returns>The <see cref="T?"/></returns>
-        public static T? SafeGet<T>(this IList<T> list, int index)
-        {
-            if (list == null || index < 0 || index >= list.Count)
-                return default;
-            return list[index];
-        }
-
-        #endregion
-    }
-}

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

@@ -1,28 +1,58 @@
 // 2025/6/23 by Zhe Fang
 
+using BetterLyrics.WinUI3.Enums;
+using Microsoft.UI;
+using Microsoft.UI.Xaml;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
+using Vanara.PInvoke;
 using Windows.UI;
 
+using Color = Windows.UI.Color;
+
 namespace BetterLyrics.WinUI3.Helper
 {
-    /// <summary>
-    /// Defines the <see cref="ColorHelper" />
-    /// </summary>
     public static class ColorHelper
     {
-        #region Methods
+        public static ElementTheme GetElementThemeFromBackgroundColor(Color backgroundColor)
+        {
+            // 计算亮度（YIQ公式）
+            double yiq =
+                ((backgroundColor.R * 299) + (backgroundColor.G * 587) + (backgroundColor.B * 114))
+                / 1000.0;
+            return yiq >= 128 ? ElementTheme.Light : ElementTheme.Dark;
+        }
 
-        /// <summary>
-        /// The GetInterpolatedColor
-        /// </summary>
-        /// <param name="progress">The progress<see cref="float"/></param>
-        /// <param name="startColor">The startColor<see cref="Color"/></param>
-        /// <param name="targetColor">The targetColor<see cref="Color"/></param>
-        /// <returns>The <see cref="Color"/></returns>
-        public static Color GetInterpolatedColor(
-            float progress,
-            Color startColor,
-            Color targetColor
-        )
+        public static Color GetForegroundColor(Color background)
+        {
+            // 转为 HSL
+            var hsl = CommunityToolkit.WinUI.Helpers.ColorHelper.ToHsl(background);
+            double h = hsl.H;
+            double s = hsl.S;
+            double l = hsl.L;
+
+            // 目标亮度与背景错开，但不极端
+            double targetL;
+            if (l >= 0.7)
+                targetL = 0.35; // 背景很亮，前景适中偏暗
+            else if (l <= 0.3)
+                targetL = 0.75; // 背景很暗，前景适中偏亮
+            else
+                targetL = l > 0.5 ? l - 0.35 : l + 0.35; // 其余情况适度错开
+
+            // 保持色相，适当提升饱和度
+            double targetS = Math.Min(1.0, s + 0.2);
+
+            // 转回 Color
+            var fg = CommunityToolkit.WinUI.Helpers.ColorHelper.FromHsl(h, targetS, targetL);
+
+            // 保持不透明
+            return Color.FromArgb(255, fg.R, fg.G, fg.B);
+        }
+
+        public static Color GetInterpolatedColor(float progress, Color startColor, Color targetColor)
         {
             byte Lerp(byte a, byte b) => (byte)(a + (progress * (b - a)));
             return Color.FromArgb(
@@ -33,16 +63,189 @@ namespace BetterLyrics.WinUI3.Helper
             );
         }
 
-        /// <summary>
-        /// The ToWindowsUIColor
-        /// </summary>
-        /// <param name="color">The color<see cref="System.Drawing.Color"/></param>
-        /// <returns>The <see cref="Windows.UI.Color"/></returns>
-        public static Windows.UI.Color ToWindowsUIColor(this System.Drawing.Color color)
+        public static Color ToColor(this int argb)
         {
-            return Windows.UI.Color.FromArgb(color.A, color.R, color.G, color.B);
+            byte a = (byte)(argb >> 24);
+            byte r = (byte)(argb >> 16);
+            byte g = (byte)(argb >> 8);
+            byte b = (byte)argb;
+
+            // 还原非预乘分量
+            if (a == 0)
+                return Color.FromArgb(0, 0, 0, 0);
+
+            // 预乘解码
+            // 这里 a+1 是编码时的分母
+            int ap1 = a + 1;
+            r = (byte)Math.Min(255, (r * 255 + (ap1 / 2)) / ap1);
+            g = (byte)Math.Min(255, (g * 255 + (ap1 / 2)) / ap1);
+            b = (byte)Math.Min(255, (b * 255 + (ap1 / 2)) / ap1);
+
+            return Color.FromArgb(a, r, g, b);
+        }
+
+        public static Color ToColor(this System.Drawing.Color color)
+        {
+            return Color.FromArgb(color.A, color.R, color.G, color.B);
+        }
+
+        public static Color WithAlpha(this Color color, byte alpha)
+        {
+            return Color.FromArgb(alpha, color.R, color.G, color.B);
+        }
+
+        public static Color WithBrightness(this Color color, double brightness)
+        {
+            // 确保亮度因子在合理范围内
+            brightness = Math.Max(0, Math.Min(1, brightness));
+
+            var hsl = CommunityToolkit.WinUI.Helpers.ColorHelper.ToHsl(color);
+            double h = hsl.H;
+            double s = hsl.S;
+
+            return CommunityToolkit.WinUI.Helpers.ColorHelper.FromHsl(h, s, brightness);
+        }
+
+        public static System.Drawing.Color GetAccentColor(IntPtr myHwnd, WindowPixelSampleMode mode)
+        {
+            if (!User32.GetWindowRect(myHwnd, out RECT myRect)) return System.Drawing.Color.Transparent;
+
+            switch (mode)
+            {
+                case WindowPixelSampleMode.BelowWindow:
+                    {
+                        int screenWidth = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN);
+                        int sampleHeight = 1;
+                        int sampleY = myRect.Bottom + 1;
+                        return GetAverageColorFromScreenRegion(0, sampleY, screenWidth, sampleHeight);
+                    }
+                case WindowPixelSampleMode.AboveWindow:
+                    {
+                        int screenWidth = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN);
+                        int sampleHeight = 1;
+                        int sampleY = myRect.Top - 1;
+                        return GetAverageColorFromScreenRegion(0, sampleY, screenWidth, sampleHeight);
+                    }
+                case WindowPixelSampleMode.WindowArea:
+                    {
+                        int width = myRect.Right - myRect.Left;
+                        int height = myRect.Bottom - myRect.Top;
+                        if (width <= 0 || height <= 0)
+                            return System.Drawing.Color.Transparent;
+                        // 采集窗口区域的平均色
+                        return GetAverageColorFromScreenRegion(myRect.Left, myRect.Top, width, height);
+                    }
+                case WindowPixelSampleMode.WindowEdge:
+                    {
+                        int width = myRect.Right - myRect.Left;
+                        int height = myRect.Bottom - myRect.Top;
+                        if (width <= 0 || height <= 0)
+                            return System.Drawing.Color.Transparent;
+
+                        var edgeThickness = new Thickness(36, 0, 36, 0);
+                        List<System.Drawing.Color> edgeColors = [];
+
+                        // Top edge
+                        if (edgeThickness.Top > 0 && edgeThickness.Top < height)
+                            edgeColors.Add(
+                                GetAverageColorFromScreenRegion(
+                                    myRect.Left,
+                                    myRect.Top,
+                                    width,
+                                    (int)edgeThickness.Top
+                                )
+                            );
+                        // Bottom edge
+                        if (edgeThickness.Bottom > 0 && edgeThickness.Bottom < height)
+                            edgeColors.Add(
+                                GetAverageColorFromScreenRegion(
+                                    myRect.Left,
+                                    myRect.Bottom - (int)edgeThickness.Bottom,
+                                    width,
+                                    (int)edgeThickness.Bottom
+                                )
+                            );
+                        // Left edge
+                        if (edgeThickness.Left > 0 && edgeThickness.Left < width)
+                            edgeColors.Add(
+                                GetAverageColorFromScreenRegion(
+                                    myRect.Left,
+                                    myRect.Top + (int)edgeThickness.Top,
+                                    (int)edgeThickness.Left,
+                                    height - (int)edgeThickness.Top - (int)edgeThickness.Bottom
+                                )
+                            );
+                        // Right edge
+                        if (edgeThickness.Right > 0 && edgeThickness.Right < width)
+                            edgeColors.Add(
+                                GetAverageColorFromScreenRegion(
+                                    myRect.Right - (int)edgeThickness.Right,
+                                    myRect.Top + (int)edgeThickness.Top,
+                                    (int)edgeThickness.Right,
+                                    height - (int)edgeThickness.Top - (int)edgeThickness.Bottom
+                                )
+                            );
+
+                        // 合并四边平均色
+                        if (edgeColors.Count == 0)
+                            return System.Drawing.Color.Transparent;
+                        long r = 0,
+                            g = 0,
+                            b = 0;
+                        foreach (var c in edgeColors)
+                        {
+                            r += c.R;
+                            g += c.G;
+                            b += c.B;
+                        }
+                        return System.Drawing.Color.FromArgb(
+                            255,
+                            (int)(r / edgeColors.Count),
+                            (int)(g / edgeColors.Count),
+                            (int)(b / edgeColors.Count)
+                        );
+                    }
+                default:
+                    return System.Drawing.Color.Transparent;
+            }
+        }
+
+        private static System.Drawing.Color GetAverageColorFromScreenRegion(int x, int y, int width, int height)
+        {
+            using Bitmap bmp = new(width, height, PixelFormat.Format32bppArgb);
+            using Graphics gDest = Graphics.FromImage(bmp);
+
+            IntPtr hdcDest = gDest.GetHdc();
+            IntPtr hdcSrc = (nint)User32.GetDC(IntPtr.Zero); // Entire screen
+
+            Gdi32.BitBlt(hdcDest, 0, 0, width, height, hdcSrc, x, y, Gdi32.RasterOperationMode.SRCCOPY);
+
+            gDest.ReleaseHdc(hdcDest);
+            User32.ReleaseDC(IntPtr.Zero, hdcSrc);
+
+            return ComputeAverageColor(bmp);
+        }
+
+        private static System.Drawing.Color ComputeAverageColor(Bitmap bmp)
+        {
+            long r = 0, g = 0, b = 0;
+            int count = 0;
+
+            for (int y = 0; y < bmp.Height; y++)
+            {
+                for (int x = 0; x < bmp.Width; x++)
+                {
+                    System.Drawing.Color pixel = bmp.GetPixel(x, y);
+                    r += pixel.R;
+                    g += pixel.G;
+                    b += pixel.B;
+                    count++;
+                }
+            }
+
+            if (count == 0) return System.Drawing.Color.Transparent;
+            return System.Drawing.Color.FromArgb((int)(r / count), (int)(g / count), (int)(b / count));
         }
 
-        #endregion
     }
 }

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

@@ -1,7 +1,14 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Services;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.UI.Windowing;
+using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
 using System.Runtime.InteropServices;
-using Microsoft.UI.Xaml;
+using Vanara.PInvoke;
 using WinRT.Interop;
 using WinUIEx;
 
@@ -9,65 +16,14 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public static class DesktopModeHelper
     {
-        private static readonly Dictionary<IntPtr, WindowStyle> _originalWindowStyles = [];
-        private static readonly Dictionary<IntPtr, bool> _clickThroughStates = [];
+        private static readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+
         private static readonly Dictionary<IntPtr, bool> _originalTopmostStates = [];
-        private static readonly Dictionary<
-            IntPtr,
-            (double X, double Y, double Width, double Height)
-        > _originalWindowBounds = [];
+        private static readonly Dictionary<IntPtr, (double X, double Y, double Width, double Height)> _originalWindowBounds = [];
+        private static readonly Dictionary<IntPtr, WindowStyle> _originalWindowStyles = [];
 
-        // <20><><EFBFBD>໯<EFBFBD><E0BBAF><EFBFBD><EFBFBD>
         private delegate nint WndProcDelegate(nint hWnd, uint msg, nint wParam, nint lParam);
 
-        public static void Enable(Window window)
-        {
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-
-            // <20><>¼ԭʼ<D4AD><CABC><EFBFBD><EFBFBD>λ<EFBFBD>úʹ<C3BA>С
-            var windowManager = WindowManager.Get(window);
-            if (!_originalWindowBounds.ContainsKey(hwnd))
-            {
-                _originalWindowBounds[hwnd] = (
-                    windowManager.AppWindow.Position.X,
-                    windowManager.AppWindow.Position.Y,
-                    windowManager.Width,
-                    windowManager.Height
-                );
-            }
-
-            // <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD>Ļ<EFBFBD><C4BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-            var displayArea = Microsoft.UI.Windowing.DisplayArea.GetFromWindowId(
-                windowManager.AppWindow.Id,
-                Microsoft.UI.Windowing.DisplayAreaFallback.Primary
-            );
-            var workArea = displayArea.WorkArea;
-
-            // <20><><EFBFBD><EFBFBD>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD><EFBFBD>ߺ<EFBFBD>λ<EFBFBD><CEBB>
-            int targetWidth = workArea.Width / 3;
-            int targetHeight = workArea.Height / 4;
-            int targetX = workArea.X + (workArea.Width - targetWidth) / 2; // <20><><EFBFBD><EFBFBD>
-            int targetY = workArea.Y + workArea.Height - targetHeight - 64;
-
-            // <20><><EFBFBD>ô<EFBFBD><C3B4>ڴ<EFBFBD>С<EFBFBD><D0A1>λ<EFBFBD><CEBB>
-            windowManager.AppWindow.MoveAndResize(
-                new Windows.Graphics.RectInt32(targetX, targetY, targetWidth, targetHeight)
-            );
-
-            // <20><><EFBFBD><EFBFBD>ԭ<EFBFBD><D4AD>ʽ
-            if (!_originalWindowStyles.ContainsKey(hwnd))
-                _originalWindowStyles[hwnd] = window.GetWindowStyle();
-
-            // <20><><EFBFBD><EFBFBD>ԭTopMost״̬
-            if (!_originalTopmostStates.ContainsKey(hwnd))
-                _originalTopmostStates[hwnd] = window.GetIsAlwaysOnTop();
-
-            // <20><><EFBFBD>ô<EFBFBD><C3B4><EFBFBD><EFBFBD>ö<EFBFBD>
-            window.SetIsAlwaysOnTop(true);
-
-            window.SetIsShownInSwitchers(false);
-        }
-
         public static void Disable(Window window)
         {
             IntPtr hwnd = WindowNative.GetWindowHandle(window);
@@ -80,10 +36,9 @@ namespace BetterLyrics.WinUI3.Helper
             }
 
             // <20>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD>úʹ<C3BA>С
-            var windowManager = WindowManager.Get(window);
             if (_originalWindowBounds.TryGetValue(hwnd, out var bounds))
             {
-                windowManager.AppWindow.MoveAndResize(
+                window.AppWindow.MoveAndResize(
                     new Windows.Graphics.RectInt32(
                         (int)bounds.X,
                         (int)bounds.Y,
@@ -94,72 +49,69 @@ namespace BetterLyrics.WinUI3.Helper
                 _originalWindowBounds.Remove(hwnd);
             }
 
-            // <20>ָ<EFBFBD><D6B8><EFBFBD>ʽ
-            if (_originalWindowStyles.TryGetValue(hwnd, out var style))
-            {
-                window.SetWindowStyle(style);
-                _originalWindowStyles.Remove(hwnd);
-            }
-
             window.SetIsShownInSwitchers(true);
         }
 
-        public static void Lock(Window window)
+        public static void Enable(Window window)
         {
             IntPtr hwnd = WindowNative.GetWindowHandle(window);
 
-            // <20><><EFBFBD><EFBFBD><EFBFBD>ޱ߿<EFBFBD><EFBFBD><EFBFBD>͸<EFBFBD><EFBFBD>
-            window.SetWindowStyle(WindowStyle.Popup | WindowStyle.Visible);
-            window.ExtendsContentIntoTitleBar = false;
-
-            SetClickThrough(window, true);
-        }
-
-        public static void Unlock(Window window)
-        {
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-
-            // <20>ָ<EFBFBD><D6B8><EFBFBD>ʽ<EFBFBD><CABD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƴ<EFBFBD><C6B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ<EFBFBD><CABD>ֻ<EFBFBD><D6BB><EFBFBD><EFBFBD> Disable ʱ<><CAB1><EFBFBD>Ƴ<EFBFBD><C6B3><EFBFBD>
-            if (_originalWindowStyles.TryGetValue(hwnd, out var style))
+            // <20><>¼ԭʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD>úʹ<EFBFBD>С
+            if (!_originalWindowBounds.ContainsKey(hwnd))
             {
-                window.SetWindowStyle(style);
+                _originalWindowBounds[hwnd] = (
+                    window.AppWindow.Position.X,
+                    window.AppWindow.Position.Y,
+                    window.AppWindow.Size.Width,
+                    window.AppWindow.Size.Height
+                );
             }
-            window.ExtendsContentIntoTitleBar = true;
 
-            SetClickThrough(window, false);
+            // <20>Ӵ洢<D3B4><E6B4A2><EFBFBD><EFBFBD>ȡĿ<C8A1><C4BF><EFBFBD><EFBFBD><EFBFBD>ߺ<EFBFBD>λ<EFBFBD><CEBB>
+            int targetWidth = _settingsService.DesktopWindowWidth;
+            int targetHeight = _settingsService.DesktopWindowHeight;
+            int targetX = _settingsService.DesktopWindowLeft;
+            int targetY = _settingsService.DesktopWindowTop;
+
+            // <20><><EFBFBD>ô<EFBFBD><C3B4>ڴ<EFBFBD>С<EFBFBD><D0A1>λ<EFBFBD><CEBB>
+            window.AppWindow.MoveAndResize(
+                new Windows.Graphics.RectInt32(targetX, targetY, targetWidth, targetHeight)
+            );
+
+            // <20><><EFBFBD><EFBFBD>ԭTopMost״̬
+            if (!_originalTopmostStates.ContainsKey(hwnd))
+                _originalTopmostStates[hwnd] = window.GetIsAlwaysOnTop();
+
+            // <20><><EFBFBD>ô<EFBFBD><C3B4><EFBFBD><EFBFBD>ö<EFBFBD>
+            window.SetIsAlwaysOnTop(true);
+
+            window.SetIsShownInSwitchers(false);
         }
 
-        /// <summary>
-        /// <20>л<EFBFBD><D0BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͸״̬
-        /// </summary>
         public static void SetClickThrough(Window window, bool enable)
         {
             IntPtr hwnd = WindowNative.GetWindowHandle(window);
-            int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
+            int exStyle = User32.GetWindowLong(hwnd, User32.WindowLongFlags.GWL_EXSTYLE);
+
             if (enable)
             {
-                SetWindowLong(hwnd, GWL_EXSTYLE, exStyle | WS_EX_TRANSPARENT | WS_EX_LAYERED);
-                _clickThroughStates[hwnd] = true;
+                // <20><><EFBFBD><EFBFBD>ԭ<EFBFBD><D4AD>ʽ
+                if (!_originalWindowStyles.ContainsKey(hwnd))
+                    _originalWindowStyles[hwnd] = window.GetWindowStyle();
+
+                window.ToggleWindowStyle(true, WindowStyle.Popup | WindowStyle.Visible);
+                User32.SetWindowLong(hwnd, User32.WindowLongFlags.GWL_EXSTYLE, exStyle | (int)User32.WindowStylesEx.WS_EX_TRANSPARENT | (int)User32.WindowStylesEx.WS_EX_LAYERED);
             }
             else
             {
-                SetWindowLong(hwnd, GWL_EXSTYLE, exStyle & ~WS_EX_TRANSPARENT);
-                _clickThroughStates[hwnd] = false;
+                User32.SetWindowLong(hwnd, User32.WindowLongFlags.GWL_EXSTYLE, exStyle & ~(int)User32.WindowStylesEx.WS_EX_TRANSPARENT);
+                // <20>ָ<EFBFBD><D6B8><EFBFBD>ʽ
+                if (_originalWindowStyles.TryGetValue(hwnd, out var style))
+                {
+                    window.SetWindowStyle(style);
+                    _originalWindowStyles.Remove(hwnd);
+                }
             }
         }
-
-        #region Win32
-
-        private const int GWL_EXSTYLE = -20;
-        private const int WS_EX_TRANSPARENT = 0x00000020;
-        private const int WS_EX_LAYERED = 0x00080000;
-
-        [DllImport("user32.dll", SetLastError = true)]
-        private static extern int GetWindowLong(IntPtr hWnd, int nIndex);
-
-        [DllImport("user32.dll", SetLastError = true)]
-        private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
-
-        #endregion
     }
 }

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

@@ -1,11 +1,14 @@
-using System;
+using BetterLyrics.WinUI3.Enums;
+using CommunityToolkit.WinUI;
+using Microsoft.UI.Xaml;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.UI.Xaml;
+using Vanara.PInvoke;
 using WinRT.Interop;
 using WinUIEx;
 
@@ -14,43 +17,45 @@ namespace BetterLyrics.WinUI3.Helper
     public static class DockModeHelper
     {
         private static readonly HashSet<IntPtr> _registered = [];
-
         private static readonly Dictionary<IntPtr, RECT> _originalPositions = [];
-
         private static readonly Dictionary<IntPtr, WindowStyle> _originalWindowStyle = [];
 
         public static void Disable(Window window)
         {
+            IntPtr hwnd = WindowNative.GetWindowHandle(window);
+
+            if (!_registered.Contains(hwnd)) return;
+
             window.SetIsShownInSwitchers(true);
             window.ExtendsContentIntoTitleBar = true;
             window.SetIsAlwaysOnTop(false);
 
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
+            UnregisterAppBar(hwnd);
 
             window.SetWindowStyle(_originalWindowStyle[hwnd]);
             _originalWindowStyle.Remove(hwnd);
 
+            window.ExtendsContentIntoTitleBar = true;
+
             if (_originalPositions.TryGetValue(hwnd, out var rect))
             {
-                SetWindowPos(
+                User32.SetWindowPos(
                     hwnd,
                     IntPtr.Zero,
-                    rect.left,
-                    rect.top,
-                    rect.right - rect.left,
-                    rect.bottom - rect.top,
-                    SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_SHOWWINDOW
+                    rect.Left,
+                    rect.Top,
+                    rect.Right - rect.Left,
+                    rect.Bottom - rect.Top,
+                    User32.SetWindowPosFlags.SWP_SHOWWINDOW
                 );
                 _originalPositions.Remove(hwnd);
             }
-
-            UnregisterAppBar(hwnd);
         }
 
-        public static void Enable(Window window, int appBarHeight)
+        public static void Enable(Window window, int appBarHeight, DockPlacement dockPlacement)
         {
             window.SetIsShownInSwitchers(false);
-            window.ExtendsContentIntoTitleBar = false;
+            //window.ExtendsContentIntoTitleBar = false;
             window.SetIsAlwaysOnTop(true);
 
             IntPtr hwnd = WindowNative.GetWindowHandle(window);
@@ -59,84 +64,62 @@ namespace BetterLyrics.WinUI3.Helper
             {
                 _originalWindowStyle[hwnd] = window.GetWindowStyle();
             }
-            window.SetWindowStyle(WindowStyle.Popup | WindowStyle.Visible);
 
             if (!_originalPositions.ContainsKey(hwnd))
             {
-                if (GetWindowRect(hwnd, out var rect))
+                if (User32.GetWindowRect(hwnd, out var rect))
                 {
                     _originalPositions[hwnd] = rect;
                 }
             }
 
-            RegisterAppBar(hwnd, appBarHeight);
+            RegisterAppBar(hwnd, appBarHeight, dockPlacement);
 
-            int screenWidth = GetSystemMetrics(SM_CXSCREEN);
-            int screenHeight = GetSystemMetrics(SM_CYSCREEN);
-            SetWindowPos(
+            int screenWidth = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN);
+            int screenHeight = User32.GetSystemMetrics(User32.SystemMetric.SM_CYSCREEN);
+            int y = dockPlacement == DockPlacement.Top ? 0 : screenHeight - appBarHeight;
+
+            User32.SetWindowPos(
                 hwnd,
                 IntPtr.Zero,
                 0,
-                0,
+                y,
                 screenWidth,
                 appBarHeight,
-                SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_SHOWWINDOW
+                User32.SetWindowPosFlags.SWP_HIDEWINDOW
             );
+            window.ExtendsContentIntoTitleBar = false;
+            window.ToggleWindowStyle(true, WindowStyle.Popup);
+            window.Show();
         }
 
-        [DllImport("user32.dll", SetLastError = true)]
-        private static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
-
-        #region AppBar registration
-        private const uint ABM_NEW = 0x00000000;
-        private const uint ABM_REMOVE = 0x00000001;
-        private const uint ABM_SETPOS = 0x00000003;
-        private const int ABE_TOP = 1;
-
-        [StructLayout(LayoutKind.Sequential)]
-        private struct APPBARDATA
+        private static void RegisterAppBar(IntPtr hwnd, int height, DockPlacement dockPlacement)
         {
-            public int cbSize;
-            public IntPtr hWnd;
-            public uint uCallbackMessage;
-            public uint uEdge;
-            public RECT rc;
-            public int lParam;
-        }
+            if (_registered.Contains(hwnd)) return;
 
-        [StructLayout(LayoutKind.Sequential)]
-        private struct RECT
-        {
-            public int left,
-                top,
-                right,
-                bottom;
-        }
+            var uEdge = dockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
+            int screenHeight = User32.GetSystemMetrics(User32.SystemMetric.SM_CYSCREEN);
+            int top = dockPlacement == DockPlacement.Top ? 0 : screenHeight - height;
+            int bottom = dockPlacement == DockPlacement.Top ? height : screenHeight;
 
-        [DllImport("shell32.dll", SetLastError = true)]
-        private static extern uint SHAppBarMessage(uint dwMessage, ref APPBARDATA pData);
-
-        private static void RegisterAppBar(IntPtr hwnd, int height)
-        {
-            if (_registered.Contains(hwnd))
-                return;
-
-            APPBARDATA abd = new()
+            Shell32.APPBARDATA abd = new()
             {
-                cbSize = Marshal.SizeOf<APPBARDATA>(),
+                cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
                 hWnd = hwnd,
-                uEdge = ABE_TOP,
+                uEdge = uEdge,
                 rc = new RECT
                 {
-                    left = 0,
-                    top = 0,
-                    right = GetSystemMetrics(SM_CXSCREEN),
-                    bottom = height,
+                    Left = 0,
+                    Top = top,
+                    Right = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN),
+                    Bottom = bottom,
                 },
             };
 
-            SHAppBarMessage(ABM_NEW, ref abd);
-            SHAppBarMessage(ABM_SETPOS, ref abd);
+            // Ref: https://github.com/TwilightLemon/AppBarTest/blob/master/AppBarCreator.cs
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_NEW, ref abd);
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_QUERYPOS, ref abd);
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
 
             _registered.Add(hwnd);
         }
@@ -146,73 +129,63 @@ namespace BetterLyrics.WinUI3.Helper
             if (!_registered.Contains(hwnd))
                 return;
 
-            APPBARDATA abd = new() { cbSize = Marshal.SizeOf<APPBARDATA>(), hWnd = hwnd };
-
-            SHAppBarMessage(ABM_REMOVE, ref abd);
-            _registered.Remove(hwnd);
-        }
-        #endregion
-
-        #region Win32 Helper and Constants
-
-        private const int SWP_NOACTIVATE = 0x0010;
-        private const int SWP_NOOWNERZORDER = 0x0200;
-        private const int SWP_SHOWWINDOW = 0x0040;
-
-        private const int SM_CXSCREEN = 0;
-        private const int SM_CYSCREEN = 0;
-
-        [DllImport("user32.dll")]
-        private static extern int GetSystemMetrics(int nIndex);
-
-        [DllImport("user32.dll", SetLastError = true)]
-        private static extern bool SetWindowPos(
-            IntPtr hWnd,
-            IntPtr hWndInsertAfter,
-            int X,
-            int Y,
-            int cx,
-            int cy,
-            uint uFlags
-        );
-
-        /// <summary>
-        /// 更改已注册 AppBar 的高度。
-        /// </summary>
-        /// <param name="window">目标窗口</param>
-        /// <param name="newHeight">新的高度</param>
-        public static void UpdateAppBarHeight(IntPtr hwnd, int newHeight)
-        {
-            if (!_registered.Contains(hwnd))
-                return;
-
-            APPBARDATA abd = new()
+            Shell32.APPBARDATA abd = new()
             {
-                cbSize = Marshal.SizeOf<APPBARDATA>(),
-                hWnd = hwnd,
-                uEdge = ABE_TOP,
-                rc = new RECT
-                {
-                    left = 0,
-                    top = 0,
-                    right = GetSystemMetrics(SM_CXSCREEN),
-                    bottom = newHeight,
-                },
+                cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
+                hWnd = hwnd
             };
 
-            SHAppBarMessage(ABM_SETPOS, ref abd);
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_REMOVE, ref abd);
 
-            // 同步窗口实际高度
-            SetWindowPos(
-                hwnd,
-                IntPtr.Zero,
-                0,
-                0,
-                GetSystemMetrics(SM_CXSCREEN),
-                newHeight,
-                SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_SHOWWINDOW
-            );
+            _registered.Remove(hwnd);
+        }
+
+        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(() =>
+            {
+                if (!_registered.Contains(hwnd))
+                    return;
+
+                var uEdge = dockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
+                int screenHeight = User32.GetSystemMetrics(User32.SystemMetric.SM_CYSCREEN);
+                int top = dockPlacement == DockPlacement.Top ? 0 : screenHeight - newHeight;
+                int bottom = dockPlacement == DockPlacement.Top ? newHeight : screenHeight;
+
+                Shell32.APPBARDATA abd = new()
+                {
+                    cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
+                    hWnd = hwnd,
+                    uEdge = uEdge,
+                    rc = new RECT
+                    {
+                        Left = 0,
+                        Top = top,
+                        Right = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN),
+                        Bottom = bottom,
+                    },
+                };
+
+                Shell32.SHAppBarMessage(Shell32.ABM.ABM_QUERYPOS, ref abd);
+                Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
+
+                // 同步窗口实际高度和位置
+                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));
         }
-        #endregion
     }
-}
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/EasingHelper.cs

@@ -8,64 +8,105 @@ using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Helper
 {
-    /// <summary>
-    /// Defines the <see cref="EasingHelper" />
-    /// </summary>
     public class EasingHelper
     {
-        #region Methods
-
-        /// <summary>
-        /// Acceleration until halfway then deceleration
-        /// </summary>
-        /// <param name="t">The t<see cref="float"/></param>
-        /// <returns>The <see cref="float"/></returns>
+        public static float EaseInOutSine(float t)
+        {
+            return -(MathF.Cos(MathF.PI * t) - 1f) / 2f;
+        }
         public static float EaseInOutQuad(float t)
         {
             return t < 0.5f ? 2 * t * t : -1 + (4 - 2 * t) * t;
         }
 
-        /// <summary>
-        /// Accelerating from 0
-        /// </summary>
-        /// <param name="t">The t<see cref="float"/></param>
-        /// <returns>The <see cref="float"/></returns>
-        public static float EaseInQuad(float t) => t * t;
-
-        /// <summary>
-        /// Decelerating to 0
-        /// </summary>
-        /// <param name="t">The t<see cref="float"/></param>
-        /// <returns>The <see cref="float"/></returns>
-        public static float EaseOutQuad(float t) => t * (2 - t);
-
-        /// <summary>
-        /// No easing
-        /// </summary>
-        /// <param name="t">The t<see cref="float"/></param>
-        /// <returns>The <see cref="float"/></returns>
-        public static float Linear(float t) => t;
-
-        /// <summary>
-        /// Even smoother transition with continuous first and second derivatives
-        /// </summary>
-        /// <param name="t">The t<see cref="float"/></param>
-        /// <returns>The <see cref="float"/></returns>
-        public static float SmootherStep(float t)
+        public static float EaseInOutCubic(float t)
         {
-            return t * t * t * (t * (6 * t - 15) + 10);
+            return t < 0.5f ? 4 * t * t * t : 1 - MathF.Pow(-2 * t + 2, 3) / 2;
+        }
+        public static float EaseInOutQuart(float t)
+        {
+            return t < 0.5f ? 8 * t * t * t * t : 1 - MathF.Pow(-2 * t + 2, 4) / 2;
+        }
+
+        public static float EaseInOutQuint(float t)
+        {
+            return t < 0.5f ? 16 * t * t * t * t * t : 1 - MathF.Pow(-2 * t + 2, 5) / 2;
+        }
+
+        public static float EaseInOutExpo(float t)
+        {
+            return t == 0
+              ? 0
+              : t == 1
+              ? 1
+              : t < 0.5 ? MathF.Pow(2, 20 * t - 10) / 2
+              : (2 - MathF.Pow(2, -20 * t + 10)) / 2;
+        }
+
+        public static float EaseInOutCirc(float t)
+        {
+            return t < 0.5f
+              ? (1 - MathF.Sqrt(1 - MathF.Pow(2 * t, 2))) / 2
+              : (MathF.Sqrt(1 - MathF.Pow(-2 * t + 2, 2)) + 1) / 2;
+        }
+
+        public static float EaseInOutBack(float t)
+        {
+            float c1 = 1.70158f;
+            float c2 = c1 * 1.525f;
+
+            return t < 0.5
+              ? (MathF.Pow(2 * t, 2) * ((c2 + 1) * 2 * t - c2)) / 2
+              : (MathF.Pow(2 * t - 2, 2) * ((c2 + 1) * (t * 2 - 2) + c2) + 2) / 2;
+        }
+
+        public static float EaseInOutElastic(float t)
+        {
+            if (t == 0 || t == 1) return t;
+            float p = 0.3f;
+            float s = p / 4;
+            return t < 0.5f
+              ? -(MathF.Pow(2, 20 * t - 10) * MathF.Sin((20 * t - 11.125f) * (2 * MathF.PI) / p)) / 2
+              : (MathF.Pow(2, -20 * t + 10) * MathF.Sin((20 * t - 11.125f) * (2 * MathF.PI) / p)) / 2 + 1;
+        }
+
+        private static float EaseOutBounce(float t)
+        {
+            if (t < 4 / 11f)
+            {
+                return (121 * t * t) / 16f;
+            }
+            else if (t < 8 / 11f)
+            {
+                return (363 / 40f * t * t) - (99 / 10f * t) + 17 / 5f;
+            }
+            else if (t < 9 / 10f)
+            {
+                return (4356 / 361f * t * t) - (35442 / 1805f * t) + 16061 / 1805f;
+            }
+            else
+            {
+                return (54 / 5f * t * t) - (513 / 25f * t) + 268 / 25f;
+            }
+        }
+
+        public static float EaseInOutBounce(float t)
+        {
+            if (t < 0.5f)
+            {
+                return (1 - EaseOutBounce(1 - 2 * t)) / 2;
+            }
+            else
+            {
+                return (1 + EaseOutBounce(2 * t - 1)) / 2;
+            }
         }
 
-        /// <summary>
-        /// Smoother transition than linear
-        /// </summary>
-        /// <param name="t">The t<see cref="float"/></param>
-        /// <returns>The <see cref="float"/></returns>
         public static float SmoothStep(float t)
         {
-            return t * t * (3 - 2 * t);
+            return t * t * (3f - 2f * t);
         }
 
-        #endregion
+        public static float Linear(float t) => t;
     }
 }

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

@@ -1,27 +1,15 @@
 // 2025/6/23 by Zhe Fang
 
+using BetterLyrics.WinUI3.Enums;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using Ude;
 
 namespace BetterLyrics.WinUI3.Helper
 {
-    /// <summary>
-    /// Defines the <see cref="FileHelper" />
-    /// </summary>
     public class FileHelper
     {
-        #region Methods
-
-        /// <summary>
-        /// The GetEncoding
-        /// </summary>
-        /// <param name="filename">The filename<see cref="string"/></param>
-        /// <returns>The <see cref="Encoding"/></returns>
         public static Encoding GetEncoding(string filename)
         {
             var bytes = File.ReadAllBytes(filename);
@@ -36,6 +24,59 @@ namespace BetterLyrics.WinUI3.Helper
             return Encoding.GetEncoding(encoding);
         }
 
-        #endregion
+        public static string SanitizeFileName(string fileName, char replacement = '_')
+        {
+            var invalidChars = Path.GetInvalidFileNameChars();
+            var sb = new StringBuilder(fileName.Length);
+            foreach (var c in fileName)
+            {
+                sb.Append(Array.IndexOf(invalidChars, c) >= 0 ? replacement : c);
+            }
+            return sb.ToString();
+        }
+
+        public static string? ReadLyricsCache(string title, string artist, LyricsFormat format, string cacheFolderPath)
+        {
+            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{artist} - {title}{format.ToFileExtension()}"));
+            if (File.Exists(cacheFilePath))
+            {
+                return File.ReadAllText(cacheFilePath);
+            }
+            return null;
+        }
+
+        public static byte[]? ReadAlbumArtCache(string album, string artist, string format, string cacheFolderPath)
+        {
+            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{artist} - {album}{format}"));
+            if (File.Exists(cacheFilePath))
+            {
+                return File.ReadAllBytes(cacheFilePath);
+            }
+            return null;
+        }
+
+        public static void WriteLyricsCache(string title, string artist, string lyrics, LyricsFormat format, string cacheFolderPath)
+        {
+            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{artist} - {title}{format.ToFileExtension()}"));
+            File.WriteAllText(cacheFilePath, lyrics);
+        }
+
+        public static void WriteAlbumArtCache(string album, string artist, byte[] img, string format, string cacheFolderPath)
+        {
+            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{artist} - {album}{format}"));
+            File.WriteAllBytes(cacheFilePath, img);
+        }
+
+        public static bool IsSwitchableNormalizedMatch(string fileName, string q1, string q2)
+        {
+            var normFileName = StringHelper.Normalize(fileName.Normalize());
+            var normQ1 = StringHelper.Normalize(q1);
+            var normQ2 = StringHelper.Normalize(q2);
+
+            // 常见两种顺序
+            return normFileName == normQ1 + normQ2
+                || normFileName == normQ2 + normQ1;
+        }
+
     }
 }

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

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

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

@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml;
+using Vanara.PInvoke;
+using Windows.System;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public class ForegroundWindowWatcher
+    {
+        private readonly User32.WinEventProc _winEventDelegate;
+        private readonly List<User32.HWINEVENTHOOK> _hooks = new();
+        private HWND _currentForeground = HWND.NULL;
+        private readonly IntPtr _selfHwnd;
+
+        public delegate void WindowChangedHandler(HWND hwnd);
+        private readonly WindowChangedHandler _onWindowChanged;
+
+        private readonly DispatcherTimer _timer;
+
+        public ForegroundWindowWatcher(IntPtr selfHwnd, WindowChangedHandler onWindowChanged)
+        {
+            _selfHwnd = selfHwnd;
+            _onWindowChanged = onWindowChanged;
+            _winEventDelegate = new User32.WinEventProc(WinEventProc);
+
+            _timer = new DispatcherTimer();
+            _timer.Interval = TimeSpan.FromSeconds(1);
+            _timer.Tick += Timer_Tick;
+        }
+
+        public void Start()
+        {
+            // Hook: foreground changes and minimize end
+            _hooks.Add(
+                User32.SetWinEventHook(
+                    User32.EventConstants.EVENT_SYSTEM_FOREGROUND,
+                    User32.EventConstants.EVENT_SYSTEM_MINIMIZEEND,
+                    HINSTANCE.NULL,
+                    _winEventDelegate,
+                    0,
+                    0,
+                    User32.WINEVENT.WINEVENT_OUTOFCONTEXT
+                )
+            );
+
+            // Hook: window move/resize (location change)
+            _hooks.Add(
+                User32.SetWinEventHook(
+                    User32.EventConstants.EVENT_OBJECT_LOCATIONCHANGE,
+                    User32.EventConstants.EVENT_OBJECT_LOCATIONCHANGE,
+                    HINSTANCE.NULL,
+                    _winEventDelegate,
+                    0,
+                    0,
+                    User32.WINEVENT.WINEVENT_OUTOFCONTEXT
+                )
+            );
+
+            _timer.Start();
+        }
+
+        public void Stop()
+        {
+            foreach (var hook in _hooks)
+                User32.UnhookWinEvent(hook);
+
+            _hooks.Clear();
+
+            _timer.Stop();
+        }
+
+        private void Timer_Tick(object? sender, object e)
+        {
+            if (_currentForeground != HWND.NULL)
+            {
+                _onWindowChanged?.Invoke(_currentForeground);
+            }
+        }
+
+        private void WinEventProc(
+            User32.HWINEVENTHOOK hWinEventHook,
+            uint eventType,
+            HWND hwnd,
+            int idObject,
+            int idChild,
+            uint dwEventThread,
+            uint dwmsEventTime
+        )
+        {
+            if (hwnd == IntPtr.Zero)
+                return;
+
+            if (eventType == User32.EventConstants.EVENT_SYSTEM_FOREGROUND)
+            {
+                _currentForeground = hwnd;
+                _onWindowChanged?.Invoke(hwnd);
+            }
+            else if ((eventType == User32.EventConstants.EVENT_OBJECT_LOCATIONCHANGE || eventType == User32.EventConstants.EVENT_SYSTEM_MINIMIZEEND) && hwnd == _currentForeground)
+            {
+                _onWindowChanged?.Invoke(hwnd);
+            }
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ForegroundWindowWatcherHelper.cs

@@ -1,142 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.UI.Xaml;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public class ForegroundWindowWatcherHelper
-    {
-        private readonly WinEventDelegate _winEventDelegate;
-        private readonly List<IntPtr> _hooks = new();
-        private IntPtr _currentForeground = IntPtr.Zero;
-        private readonly IntPtr _selfHwnd;
-        private readonly DispatcherTimer _pollingTimer;
-        private DateTime _lastEventTime = DateTime.MinValue;
-        private const int ThrottleIntervalMs = 100;
-
-        public delegate void WindowChangedHandler(IntPtr hwnd);
-        private readonly WindowChangedHandler _onWindowChanged;
-
-        private const uint EVENT_SYSTEM_FOREGROUND = 0x0003;
-        private const uint EVENT_SYSTEM_MINIMIZEEND = 0x0017;
-        private const uint EVENT_OBJECT_LOCATIONCHANGE = 0x800B;
-        private const uint WINEVENT_OUTOFCONTEXT = 0x0000;
-
-        public ForegroundWindowWatcherHelper(IntPtr selfHwnd, WindowChangedHandler onWindowChanged)
-        {
-            _selfHwnd = selfHwnd;
-            _onWindowChanged = onWindowChanged;
-            _winEventDelegate = new WinEventDelegate(WinEventProc);
-
-            _pollingTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(200) };
-            _pollingTimer.Tick += (_, _) =>
-            {
-                if (_currentForeground != IntPtr.Zero && _currentForeground != _selfHwnd)
-                    _onWindowChanged?.Invoke(_currentForeground);
-            };
-        }
-
-        public void Start()
-        {
-            // Hook: foreground changes and minimize end
-            _hooks.Add(
-                SetWinEventHook(
-                    EVENT_SYSTEM_FOREGROUND,
-                    EVENT_SYSTEM_MINIMIZEEND,
-                    IntPtr.Zero,
-                    _winEventDelegate,
-                    0,
-                    0,
-                    WINEVENT_OUTOFCONTEXT
-                )
-            );
-
-            // Hook: window move/resize (location change)
-            _hooks.Add(
-                SetWinEventHook(
-                    EVENT_OBJECT_LOCATIONCHANGE,
-                    EVENT_OBJECT_LOCATIONCHANGE,
-                    IntPtr.Zero,
-                    _winEventDelegate,
-                    0,
-                    0,
-                    WINEVENT_OUTOFCONTEXT
-                )
-            );
-
-            _pollingTimer.Start();
-        }
-
-        public void Stop()
-        {
-            foreach (var hook in _hooks)
-                UnhookWinEvent(hook);
-
-            _hooks.Clear();
-            _pollingTimer.Stop();
-        }
-
-        private void WinEventProc(
-            IntPtr hWinEventHook,
-            uint eventType,
-            IntPtr hwnd,
-            int idObject,
-            int idChild,
-            uint dwEventThread,
-            uint dwmsEventTime
-        )
-        {
-            if (hwnd == IntPtr.Zero || hwnd == _selfHwnd)
-                return;
-
-            var now = DateTime.Now;
-            if ((now - _lastEventTime).TotalMilliseconds < ThrottleIntervalMs)
-                return;
-
-            _lastEventTime = now;
-
-            if (eventType == EVENT_SYSTEM_FOREGROUND)
-            {
-                _currentForeground = hwnd;
-                _onWindowChanged?.Invoke(hwnd);
-            }
-            else if (
-                (eventType == EVENT_OBJECT_LOCATIONCHANGE || eventType == EVENT_SYSTEM_MINIMIZEEND)
-                && hwnd == _currentForeground
-            )
-            {
-                _onWindowChanged?.Invoke(hwnd);
-            }
-        }
-
-        #region WinAPI
-        private delegate void WinEventDelegate(
-            IntPtr hWinEventHook,
-            uint eventType,
-            IntPtr hwnd,
-            int idObject,
-            int idChild,
-            uint dwEventThread,
-            uint dwmsEventTime
-        );
-
-        [DllImport("user32.dll")]
-        private static extern IntPtr SetWinEventHook(
-            uint eventMin,
-            uint eventMax,
-            IntPtr hmodWinEventProc,
-            WinEventDelegate lpfnWinEventProc,
-            uint idProcess,
-            uint idThread,
-            uint dwFlags
-        );
-
-        [DllImport("user32.dll")]
-        private static extern bool UnhookWinEvent(IntPtr hWinEventHook);
-        #endregion
-    }
-}

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

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

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

@@ -1,11 +1,14 @@
 // 2025/6/23 by Zhe Fang
 
+using CommunityToolkit.WinUI.Helpers;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Text;
 using Microsoft.UI;
-using Microsoft.UI.Text;
-using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Formats.Png;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -14,42 +17,15 @@ using System.Numerics;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
 using Windows.Graphics.Imaging;
-using Windows.Storage;
 using Windows.Storage.Streams;
 using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Helper
 {
-    /// <summary>
-    /// Defines the <see cref="ImageHelper" />
-    /// </summary>
     public class ImageHelper
     {
-        #region Constants
+        private const int _accentColorCount = 1;
 
-        /// <summary>
-        /// Defines the AccentColorCount
-        /// </summary>
-        public const int AccentColorCount = 3;
-
-        #endregion
-
-        #region Fields
-
-        /// <summary>
-        /// Defines the _colorThief
-        /// </summary>
-        private static readonly ColorThief _colorThief = new();
-
-        #endregion
-
-        #region Methods
-
-        /// <summary>
-        /// The ByteArrayToStream
-        /// </summary>
-        /// <param name="bytes">The bytes<see cref="byte[]"/></param>
-        /// <returns>The <see cref="Task{InMemoryRandomAccessStream}"/></returns>
         public static async Task<InMemoryRandomAccessStream> ByteArrayToStream(byte[] bytes)
         {
             var stream = new InMemoryRandomAccessStream();
@@ -59,73 +35,44 @@ namespace BetterLyrics.WinUI3.Helper
             return stream;
         }
 
-        /// <summary>
-        /// The CreateTextPlaceholderBytesAsync
-        /// </summary>
-        /// <param name="text">The text<see cref="string"/></param>
-        /// <param name="width">The width<see cref="int"/></param>
-        /// <param name="height">The height<see cref="int"/></param>
-        /// <returns>The <see cref="Task{byte[]}"/></returns>
-        public static async Task<byte[]> CreateTextPlaceholderBytesAsync(
-            string text,
-            int width,
-            int height
-        )
+        public static RandomAccessStreamReference ByteArrayToRandomAccessStreamReference(byte[] bytes)
+        {
+            var stream = new InMemoryRandomAccessStream();
+            var writer = new DataWriter(stream);
+            writer.WriteBytes(bytes);
+            writer.StoreAsync().GetAwaiter().GetResult();
+            writer.FlushAsync().GetAwaiter().GetResult();
+            writer.DetachStream();
+            return RandomAccessStreamReference.CreateFromStream(stream);
+        }
+
+        public static async Task<byte[]> CreateTextPlaceholderBytesAsync(int width, int height)
         {
             var device = CanvasDevice.GetSharedDevice();
             var renderTarget = new CanvasRenderTarget(device, width, height, 96);
 
-            // 居中绘制文字
+            // 随机生成渐变色
+            Windows.UI.Color RandomColor()
+            {
+                var rand = new Random(Guid.NewGuid().GetHashCode());
+                double h = rand.NextDouble() * 360;
+                double s = 0.35 + rand.NextDouble() * 0.3; // 0.35~0.65，适中饱和度
+                double l = 0.5 + rand.NextDouble() * 0.3;  // 0.5~0.8，明亮
+                return HslToColor(h, s, l);
+            }
+
+            Windows.UI.Color color1 = RandomColor();
+            Windows.UI.Color color2 = RandomColor();
+
             using (var ds = renderTarget.CreateDrawingSession())
             {
-                // 背景色
-                ds.Clear(Colors.LightGray);
-
-                // 文字格式
-                var format = new CanvasTextFormat
+                // 绘制线性渐变背景
+                var gradientBrush = new Microsoft.Graphics.Canvas.Brushes.CanvasLinearGradientBrush(ds, color1, color2)
                 {
-                    FontSize = Math.Min(width, height) / 6f,
-                    FontWeight = Microsoft.UI.Text.FontWeights.SemiBold,
-                    HorizontalAlignment = CanvasHorizontalAlignment.Center,
-                    VerticalAlignment = CanvasVerticalAlignment.Center,
-                    WordWrapping = CanvasWordWrapping.Wrap,
-                    TrimmingGranularity = CanvasTextTrimmingGranularity.Character,
-                    Options = CanvasDrawTextOptions.Default,
+                    StartPoint = new System.Numerics.Vector2(0, 0),
+                    EndPoint = new System.Numerics.Vector2(width, height)
                 };
-
-                // 设定边距
-                float margin = Math.Min(width, height) / 12f;
-                float availableWidth = width - 2 * margin;
-                float availableHeight = height - 2 * margin;
-
-                // 计算合适的字体大小以适应内容区域
-                float fontSize = format.FontSize;
-                float minFontSize = 8f;
-                float maxFontSize = format.FontSize;
-                CanvasTextLayout layout;
-                do
-                {
-                    format.FontSize = fontSize;
-                    layout = new CanvasTextLayout(
-                        ds,
-                        text,
-                        format,
-                        availableWidth,
-                        availableHeight
-                    );
-                    if (
-                        layout.LayoutBounds.Width <= availableWidth
-                        && layout.LayoutBounds.Height <= availableHeight
-                    )
-                        break;
-                    fontSize -= 1f;
-                } while (fontSize >= minFontSize);
-
-                // 居中绘制文字（在内容区域内居中）
-                var bounds = layout.LayoutBounds;
-                var x = margin + (availableWidth - (float)bounds.Width) / 2f - (float)bounds.X;
-                var y = margin + (availableHeight - (float)bounds.Height) / 2f - (float)bounds.Y;
-                ds.DrawTextLayout(layout, new Vector2(x, y), Colors.DarkGray);
+                ds.FillRectangle(0, 0, width, height, gradientBrush);
             }
 
             // 保存为 PNG 并转为 byte[]
@@ -140,78 +87,149 @@ namespace BetterLyrics.WinUI3.Helper
                 }
                 return buffer;
             }
+
+            // HSL转Color
+            static Windows.UI.Color HslToColor(double h, double s, double l)
+            {
+                h = h / 360.0;
+                double r = l, g = l, b = l;
+                if (s != 0)
+                {
+                    double q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+                    double p = 2 * l - q;
+                    r = HueToRgb(p, q, h + 1.0 / 3.0);
+                    g = HueToRgb(p, q, h);
+                    b = HueToRgb(p, q, h - 1.0 / 3.0);
+                }
+                return Windows.UI.Color.FromArgb(255, (byte)(r * 255), (byte)(g * 255), (byte)(b * 255));
+            }
+            static double HueToRgb(double p, double q, double t)
+            {
+                if (t < 0) t += 1;
+                if (t > 1) t -= 1;
+                if (t < 1.0 / 6.0) return p + (q - p) * 6 * t;
+                if (t < 1.0 / 2.0) return q;
+                if (t < 2.0 / 3.0) return p + (q - p) * (2.0 / 3.0 - t) * 6;
+                return p;
+            }
         }
 
-        /// <summary>
-        /// The GetAccentColorsFromByte
-        /// </summary>
-        /// <param name="bytes">The bytes<see cref="byte[]"/></param>
-        /// <returns>The <see cref="Task{List{Color}}"/></returns>
-        public static async Task<List<Color>> GetAccentColorsFromByte(byte[] bytes) =>
-            [
-                .. (
-                    await _colorThief.GetPalette(await GetDecoderFromByte(bytes), AccentColorCount)
-                ).Select(color =>
-                    Color.FromArgb(color.Color.A, color.Color.R, color.Color.G, color.Color.B)
-                ),
-            ];
-
-        /// <summary>
-        /// The GetBitmapImageFromBytesAsync
-        /// </summary>
-        /// <param name="imageBytes">The imageBytes<see cref="byte[]"/></param>
-        /// <returns>The <see cref="Task{BitmapImage}"/></returns>
-        public static async Task<BitmapImage> GetBitmapImageFromBytesAsync(byte[] imageBytes)
+        public static List<Windows.UI.Color> GetAccentColorsFromByte(byte[] bytes)
         {
-            var stream = new InMemoryRandomAccessStream();
-            await stream.WriteAsync(imageBytes.AsBuffer());
-            stream.Seek(0);
+            // 使用 ImageSharp 读取图片
+            using var image = SixLabors.ImageSharp.Image.Load<SixLabors.ImageSharp.PixelFormats.Rgba32>(bytes);
 
-            var bitmapImage = new BitmapImage();
-            await bitmapImage.SetSourceAsync(stream);
+            // 简单聚类法：统计所有像素出现频率，取出现最多的前 AccentColorCount 个颜色
+            var colorCount = new Dictionary<SixLabors.ImageSharp.PixelFormats.Rgba32, int>();
 
-            return bitmapImage;
+            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();
+
+            // 转换为 Windows.UI.Color
+            return topColors
+                .Select(c => Windows.UI.Color.FromArgb(c.A, c.R, c.G, c.B))
+                .ToList();
         }
 
-        /// <summary>
-        /// The GetDecoderFromByte
-        /// </summary>
-        /// <param name="bytes">The bytes<see cref="byte[]"/></param>
-        /// <returns>The <see cref="Task{BitmapDecoder}"/></returns>
-        public static async Task<BitmapDecoder> GetDecoderFromByte(byte[] bytes) =>
-            await BitmapDecoder.CreateAsync(await ByteArrayToStream(bytes));
+        //public static async Task<BitmapImage> GetBitmapImageFromBytesAsync(byte[] imageBytes)
+        //{
+        //    var stream = new InMemoryRandomAccessStream();
+        //    await stream.WriteAsync(imageBytes.AsBuffer());
+        //    stream.Seek(0);
 
-        /// <summary>
-        /// The GetStreamFromBytesAsync
-        /// </summary>
-        /// <param name="imageBytes">The imageBytes<see cref="byte[]"/></param>
-        /// <returns>The <see cref="Task{InMemoryRandomAccessStream}"/></returns>
-        public static async Task<InMemoryRandomAccessStream> GetStreamFromBytesAsync(
-            byte[] imageBytes
-        )
-        {
-            if (imageBytes == null || imageBytes.Length == 0)
-                return null;
+        //    var bitmapImage = new BitmapImage();
+        //    await bitmapImage.SetSourceAsync(stream);
 
-            InMemoryRandomAccessStream stream = new InMemoryRandomAccessStream();
-            await stream.WriteAsync(imageBytes.AsBuffer());
+        //    return bitmapImage;
+        //}
 
-            return stream;
-        }
+        //public static async Task<BitmapDecoder> GetDecoderFromByte(byte[] bytes) =>
+        //    await BitmapDecoder.CreateAsync(await ByteArrayToStream(bytes));
+
+        //public static async Task<InMemoryRandomAccessStream> GetStreamFromBytesAsync(byte[] imageBytes)
+        //{
+        //    if (imageBytes == null || imageBytes.Length == 0)
+        //        return null;
+
+        //    InMemoryRandomAccessStream stream = new InMemoryRandomAccessStream();
+        //    await stream.WriteAsync(imageBytes.AsBuffer());
+
+        //    return stream;
+        //}
 
-        /// <summary>
-        /// The ToByteArrayAsync
-        /// </summary>
-        /// <param name="streamRef">The streamRef<see cref="IRandomAccessStreamReference"/></param>
-        /// <returns>The <see cref="Task{byte[]}"/></returns>
         public static async Task<byte[]> ToByteArrayAsync(IRandomAccessStreamReference streamRef)
         {
             using IRandomAccessStream stream = await streamRef.OpenReadAsync();
-            using var memoryStream = new MemoryStream();
-            await stream.AsStreamForRead().CopyToAsync(memoryStream);
-            return memoryStream.ToArray();
+            using var reader = new DataReader(stream);
+            await reader.LoadAsync((uint)stream.Size);
+            byte[] buffer = new byte[stream.Size];
+            reader.ReadBytes(buffer);
+            return buffer;
         }
 
-        #endregion
+        public static float GetAverageLuminance(CanvasBitmap bitmap)
+        {
+            var pixels = bitmap.GetPixelBytes();
+            double sum = 0;
+            for (int i = 0; i < pixels.Length; i += 4)
+            {
+                // BGRA
+                byte b = pixels[i];
+                byte g = pixels[i + 1];
+                byte r = pixels[i + 2];
+                // 忽略A
+                double y = 0.299 * r + 0.587 * g + 0.114 * b;
+                sum += y / 255.0;
+            }
+            return (float)(sum / (pixels.Length / 4));
+        }
+
+        public static byte[] MakeSquareWithThemeColor(byte[] imageBytes)
+        {
+            using var image = Image.Load<Rgba32>(imageBytes);
+
+            if (image.Width == image.Height)
+            {
+                // 已经是正方形，直接返回
+                return imageBytes;
+            }
+
+            int size = Math.Max(image.Width, image.Height);
+
+            var themeColor = Rgba32.ParseHex(GetAccentColorsFromByte(imageBytes).FirstOrDefault().ToHex());
+
+            // 新建正方形画布
+            using var square = new Image<Rgba32>(size, size, themeColor);
+
+            // 计算居中位置
+            int offsetX = (size - image.Width) / 2;
+            int offsetY = (size - image.Height) / 2;
+
+            // 绘制原图到正方形画布
+            square.Mutate(ctx => ctx.DrawImage(image, new Point(offsetX, offsetY), 1f));
+
+            // 保存为 PNG 字节流
+            using var ms = new MemoryStream();
+            square.Save(ms, new PngEncoder());
+            return ms.ToArray();
+        }
     }
 }

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

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

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

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

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

@@ -1,84 +1,57 @@
 // 2025/6/23 by Zhe Fang
 
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services;
+using Lyricify.Lyrics.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Xml.Linq;
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Models;
-using Lyricify.Lyrics.Models;
-using Microsoft.UI.Xaml.Shapes;
+using Windows.Globalization.Fonts;
+using LyricsData = BetterLyrics.WinUI3.Models.LyricsData;
 
 namespace BetterLyrics.WinUI3.Helper
 {
-    /// <summary>
-    /// Defines the <see cref="LyricsParser" />
-    /// </summary>
     public class LyricsParser
     {
-        #region Fields
+        private List<LyricsData> _lyricsDataArr = [];
 
-        /// <summary>
-        /// Defines the _multiLangLyricsLines
-        /// </summary>
-        private List<List<LyricsLine>> _multiLangLyricsLines = [];
-
-        #endregion
-
-        #region Methods
-
-        /// <summary>
-        /// The Parse
-        /// </summary>
-        /// <param name="raw">The raw<see cref="string"/></param>
-        /// <param name="lyricsFormat">The lyricsFormat<see cref="LyricsFormat?"/></param>
-        /// <param name="title">The title<see cref="string?"/></param>
-        /// <param name="artist">The artist<see cref="string?"/></param>
-        /// <param name="durationMs">The durationMs<see cref="int"/></param>
-        /// <returns>The <see cref="List{List{LyricsLine}}"/></returns>
-        public List<List<LyricsLine>> Parse(
-            string raw,
-            LyricsFormat? lyricsFormat = null,
-            string? title = null,
-            string? artist = null,
-            int durationMs = 0
-        )
+        public List<LyricsData> Parse(string? raw, int? durationMs)
         {
-            _multiLangLyricsLines = [];
-            switch (lyricsFormat)
+            durationMs ??= (int)TimeSpan.FromMinutes(99).TotalMilliseconds;
+            _lyricsDataArr = [];
+            if (raw == null)
             {
-                case LyricsFormat.Lrc:
-                case LyricsFormat.Eslrc:
-                    ParseLrc(raw, durationMs);
-                    break;
-                case LyricsFormat.Qrc:
-                    ParseUsingLyricify(
-                        Lyricify.Lyrics.Parsers.QrcParser.Parse(raw).Lines,
-                        durationMs
-                    );
-                    break;
-                case LyricsFormat.Krc:
-                    ParseUsingLyricify(
-                        Lyricify.Lyrics.Parsers.KrcParser.Parse(raw).Lines,
-                        durationMs
-                    );
-                    break;
-                case LyricsFormat.Ttml:
-                    ParseTtml(raw, durationMs);
-                    break;
-                default:
-                    break;
+                _lyricsDataArr.Add(LyricsData.GetNotfoundPlaceholder(durationMs.Value));
             }
-            return _multiLangLyricsLines;
+            else
+            {
+                switch (raw.DetectFormat())
+                {
+                    case LyricsFormat.Lrc:
+                    case LyricsFormat.Eslrc:
+                        ParseLrc(raw);
+                        break;
+                    case LyricsFormat.Qrc:
+                        ParseQQNeteaseKugou(Lyricify.Lyrics.Parsers.QrcParser.Parse(raw).Lines);
+                        break;
+                    case LyricsFormat.Krc:
+                        ParseQQNeteaseKugou(Lyricify.Lyrics.Parsers.KrcParser.Parse(raw).Lines);
+                        break;
+                    case LyricsFormat.Ttml:
+                        ParseTtml(raw);
+                        break;
+                    default:
+                        break;
+                }
+            }
+            _lyricsDataArr.Add(new LyricsData()); // 为机翻预留
+            return _lyricsDataArr;
         }
 
-        /// <summary>
-        /// The ParseLrc
-        /// </summary>
-        /// <param name="raw">The raw<see cref="string"/></param>
-        /// <param name="durationMs">The durationMs<see cref="int"/></param>
-        private void ParseLrc(string raw, int durationMs)
+        private void ParseLrc(string raw)
         {
             var lines = raw.Split(["\r\n", "\n"], StringSplitOptions.RemoveEmptyEntries);
             var lrcLines =
@@ -139,9 +112,8 @@ namespace BetterLyrics.WinUI3.Helper
             int languageCount = grouped.Max(g => g.Count());
 
             // 初始化每种语言的歌词列表
-            _multiLangLyricsLines.Clear();
-            for (int i = 0; i < languageCount; i++)
-                _multiLangLyricsLines.Add(new List<LyricsLine>());
+            _lyricsDataArr.Clear();
+            for (int i = 0; i < languageCount; i++) _lyricsDataArr.Add(new LyricsData());
 
             // 遍历每个时间分组
             foreach (var group in grouped)
@@ -155,9 +127,8 @@ namespace BetterLyrics.WinUI3.Helper
                     var line = new LyricsLine
                     {
                         StartMs = start,
-                        EndMs = 0, // 稍后统一修正
-                        Text = text,
-                        CharTimings = [],
+                        OriginalText = text,
+                        LyricsChars = [],
                     };
                     if (syllables != null && syllables.Count > 0)
                     {
@@ -166,11 +137,10 @@ namespace BetterLyrics.WinUI3.Helper
                         {
                             var (charStart, charText) = syllables[j];
                             int startIndex = currentIndex;
-                            line.CharTimings.Add(
-                                new CharTiming
+                            line.LyricsChars.Add(
+                                new LyricsChar
                                 {
                                     StartMs = charStart,
-                                    EndMs = 0, // Fixed later
                                     Text = charText ?? "",
                                     StartIndex = startIndex,
                                 }
@@ -178,123 +148,20 @@ namespace BetterLyrics.WinUI3.Helper
                             currentIndex += charText?.Length ?? 0;
                         }
                     }
-                    _multiLangLyricsLines[langIdx].Add(line);
+                    _lyricsDataArr[langIdx].LyricsLines.Add(line);
                 }
             }
-
-            // 修正 EndMs
-            for (int langIdx = 0; langIdx < languageCount; langIdx++)
-            {
-                var linesInSingleLang = _multiLangLyricsLines[langIdx];
-                for (int i = 0; i < linesInSingleLang.Count; i++)
-                {
-                    if (i + 1 < linesInSingleLang.Count)
-                    {
-                        linesInSingleLang[i].EndMs = linesInSingleLang[i + 1].StartMs;
-                    }
-                    else
-                    {
-                        linesInSingleLang[i].EndMs = durationMs;
-                    }
-
-                    // 修正 CharTimings 的 EndMs
-                    var timings = linesInSingleLang[i].CharTimings;
-                    if (timings.Count > 0)
-                    {
-                        for (int j = 0; j < timings.Count; j++)
-                        {
-                            if (j + 1 < timings.Count)
-                            {
-                                timings[j].EndMs = timings[j + 1].StartMs;
-                            }
-                            else
-                            {
-                                timings[j].EndMs = linesInSingleLang[i].EndMs;
-                            }
-                        }
-                    }
-                }
-                PostProcessLyricsLines(linesInSingleLang);
-            }
         }
 
-        private void ParseUsingLyricify(List<ILineInfo>? lines, int durationMs)
-        {
-            List<LyricsLine> lyricsLines = [];
-
-            if (lines != null && lines.Count > 0)
-            {
-                lyricsLines = [];
-                for (int lineIndex = 0; lineIndex < lines.Count; lineIndex++)
-                {
-                    var lineRead = lines[lineIndex];
-                    var lineWrite = new LyricsLine
-                    {
-                        StartMs = lineRead.StartTime ?? 0,
-                        Text = lineRead.Text,
-                        CharTimings = [],
-                    };
-
-                    if (lineIndex + 1 < lines.Count)
-                    {
-                        lineWrite.EndMs = lines[lineIndex + 1].StartTime ?? 0;
-                    }
-                    else
-                    {
-                        lineWrite.EndMs = durationMs;
-                    }
-
-                    var syllables = (lineRead as SyllableLineInfo)?.Syllables;
-                    if (syllables != null)
-                    {
-                        int startIndex = 0;
-                        for (
-                            int syllableIndex = 0;
-                            syllableIndex < syllables.Count;
-                            syllableIndex++
-                        )
-                        {
-                            var syllable = syllables[syllableIndex];
-                            var charTiming = new CharTiming
-                            {
-                                StartMs = syllable.StartTime,
-                                Text = syllable.Text,
-                                StartIndex = startIndex,
-                            };
-                            if (syllableIndex + 1 < syllables.Count)
-                            {
-                                charTiming.EndMs = syllables[syllableIndex + 1].StartTime;
-                            }
-                            else
-                            {
-                                charTiming.EndMs = lineWrite.EndMs;
-                            }
-                            lineWrite.CharTimings.Add(charTiming);
-                            startIndex += syllable.Text.Length;
-                        }
-                    }
-
-                    lyricsLines.Add(lineWrite);
-                }
-            }
-
-            _multiLangLyricsLines.Add(lyricsLines);
-        }
-
-        /// <summary>
-        /// The ParseTtml
-        /// </summary>
-        /// <param name="raw">The raw<see cref="string"/></param>
-        /// <param name="durationMs">The durationMs<see cref="int"/></param>
-        private void ParseTtml(string raw, int durationMs)
+        private void ParseTtml(string raw)
         {
             try
             {
-                List<LyricsLine> singleLangLyricsLine = [];
+                List<LyricsLine> originalLines = [];
+                List<LyricsLine> translationLines = [];
                 var xdoc = XDocument.Parse(raw);
                 var body = xdoc.Descendants().FirstOrDefault(e => e.Name.LocalName == "body");
-                if (body == null)
-                    return;
+                if (body == null) return;
                 var ps = body.Descendants().Where(e => e.Name.LocalName == "p");
                 foreach (var p in ps)
                 {
@@ -304,53 +171,92 @@ namespace BetterLyrics.WinUI3.Helper
                     int pStartMs = ParseTtmlTime(pBegin);
                     int pEndMs = ParseTtmlTime(pEnd);
 
-                    // 处理分词分时
+                    // 只获取一级span，且排除ttm:role="x-bg"的span
                     var spans = p.Elements()
-                        .Where(s =>
-                            s.Name.LocalName == "span"
-                            && s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))
-                                == null
-                        )
+                        .Where(s => s.Name.LocalName == "span" &&
+                                    s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value != "x-bg")
                         .ToList();
 
-                    string text = string.Concat(spans.Select(s => s));
-                    var charTimings = new List<CharTiming>();
+                    // 原文和翻译分离
+                    var originalTextSpans = spans
+                        .Where(s => s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value != "x-translation")
+                        .ToList();
+                    var translationTextSpans = spans
+                        .Where(s => s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value == "x-translation")
+                        .ToList();
 
-                    for (int i = 0; i < spans.Count; i++)
+                    // 原文（非 CJK 语言添加空格）
+                    string originalText = string.Concat(originalTextSpans.Select(s => s.Value));
+                    if (!LanguageHelper.IsCJK(originalText))
+                    {
+                        foreach (var span in originalTextSpans)
+                        {
+                            span.Value += " ";
+                        }
+                        originalText = string.Concat(originalTextSpans.Select(s => s.Value));
+                    }
+
+                    var originalCharTimings = new List<LyricsChar>();
+                    int originalStartIndex = 0;
+                    foreach (var span in originalTextSpans)
                     {
-                        var span = spans[i];
                         string? sBegin = span.Attribute("begin")?.Value;
                         string? sEnd = span.Attribute("end")?.Value;
                         int sStartMs = ParseTtmlTime(sBegin);
                         int sEndMs = ParseTtmlTime(sEnd);
-
-                        if (sStartMs == 0 && sEndMs == 0)
-                            continue;
-
-                        if (sEndMs == 0)
-                            sEndMs =
-                                (i + 1 < spans.Count)
-                                    ? ParseTtmlTime(spans[i + 1].Attribute("begin")?.Value)
-                                    : pEndMs;
-
-                        charTimings.Add(new CharTiming { StartMs = sStartMs, EndMs = sEndMs });
+                        originalCharTimings.Add(new LyricsChar
+                        {
+                            StartMs = sStartMs,
+                            EndMs = sEndMs,
+                            StartIndex = originalStartIndex,
+                            Text = span.Value
+                        });
+                        originalStartIndex += span.Value.Length;
                     }
+                    if (originalTextSpans.Count == 0)
+                        originalText = p.Value;
 
-                    if (spans.Count == 0)
-                        text = p.Value;
+                    originalLines.Add(new LyricsLine
+                    {
+                        StartMs = pStartMs,
+                        EndMs = pEndMs,
+                        OriginalText = originalText,
+                        LyricsChars = originalCharTimings,
+                    });
 
-                    singleLangLyricsLine.Add(
-                        new LyricsLine
+                    // 翻译
+                    string translationText = string.Concat(translationTextSpans.Select(s => s.Value));
+                    var translationCharTimings = new List<LyricsChar>();
+                    int translationStartIndex = 0;
+                    foreach (var span in translationTextSpans)
+                    {
+                        string? sBegin = span.Attribute("begin")?.Value;
+                        string? sEnd = span.Attribute("end")?.Value;
+                        int sStartMs = ParseTtmlTime(sBegin);
+                        int sEndMs = ParseTtmlTime(sEnd);
+                        translationCharTimings.Add(new LyricsChar
+                        {
+                            StartMs = sStartMs,
+                            EndMs = sEndMs,
+                            StartIndex = translationStartIndex,
+                            Text = span.Value
+                        });
+                        translationStartIndex += span.Value.Length;
+                    }
+                    if (translationTextSpans.Count > 0)
+                    {
+                        translationLines.Add(new LyricsLine
                         {
                             StartMs = pStartMs,
                             EndMs = pEndMs,
-                            Text = text,
-                            CharTimings = charTimings,
-                        }
-                    );
+                            OriginalText = translationText,
+                            LyricsChars = translationCharTimings,
+                        });
+                    }
                 }
-                PostProcessLyricsLines(singleLangLyricsLine);
-                _multiLangLyricsLines.Add(singleLangLyricsLine);
+                _lyricsDataArr.Add(new LyricsData(originalLines));
+                if (translationLines.Count > 0)
+                    _lyricsDataArr.Add(new LyricsData(translationLines));
             }
             catch
             {
@@ -358,12 +264,7 @@ namespace BetterLyrics.WinUI3.Helper
             }
         }
 
-        /// <summary>
-        /// The ParseTtmlTime
-        /// </summary>
-        /// <param name="t">The t<see cref="string?"/></param>
-        /// <returns>The <see cref="int"/></returns>
-        private int ParseTtmlTime(string? t)
+        private static int ParseTtmlTime(string? t)
         {
             if (string.IsNullOrWhiteSpace(t))
                 return 0;
@@ -424,27 +325,53 @@ namespace BetterLyrics.WinUI3.Helper
             return 0;
         }
 
-        /// <summary>
-        /// The PostProcessLyricsLines
-        /// </summary>
-        /// <param name="lines">The lines<see cref="List{LyricsLine}"/></param>
-        private void PostProcessLyricsLines(List<LyricsLine> lines)
+        private void ParseQQNeteaseKugou(List<ILineInfo>? lines)
         {
-            if (lines.Count > 0 && lines[0].StartMs > 0)
-            {
-                lines.Insert(
-                    0,
-                    new LyricsLine
-                    {
-                        StartMs = 0,
-                        EndMs = lines[0].StartMs,
-                        Text = "● ● ●",
-                        CharTimings = [],
-                    }
-                );
-            }
-        }
+            lines = lines?.Where(x => x.Text != string.Empty).ToList();
+            List<LyricsLine> lyricsLines = [];
 
-        #endregion
+            if (lines != null && lines.Count > 0)
+            {
+                lyricsLines = [];
+                for (int lineIndex = 0; lineIndex < lines.Count; lineIndex++)
+                {
+                    var lineRead = lines[lineIndex];
+                    var lineWrite = new LyricsLine
+                    {
+                        StartMs = lineRead.StartTime ?? 0,
+                        EndMs = lineRead.EndTime ?? 0,
+                        OriginalText = lineRead.Text,
+                        LyricsChars = [],
+                    };
+
+                    var syllables = (lineRead as SyllableLineInfo)?.Syllables;
+                    if (syllables != null)
+                    {
+                        int startIndex = 0;
+                        for (
+                            int syllableIndex = 0;
+                            syllableIndex < syllables.Count;
+                            syllableIndex++
+                        )
+                        {
+                            var syllable = syllables[syllableIndex];
+                            var charTiming = new LyricsChar
+                            {
+                                StartMs = syllable.StartTime,
+                                EndMs = syllable.EndTime,
+                                Text = syllable.Text,
+                                StartIndex = startIndex,
+                            };
+                            lineWrite.LyricsChars.Add(charTiming);
+                            startIndex += syllable.Text.Length;
+                        }
+                    }
+
+                    lyricsLines.Add(lineWrite);
+                }
+            }
+
+            _lyricsDataArr.Add(new LyricsData(lyricsLines));
+        }
     }
 }

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

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

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

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

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

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

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

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/SystemBackdropHelper.cs

@@ -6,18 +6,8 @@ using Microsoft.UI.Xaml.Media;
 
 namespace BetterLyrics.WinUI3.Helper
 {
-    /// <summary>
-    /// Defines the <see cref="SystemBackdropHelper" />
-    /// </summary>
     public class SystemBackdropHelper
     {
-        #region Methods
-
-        /// <summary>
-        /// The CreateSystemBackdrop
-        /// </summary>
-        /// <param name="backdropType">The backdropType<see cref="BackdropType"/></param>
-        /// <returns>The <see cref="SystemBackdrop?"/></returns>
         public static SystemBackdrop? CreateSystemBackdrop(BackdropType backdropType)
         {
             return backdropType switch
@@ -30,7 +20,5 @@ namespace BetterLyrics.WinUI3.Helper
                 _ => null,
             };
         }
-
-        #endregion
     }
 }

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

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

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

@@ -0,0 +1,180 @@
+// 2025/6/23 by Zhe Fang
+
+using System;
+using System.Diagnostics;
+using BetterLyrics.WinUI3.Enums;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public class ValueTransition<T>
+        where T : struct
+    {
+        private T _currentValue;
+        private float _durationSeconds;
+        private EasingType? _easingType;
+        private Func<T, T, float, T> _interpolator;
+        private bool _isTransitioning;
+        private float _progress;
+        private T _startValue;
+        private T _targetValue;
+
+        public float DurationSeconds => _durationSeconds;
+
+        public bool IsTransitioning => _isTransitioning;
+        public T Value => _currentValue;
+        public T TargetValue => _targetValue;
+
+        public ValueTransition(T initialValue, float durationSeconds, Func<T, T, float, T>? interpolator = null, EasingType? easingType = null)
+        {
+            _currentValue = initialValue;
+            _startValue = initialValue;
+            _targetValue = initialValue;
+            _durationSeconds = durationSeconds;
+            _progress = 1f;
+            _isTransitioning = false;
+
+            if (interpolator != null)
+            {
+                _interpolator = interpolator;
+                _easingType = null;
+            }
+            else if (easingType.HasValue)
+            {
+                _easingType = easingType;
+                _interpolator = GetInterpolatorByEasingType(_easingType.Value);
+            }
+            else
+            {
+                _easingType = EasingType.Linear;
+                _interpolator = GetInterpolatorByEasingType(_easingType.Value);
+            }
+        }
+
+        public void SetDuration(float seconds)
+        {
+            if (seconds <= 0)
+                throw new ArgumentOutOfRangeException(nameof(seconds), "Duration must be positive.");
+            _durationSeconds = seconds;
+        }
+
+        private void JumpTo(T value)
+        {
+            _currentValue = value;
+            _startValue = value;
+            _targetValue = value;
+            _progress = 1f;
+            _isTransitioning = false;
+        }
+
+        public void Reset(T value)
+        {
+            _currentValue = value;
+            _startValue = value;
+            _targetValue = value;
+            _progress = 0f;
+            _isTransitioning = false;
+        }
+
+        public void StartTransition(T targetValue, bool jumpTo = false)
+        {
+            if (jumpTo)
+            {
+                JumpTo(targetValue);
+                return;
+            }
+
+            if (!targetValue.Equals(_currentValue))
+            {
+                _startValue = _currentValue;
+                _targetValue = targetValue;
+                _progress = 0f;
+                _isTransitioning = true;
+            }
+        }
+
+        public static bool Equals(double x, double y, double tolerance)
+        {
+            var diff = Math.Abs(x - y);
+            return diff <= tolerance || diff <= Math.Max(Math.Abs(x), Math.Abs(y)) * tolerance;
+        }
+
+        public void Update(TimeSpan elapsedTime)
+        {
+            if (!_isTransitioning) return;
+
+            _progress += (float)elapsedTime.TotalSeconds / _durationSeconds;
+            if (_progress >= 1f)
+            {
+                _progress = 1f;
+                _currentValue = _targetValue;
+                _isTransitioning = false;
+            }
+            else
+            {
+                _currentValue = _interpolator(_startValue, _targetValue, _progress);
+            }
+        }
+
+        private Func<T, T, float, T> GetInterpolatorByEasingType(EasingType type)
+        {
+            if (typeof(T) == typeof(float))
+            {
+                return (start, end, progress) =>
+                {
+                    float s = (float)(object)start;
+                    float e = (float)(object)end;
+                    float t = progress;
+                    switch (type)
+                    {
+                        case EasingType.EaseInOutSine:
+                            t = EasingHelper.EaseInOutSine(t);
+                            break;
+                        case EasingType.EaseInOutQuad:
+                            t = EasingHelper.EaseInOutQuad(t);
+                            break;
+                        case EasingType.EaseInOutCubic:
+                            t = EasingHelper.EaseInOutCubic(t);
+                            break;
+                        case EasingType.EaseInOutQuart:
+                            t = EasingHelper.EaseInOutQuart(t);
+                            break;
+                        case EasingType.EaseInOutQuint:
+                            t = EasingHelper.EaseInOutQuint(t);
+                            break;
+                        case EasingType.EaseInOutExpo:
+                            t = EasingHelper.EaseInOutExpo(t);
+                            break;
+                        case EasingType.EaseInOutCirc:
+                            t = EasingHelper.EaseInOutCirc(t);
+                            break;
+                        case EasingType.EaseInOutBack:
+                            t = EasingHelper.EaseInOutBack(t);
+                            break;
+                        case EasingType.EaseInOutElastic:
+                            t = EasingHelper.EaseInOutElastic(t);
+                            break;
+                        case EasingType.EaseInOutBounce:
+                            t = EasingHelper.EaseInOutBounce(t);
+                            break;
+                        case EasingType.SmoothStep:
+                            t = EasingHelper.SmoothStep(t);
+                            break;
+                        case EasingType.Linear:
+                            t = EasingHelper.Linear(t);
+                            break;
+                        default:
+                            break;
+                    }
+                    return (T)(object)(s + (e - s) * t);
+                };
+            }
+            throw new NotSupportedException($"Easing type {type} is not supported for type {typeof(T)}.");
+        }
+
+        public void SetEasingType(EasingType easingType)
+        {
+            _easingType = easingType;
+            _interpolator = GetInterpolatorByEasingType(easingType);
+        }
+    }
+}

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

@@ -1,106 +0,0 @@
-using System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Runtime.InteropServices;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public static class WindowColorHelper
-    {
-        public static Color GetDominantColorBelow(IntPtr myHwnd)
-        {
-            if (!GetWindowRect(myHwnd, out RECT myRect))
-                return Color.Transparent;
-
-            int screenWidth = GetSystemMetrics(SystemMetric.SM_CXSCREEN);
-            int sampleHeight = 1;
-            int sampleY = myRect.Bottom + 1;
-
-            return GetAverageColorFromScreenRegion(0, sampleY, screenWidth, sampleHeight);
-        }
-
-        private static Color GetAverageColorFromScreenRegion(int x, int y, int width, int height)
-        {
-            using Bitmap bmp = new(width, height, PixelFormat.Format32bppArgb);
-            using Graphics gDest = Graphics.FromImage(bmp);
-
-            IntPtr hdcDest = gDest.GetHdc();
-            IntPtr hdcSrc = GetDC(IntPtr.Zero); // Entire screen
-
-            BitBlt(hdcDest, 0, 0, width, height, hdcSrc, x, y, SRCCOPY);
-
-            gDest.ReleaseHdc(hdcDest);
-            ReleaseDC(IntPtr.Zero, hdcSrc);
-
-            return ComputeAverageColor(bmp);
-        }
-
-        private static Color ComputeAverageColor(Bitmap bmp)
-        {
-            long r = 0,
-                g = 0,
-                b = 0;
-            int count = 0;
-
-            for (int y = 0; y < bmp.Height; y++)
-            {
-                for (int x = 0; x < bmp.Width; x++)
-                {
-                    Color pixel = bmp.GetPixel(x, y);
-                    r += pixel.R;
-                    g += pixel.G;
-                    b += pixel.B;
-                    count++;
-                }
-            }
-
-            if (count == 0)
-                return Color.Transparent;
-            return Color.FromArgb((int)(r / count), (int)(g / count), (int)(b / count));
-        }
-
-        #region Win32 Imports & Structs
-        private const int SRCCOPY = 0x00CC0020;
-
-        [DllImport("user32.dll")]
-        private static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
-
-        [DllImport("user32.dll")]
-        private static extern IntPtr GetDC(IntPtr hWnd);
-
-        [DllImport("user32.dll")]
-        private static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
-
-        [DllImport("gdi32.dll")]
-        private static extern bool BitBlt(
-            IntPtr hdcDest,
-            int nXDest,
-            int nYDest,
-            int nWidth,
-            int nHeight,
-            IntPtr hdcSrc,
-            int nXSrc,
-            int nYSrc,
-            int dwRop
-        );
-
-        [DllImport("user32.dll")]
-        private static extern int GetSystemMetrics(SystemMetric smIndex);
-
-        private enum SystemMetric
-        {
-            SM_CXSCREEN = 0,
-            SM_CYSCREEN = 1,
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        private struct RECT
-        {
-            public int Left;
-            public int Top;
-            public int Right;
-            public int Bottom;
-        }
-        #endregion
-    }
-}

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

@@ -1,228 +1,115 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
-using System.Collections.Generic;
+using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Views;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
+using System;
+using System.Collections.Generic;
+using Windows.ApplicationModel.Core;
 using WinRT.Interop;
 using WinUIEx;
 
 namespace BetterLyrics.WinUI3.Helper
 {
-    /// <summary>
-    /// Defines the <see cref="WindowHelper" />
-    /// </summary>
     public static class WindowHelper
     {
-        #region Fields
+        private static List<object> _activeWindows = [];
 
-        /// <summary>
-        /// Defines the _windowCache
-        /// </summary>
-        private static readonly Dictionary<Type, Window> _windowCache = new();
-
-        /// <summary>
-        /// Defines the _activeWindows
-        /// </summary>
-        private static List<Window> _activeWindows = new List<Window>();
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets the ActiveWindows
-        /// </summary>
-        public static List<Window> ActiveWindows
+        public static void CloseWindow<T>()
         {
-            get { return _activeWindows; }
+            var window = _activeWindows.Find(w => w is T);
+            if (window is Window w)
+            {
+                w.Close();
+                _activeWindows.Remove(w);
+            }
         }
 
-        #endregion
-
-        #region Methods
-
-        /// <summary>
-        /// The GetWindowByFramePageType
-        /// </summary>
-        /// <param name="type">The type<see cref="Type"/></param>
-        /// <returns>The <see cref="Window"/></returns>
-        public static Window GetWindowByFramePageType(Type type)
+        public static void ExitAllWindows()
         {
-            foreach (var cachedWindow in _windowCache)
+            while (_activeWindows.Count > 0)
             {
-                if (cachedWindow.Key == type)
+                var window = (Window)_activeWindows[0];
+                window.Close();
+            }
+        }
+
+        public static T? GetWindowByWindowType<T>()
+        {
+            foreach (var window in _activeWindows)
+            {
+                if (window is T castedWindow)
                 {
-                    return cachedWindow.Value;
+                    return castedWindow;
                 }
             }
-            return null;
+            return default;
         }
-
-        /// <summary>
-        /// The GetWindowForElement
-        /// </summary>
-        /// <param name="element">The element<see cref="UIElement"/></param>
-        /// <returns>The <see cref="Window"/></returns>
-        public static Window GetWindowForElement(UIElement element)
+        public static void OpenWindow<T>()
         {
-            if (element.XamlRoot != null)
+            var window = _activeWindows.Find(w => w is T);
+            if (window == null)
             {
-                foreach (Window window in _activeWindows)
+                if (typeof(T) == typeof(LyricsWindow))
                 {
-                    if (element.XamlRoot == window.Content.XamlRoot)
-                    {
-                        return window;
-                    }
+                    window = new LyricsWindow();
+                    ((LyricsWindow)window).SystemBackdrop = SystemBackdropHelper.CreateSystemBackdrop(BackdropType.Transparent);
                 }
+                else if (typeof(T) == typeof(SettingsWindow))
+                {
+                    window = new SettingsWindow();
+                }
+                else if (typeof(T) == typeof(MusicGalleryWindow))
+                {
+                    window = new MusicGalleryWindow();
+                }
+                else
+                {
+                    throw new ArgumentException("Unsupported window type", nameof(T));
+                }
+                TrackWindow(window);
             }
-            return null;
+            var castedWindow = (Window)window;
+            castedWindow.Restore();
         }
 
-        /// <summary>
-        /// The HideSystemTitleBar
-        /// </summary>
-        /// <param name="window">The window<see cref="Window"/></param>
-        public static void HideSystemTitleBar(this Window window)
+        public static void RestartApp(string args = "")
         {
-            window.ExtendsContentIntoTitleBar = true;
-            window.AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Collapsed;
-        }
+            // The restart will be executed immediately.
+            AppRestartFailureReason failureReason =
+                Microsoft.Windows.AppLifecycle.AppInstance.Restart(args);
 
-        /// <summary>
-        /// The HideSystemTitleBarAndSetCustomTitleBar
-        /// </summary>
-        /// <param name="window">The window<see cref="Window"/></param>
-        /// <param name="titleBar">The titleBar<see cref="UIElement"/></param>
-        public static void HideSystemTitleBarAndSetCustomTitleBar(
-            this Window window,
-            UIElement titleBar
-        )
-        {
-            window.HideSystemTitleBar();
-            window.SetTitleBar(titleBar);
-        }
-
-        /// <summary>
-        /// The OpenLyricsWindow
-        /// </summary>
-        public static void OpenLyricsWindow()
-        {
-            OpenOrShowWindow(typeof(LyricsPage));
-        }
-
-        /// <summary>
-        /// The OpenSettingsWindow
-        /// </summary>
-        public static void OpenSettingsWindow()
-        {
-            OpenOrShowWindow(typeof(SettingsPage));
-        }
-
-        /// <summary>
-        /// The TrackWindow
-        /// </summary>
-        /// <param name="window">The window<see cref="Window"/></param>
-        /// <param name="pageType">The pageType<see cref="Type"/></param>
-        public static void TrackWindow(Window window, Type pageType = null)
-        {
-            if (pageType != null)
+            // If the restart fails, handle it here.
+            switch (failureReason)
             {
-                _windowCache[pageType] = window;
+                case AppRestartFailureReason.RestartPending:
+                    break;
+                case AppRestartFailureReason.NotInForeground:
+                    break;
+                case AppRestartFailureReason.InvalidUser:
+                    break;
+                default: //AppRestartFailureReason.Other
+                    break;
             }
+        }
 
+        private static void TrackWindow(object window)
+        {
             if (!_activeWindows.Contains(window))
+            {
                 _activeWindows.Add(window);
-
-            window.Closed -= Window_Closed;
-            window.Closed += Window_Closed;
+                var castedWindow = (Window)window;
+                castedWindow.Closed += WindowHelper_Closed;
+            }
         }
 
-        private static void Window_Closed(object sender, WindowEventArgs e)
+        private static void WindowHelper_Closed(object sender, WindowEventArgs args)
         {
-            if (sender is Window closedWindow)
+            if (_activeWindows.Contains(sender))
             {
-                _activeWindows.Remove(closedWindow);
-
-                // 从缓存移除
-                foreach (var kvp in _windowCache)
-                {
-                    if (kvp.Value == closedWindow)
-                    {
-                        _windowCache.Remove(kvp.Key);
-                        break;
-                    }
-                }
+                _activeWindows.Remove(sender);
             }
         }
-
-        /// <summary>
-        /// The TryHide
-        /// </summary>
-        /// <param name="window">The window<see cref="Window"/></param>
-        public static void TryHide(this Window window)
-        {
-            if (window is not null)
-            {
-                window.Hide();
-            }
-        }
-
-        /// <summary>
-        /// The TryShow
-        /// </summary>
-        /// <param name="window">The window<see cref="Window"/></param>
-        public static void TryShow(this Window window)
-        {
-            if (window is not null)
-            {
-                window.Activate();
-            }
-        }
-
-        /// <summary>
-        /// The OpenOrShowWindow
-        /// </summary>
-        /// <param name="pageType">The pageType<see cref="Type"/></param>
-        private static void OpenOrShowWindow(Type pageType)
-        {
-            if (_windowCache.TryGetValue(pageType, out var window))
-            {
-                window.TryShow();
-            }
-            else
-            {
-                var newWindow = new HostWindow();
-                TrackWindow(newWindow, pageType);
-                newWindow.ViewModel.FramePageType = pageType;
-                newWindow.Navigate(pageType);
-                newWindow.Activate();
-            }
-        }
-
-        // get dpi for an element
-
-        /// <summary>
-        /// The GetRasterizationScaleForElement
-        /// </summary>
-        /// <param name="element">The element<see cref="UIElement"/></param>
-        /// <returns>The <see cref="double"/></returns>
-        static public double GetRasterizationScaleForElement(UIElement element)
-        {
-            if (element.XamlRoot != null)
-            {
-                foreach (Window window in _activeWindows)
-                {
-                    if (element.XamlRoot == window.Content.XamlRoot)
-                    {
-                        return element.XamlRoot.RasterizationScale;
-                    }
-                }
-            }
-            return 0.0;
-        }
-
-        #endregion
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Messages/ShowNotificatonMessage.cs

@@ -1,22 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Models;
-using CommunityToolkit.Mvvm.Messaging.Messages;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Messages
-{
-    /// <summary>
-    /// Defines the <see cref="ShowNotificatonMessage" />
-    /// </summary>
-    public class ShowNotificatonMessage(Notification value)
-        : ValueChangedMessage<Notification>(value)
-    {
-    }
-}

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

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/CharTiming.cs

@@ -1,34 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    /// <summary>
-    /// Defines the <see cref="CharTiming" />
-    /// </summary>
-    public class CharTiming
-    {
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets the EndMs
-        /// </summary>
-        public int EndMs { get; set; }
-
-        /// <summary>
-        /// Gets or sets the StartMs
-        /// </summary>
-        public int StartMs { get; set; }
-
-        public string Text { get; set; } = string.Empty;
-
-        public int StartIndex { get; set; }
-
-        #endregion
-    }
-}

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

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

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

@@ -4,47 +4,20 @@ using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace BetterLyrics.WinUI3.Models
 {
-    /// <summary>
-    /// Defines the <see cref="LocalLyricsFolder" />
-    /// </summary>
-    public partial class LocalLyricsFolder : ObservableObject
+    public partial class LocalMediaFolder : ObservableObject
     {
-        #region Constructors
+        [ObservableProperty]
+        public partial bool IsEnabled { get; set; }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LocalLyricsFolder"/> class.
-        /// </summary>
-        public LocalLyricsFolder()
-        {
-        }
+        [ObservableProperty]
+        public partial string Path { get; set; }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LocalLyricsFolder"/> class.
-        /// </summary>
-        /// <param name="path">The path<see cref="string"/></param>
-        /// <param name="isEnabled">The isEnabled<see cref="bool"/></param>
-        public LocalLyricsFolder(string path, bool isEnabled)
+        public LocalMediaFolder() { }
+
+        public LocalMediaFolder(string path, bool isEnabled)
         {
             Path = path;
             IsEnabled = isEnabled;
         }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets a value indicating whether IsEnabled
-        /// </summary>
-        [ObservableProperty]
-        public partial bool IsEnabled { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Path
-        /// </summary>
-        [ObservableProperty]
-        public partial string Path { get; set; }
-
-        #endregion
     }
 }

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

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

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

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

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

@@ -7,68 +7,27 @@ using Microsoft.Graphics.Canvas.Text;
 
 namespace BetterLyrics.WinUI3.Models
 {
-    /// <summary>
-    /// Defines the <see cref="LyricsLine" />
-    /// </summary>
     public class LyricsLine
     {
-        #region Properties
+        private const float _animationDuration = 0.3f;
+        public ValueTransition<float> AngleTransition { get; set; } = new(initialValue: 0f, durationSeconds: _animationDuration);
+        public ValueTransition<float> BlurAmountTransition { get; set; } = new(initialValue: 0f, durationSeconds: _animationDuration);
+        public ValueTransition<float> HighlightOpacityTransition { get; set; } = new(initialValue: 0f, durationSeconds: _animationDuration);
+        public ValueTransition<float> OpacityTransition { get; set; } = new(initialValue: 0f, durationSeconds: _animationDuration);
+        public ValueTransition<float> ScaleTransition { get; set; } = new(initialValue: 0.95f, durationSeconds: _animationDuration);
 
-        /// <summary>
-        /// Gets or sets the BlurAmountTransition
-        /// </summary>
-        public ValueTransition<float> BlurAmountTransition { get; set; } =
-            new(initialValue: 0f, durationSeconds: 0.3f);
-
-        /// <summary>
-        /// Gets or sets the CanvasTextLayout
-        /// </summary>
         public CanvasTextLayout? CanvasTextLayout { get; set; }
 
-        /// <summary>
-        /// Gets or sets the CenterPosition
-        /// </summary>
         public Vector2 CenterPosition { get; set; }
-
-        /// <summary>
-        /// Gets or sets the CharTimings
-        /// </summary>
-        public List<CharTiming> CharTimings { get; set; } = [];
-
-        /// <summary>
-        /// Gets the DurationMs
-        /// </summary>
-        public int DurationMs => EndMs - StartMs;
-
-        /// <summary>
-        /// Gets or sets the EndMs
-        /// </summary>
-        public int EndMs { get; set; }
-
-        public ValueTransition<float> HighlightOpacityTransition { get; set; } =
-            new(initialValue: 0f, durationSeconds: 0.3f);
-
-        /// <summary>
-        /// Gets or sets the Position
-        /// </summary>
         public Vector2 Position { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ScaleTransition
-        /// </summary>
-        public ValueTransition<float> ScaleTransition { get; set; } =
-            new(initialValue: 0.95f, durationSeconds: 0.3f);
+        public List<LyricsChar> LyricsChars { get; set; } = [];
 
-        /// <summary>
-        /// Gets or sets the StartMs
-        /// </summary>
+        public int? DurationMs => EndMs - StartMs;
+        public int? EndMs { get; set; }
         public int StartMs { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Text
-        /// </summary>
-        public string Text { get; set; } = "";
-
-        #endregion
+        public string DisplayedText { get; set; } = "";
+        public string OriginalText { get; set; } = "";
     }
 }

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

@@ -5,47 +5,21 @@ using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace BetterLyrics.WinUI3.Models
 {
-    /// <summary>
-    /// Defines the <see cref="LyricsSearchProviderInfo" />
-    /// </summary>
     public partial class LyricsSearchProviderInfo : ObservableObject
     {
-        #region Constructors
+        [ObservableProperty]
+        public partial bool IsEnabled { get; set; }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LyricsSearchProviderInfo"/> class.
-        /// </summary>
-        public LyricsSearchProviderInfo()
-        {
-        }
+        [ObservableProperty]
+        public partial LyricsSearchProvider Provider { get; set; }
+
+        public LyricsSearchProviderInfo() { }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LyricsSearchProviderInfo"/> class.
-        /// </summary>
-        /// <param name="provider">The provider<see cref="LyricsSearchProvider"/></param>
-        /// <param name="isEnabled">The isEnabled<see cref="bool"/></param>
         public LyricsSearchProviderInfo(LyricsSearchProvider provider, bool isEnabled)
         {
             Provider = provider;
             IsEnabled = isEnabled;
         }
 
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets a value indicating whether IsEnabled
-        /// </summary>
-        [ObservableProperty]
-        public partial bool IsEnabled { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Provider
-        /// </summary>
-        [ObservableProperty]
-        public partial LyricsSearchProvider Provider { get; set; }
-
-        #endregion
     }
 }

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

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

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

@@ -1,78 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using CommunityToolkit.Mvvm.ComponentModel;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    /// <summary>
-    /// Defines the <see cref="Notification" />
-    /// </summary>
-    public partial class Notification : ObservableObject
-    {
-        #region Constructors
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Notification"/> class.
-        /// </summary>
-        /// <param name="message">The message<see cref="string?"/></param>
-        /// <param name="severity">The severity<see cref="InfoBarSeverity"/></param>
-        /// <param name="isForeverDismissable">The isForeverDismissable<see cref="bool"/></param>
-        /// <param name="relatedSettingsKeyName">The relatedSettingsKeyName<see cref="string?"/></param>
-        public Notification(
-            string? message = null,
-            InfoBarSeverity severity = InfoBarSeverity.Informational,
-            bool isForeverDismissable = false,
-            string? relatedSettingsKeyName = null
-        )
-        {
-            Message = message;
-            Severity = severity;
-            IsForeverDismissable = isForeverDismissable;
-            Visibility = IsForeverDismissable ? Visibility.Visible : Visibility.Collapsed;
-            RelatedSettingsKeyName = relatedSettingsKeyName;
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets a value indicating whether IsForeverDismissable
-        /// </summary>
-        [ObservableProperty]
-        public partial bool IsForeverDismissable { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Message
-        /// </summary>
-        [ObservableProperty]
-        public partial string? Message { get; set; }
-
-        /// <summary>
-        /// Gets or sets the RelatedSettingsKeyName
-        /// </summary>
-        [ObservableProperty]
-        public partial string? RelatedSettingsKeyName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Severity
-        /// </summary>
-        [ObservableProperty]
-        public partial InfoBarSeverity Severity { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Visibility
-        /// </summary>
-        [ObservableProperty]
-        public partial Visibility Visibility { get; set; }
-
-        #endregion
-    }
-}

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

@@ -1,63 +1,31 @@
 // 2025/6/23 by Zhe Fang
 
 using CommunityToolkit.Mvvm.ComponentModel;
+using Windows.Graphics.Imaging;
+using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Models
 {
-    /// <summary>
-    /// Defines the <see cref="SongInfo" />
-    /// </summary>
     public partial class SongInfo : ObservableObject
     {
-        #region Constructors
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SongInfo"/> class.
-        /// </summary>
-        public SongInfo()
-        {
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets the Album
-        /// </summary>
         [ObservableProperty]
         public partial string? Album { get; set; }
 
-        /// <summary>
-        /// Gets or sets the AlbumArt
-        /// </summary>
-        public byte[]? AlbumArt { get; set; } = null;
-
-        /// <summary>
-        /// Gets or sets the Artist
-        /// </summary>
         [ObservableProperty]
         public partial string Artist { get; set; }
 
-        /// <summary>
-        /// Gets or sets the DurationMs
-        /// In milliseconds
-        /// </summary>
+        [ObservableProperty]
+        public partial int? Duration { get; set; }
+
         [ObservableProperty]
         public partial double? DurationMs { get; set; }
 
-        /// <summary>
-        /// Gets or sets the SourceAppUserModelId
-        /// </summary>
         [ObservableProperty]
         public partial string? SourceAppUserModelId { get; set; } = null;
 
-        /// <summary>
-        /// Gets or sets the Title
-        /// </summary>
         [ObservableProperty]
         public partial string Title { get; set; }
 
-        #endregion
+        public SongInfo() { }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/TranslateResponse.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public class TranslateResponse
+    {
+        [JsonPropertyName("translatedText")]
+        public string TranslatedText { get; set; }
+    }
+}

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

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

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

@@ -5,6 +5,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:canvas="using:Microsoft.Graphics.Canvas.UI.Xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:local="using:BetterLyrics.WinUI3.Renderer"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
@@ -14,5 +15,15 @@
             x:Name="LyricsCanvas"
             Draw="LyricsCanvas_Draw"
             Update="LyricsCanvas_Update" />
+        <Grid
+            Margin="36"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
+            Visibility="{x:Bind ViewModel.IsTranslating, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+            <FontIcon
+                x:Name="RotatingIcon"
+                FontFamily="{StaticResource IconFontFamily}"
+                Glyph="&#xE8C1;" />
+        </Grid>
     </Grid>
 </UserControl>

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

@@ -1,74 +1,30 @@
 // 2025/6/23 by Zhe Fang
 
-using System.Diagnostics;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
+using Microsoft.UI.Xaml.Media.Animation;
 
 namespace BetterLyrics.WinUI3.Renderer
 {
-    /// <summary>
-    /// Defines the <see cref="LyricsRenderer" />
-    /// </summary>
     public sealed partial class LyricsRenderer : UserControl
     {
-        #region Constructors
+        public LyricsRendererViewModel ViewModel { get; set; }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LyricsRenderer"/> class.
-        /// </summary>
         public LyricsRenderer()
         {
             InitializeComponent();
             ViewModel = Ioc.Default.GetRequiredService<LyricsRendererViewModel>();
         }
 
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets the ViewModel
-        /// </summary>
-        public LyricsRendererViewModel ViewModel { get; set; }
-
-        #endregion
-
-        #region Methods
-
-        /// <summary>
-        /// The LyricsCanvas_Draw
-        /// </summary>
-        /// <param name="sender">The sender<see cref="Microsoft.Graphics.Canvas.UI.Xaml.ICanvasAnimatedControl"/></param>
-        /// <param name="args">The args<see cref="Microsoft.Graphics.Canvas.UI.Xaml.CanvasAnimatedDrawEventArgs"/></param>
-        private void LyricsCanvas_Draw(
-            Microsoft.Graphics.Canvas.UI.Xaml.ICanvasAnimatedControl sender,
-            Microsoft.Graphics.Canvas.UI.Xaml.CanvasAnimatedDrawEventArgs args
-        )
+        private void LyricsCanvas_Draw(Microsoft.Graphics.Canvas.UI.Xaml.ICanvasAnimatedControl sender, Microsoft.Graphics.Canvas.UI.Xaml.CanvasAnimatedDrawEventArgs args)
         {
             ViewModel.Draw(sender, args.DrawingSession);
         }
 
-        /// <summary>
-        /// The LyricsCanvas_Update
-        /// </summary>
-        /// <param name="sender">The sender<see cref="Microsoft.Graphics.Canvas.UI.Xaml.ICanvasAnimatedControl"/></param>
-        /// <param name="args">The args<see cref="Microsoft.Graphics.Canvas.UI.Xaml.CanvasAnimatedUpdateEventArgs"/></param>
-        private void LyricsCanvas_Update(
-            Microsoft.Graphics.Canvas.UI.Xaml.ICanvasAnimatedControl sender,
-            Microsoft.Graphics.Canvas.UI.Xaml.CanvasAnimatedUpdateEventArgs args
-        )
+        private void LyricsCanvas_Update(Microsoft.Graphics.Canvas.UI.Xaml.ICanvasAnimatedControl sender, Microsoft.Graphics.Canvas.UI.Xaml.CanvasAnimatedUpdateEventArgs args)
         {
             ViewModel.Update(sender, args);
         }
-
-        #endregion
     }
 }

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

@@ -1,21 +1,20 @@
 // 2025/6/23 by Zhe Fang
 
-using BetterLyrics.WinUI3.Models;
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using BetterLyrics.WinUI3.Models;
 
 namespace BetterLyrics.WinUI3.Serialization
 {
-    /// <summary>
-    /// Defines the <see cref="SourceGenerationContext" />
-    /// </summary>
+
+    [JsonSerializable(typeof(List<AlbumArtSearchProviderInfo>))]
     [JsonSerializable(typeof(List<LyricsSearchProviderInfo>))]
-    [JsonSerializable(typeof(List<LocalLyricsFolder>))]
+    [JsonSerializable(typeof(List<MediaSourceProviderInfo>))]
+    [JsonSerializable(typeof(List<LocalMediaFolder>))]
     [JsonSerializable(typeof(List<string>))]
+    [JsonSerializable(typeof(TranslateResponse))]
     [JsonSerializable(typeof(JsonElement))]
     [JsonSourceGenerationOptions(WriteIndented = true)]
-    internal partial class SourceGenerationContext : JsonSerializerContext
-    {
-    }
+    internal partial class SourceGenerationContext : JsonSerializerContext { }
 }

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

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

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

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

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

@@ -1,41 +1,19 @@
 // 2025/6/23 by Zhe Fang
 
-using BetterLyrics.WinUI3.Events;
-using BetterLyrics.WinUI3.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using BetterLyrics.WinUI3.Events;
+using BetterLyrics.WinUI3.Models;
 
 namespace BetterLyrics.WinUI3.Services
 {
-    #region Interfaces
-
-    /// <summary>
-    /// Defines the <see cref="ILibWatcherService" />
-    /// </summary>
     public interface ILibWatcherService
     {
-        #region Events
-
-        /// <summary>
-        /// Defines the MusicLibraryFilesChanged
-        /// </summary>
         event EventHandler<LibChangedEventArgs>? MusicLibraryFilesChanged;
 
-        #endregion
-
-        #region Methods
-
-        /// <summary>
-        /// The UpdateWatchers
-        /// </summary>
-        /// <param name="folders">The folders<see cref="List{LocalLyricsFolder}"/></param>
-        public void UpdateWatchers(List<LocalLyricsFolder> folders);
-
-        #endregion
+        public void UpdateWatchers(List<LocalMediaFolder> folders);
     }
-
-    #endregion
 }

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

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

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

@@ -1,47 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Enums;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Services
-{
-    #region Interfaces
-
-    /// <summary>
-    /// Defines the <see cref="IMusicSearchService" />
-    /// </summary>
-    public interface IMusicSearchService
-    {
-        #region Methods
-
-        /// <summary>
-        /// The SearchAlbumArtAsync
-        /// </summary>
-        /// <param name="title">The title<see cref="string"/></param>
-        /// <param name="artist">The artist<see cref="string"/></param>
-        /// <returns>The <see cref="byte[]?"/></returns>
-        byte[]? SearchAlbumArtAsync(string title, string artist);
-
-        /// <summary>
-        /// The SearchLyricsAsync
-        /// </summary>
-        /// <param name="title">The title<see cref="string"/></param>
-        /// <param name="artist">The artist<see cref="string"/></param>
-        /// <param name="album">The album<see cref="string"/></param>
-        /// <param name="durationMs">The durationMs<see cref="double"/></param>
-        /// <param name="matchMode">The matchMode<see cref="MusicSearchMatchMode"/></param>
-        /// <returns>The <see cref="Task{(string?, LyricsFormat?)}"/></returns>
-        Task<(string?, LyricsFormat?)> SearchLyricsAsync(
-            string title,
-            string artist,
-            string album = "",
-            double durationMs = 0.0,
-            MusicSearchMatchMode matchMode = MusicSearchMatchMode.TitleAndArtist
-        );
-
-        #endregion
-    }
-
-    #endregion
-}

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

@@ -1,56 +1,27 @@
 // 2025/6/23 by Zhe Fang
 
+using System;
+using System.Threading.Tasks;
 using BetterLyrics.WinUI3.Events;
 using BetterLyrics.WinUI3.Models;
-using System;
 
 namespace BetterLyrics.WinUI3.Services
 {
-    #region Interfaces
-
-    /// <summary>
-    /// Defines the <see cref="IPlaybackService" />
-    /// </summary>
     public interface IPlaybackService
     {
-        #region Events
-
-        /// <summary>
-        /// Defines the IsPlayingChanged
-        /// </summary>
         event EventHandler<IsPlayingChangedEventArgs>? IsPlayingChanged;
-
-        /// <summary>
-        /// Defines the PositionChanged
-        /// </summary>
         event EventHandler<PositionChangedEventArgs>? PositionChanged;
-
-        /// <summary>
-        /// Defines the SongInfoChanged
-        /// </summary>
         event EventHandler<SongInfoChangedEventArgs>? SongInfoChanged;
+        event EventHandler<AlbumArtChangedEventArgs>? AlbumArtChangedChanged;
+        event EventHandler<MediaSourceProvidersInfoEventArgs>? MediaSourceProvidersInfoChanged;
 
-        #endregion
+        Task PlayAsync();
+        Task PauseAsync();
+        Task PreviousAsync();
+        Task NextAsync();
+        Task ChangePosition(double seconds);
 
-        #region Properties
-
-        /// <summary>
-        /// Gets a value indicating whether IsPlaying
-        /// </summary>
         bool IsPlaying { get; }
-
-        /// <summary>
-        /// Gets the Position
-        /// </summary>
-        TimeSpan Position { get; }
-
-        /// <summary>
-        /// Gets the SongInfo
-        /// </summary>
         SongInfo? SongInfo { get; }
-
-        #endregion
     }
-
-    #endregion
 }

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

@@ -3,145 +3,103 @@
 using System.Collections.Generic;
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Models;
-using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
-using Windows.UI.Text;
+using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Services
 {
-    #region Interfaces
-
-    /// <summary>
-    /// Defines the <see cref="ISettingsService" />
-    /// </summary>
     public interface ISettingsService
     {
-        #region Properties
-
         // App behavior
 
-        /// <summary>
-        /// Gets or sets the AutoStartWindowType
-        /// </summary>
         AutoStartWindowType AutoStartWindowType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the BackdropType
-        /// </summary>
-        BackdropType BackdropType { get; set; }
-
-        // Album art cover style
-
-        /// <summary>
-        /// Gets or sets the CoverImageRadius
-        /// </summary>
         int CoverImageRadius { get; set; }
 
-        /// <summary>
-        /// Gets or sets the CoverOverlayBlurAmount
-        /// </summary>
         int CoverOverlayBlurAmount { get; set; }
-
-        /// <summary>
-        /// Gets or sets the CoverOverlayOpacity
-        /// </summary>
         int CoverOverlayOpacity { get; set; }
-
-        // Album art background
-
-        /// <summary>
-        /// Gets or sets a value indicating whether IsCoverOverlayEnabled
-        /// </summary>
-        bool IsCoverOverlayEnabled { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether IsDynamicCoverOverlayEnabled
-        /// </summary>
         bool IsDynamicCoverOverlayEnabled { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether IsFirstRun
-        /// </summary>
+        bool IsFanLyricsEnabled { get; set; }
         bool IsFirstRun { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether IsLyricsGlowEffectEnabled
-        /// </summary>
         bool IsLyricsGlowEffectEnabled { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Language
-        /// </summary>
         Language Language { get; set; }
+        int DesktopWindowLeft { get; set; }
+        int DesktopWindowTop { get; set; }
+        int DesktopWindowWidth { get; set; }
+        int DesktopWindowHeight { get; set; }
 
+        int StandardWindowWidth { get; set; }
+        int StandardWindowHeight { get; set; }
+        int StandardWindowLeft { get; set; }
+        int StandardWindowTop { get; set; }
+
+        bool AutoLockOnDesktopMode { get; set; }
+
+        string LibreTranslateServer { get; set; }
+        int SelectedTargetLanguageIndex { get; set; }
+        bool ResetPositionOffsetOnSongChanged { get; set; }
+        int PositionOffset { get; set; }
         // Lyrics lib
 
-        /// <summary>
-        /// Gets or sets the LocalLyricsFolders
-        /// </summary>
-        List<LocalLyricsFolder> LocalLyricsFolders { get; set; }
+        List<LocalMediaFolder> LocalMediaFolders { get; set; }
 
         // Lyrics style and effetc
 
-        /// <summary>
-        /// Gets or sets the LyricsAlignmentType
-        /// </summary>
-        LyricsAlignmentType LyricsAlignmentType { get; set; }
+        TextAlignmentType LyricsAlignmentType { get; set; }
+        TextAlignmentType SongInfoAlignmentType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the LyricsBlurAmount
-        /// </summary>
         int LyricsBlurAmount { get; set; }
 
-        /// <summary>
-        /// Gets or sets the LyricsFontColorType
-        /// </summary>
-        LyricsFontColorType LyricsFontColorType { get; set; }
+        Color LyricsCustomBgFontColor { get; set; }
+        Color LyricsCustomFgFontColor { get; set; }
+        Color LyricsCustomStrokeFontColor { get; set; }
+
+        int LyricsBgFontOpacity { get; set; }
+
+        LyricsFontColorType LyricsBgFontColorType { get; set; }
+        LyricsFontColorType LyricsFgFontColorType { get; set; }
+        LyricsFontColorType LyricsStrokeFontColorType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the LyricsFontSize
-        /// </summary>
         int LyricsFontSize { get; set; }
 
-        /// <summary>
-        /// Gets or sets the LyricsFontWeight
-        /// </summary>
+        ElementTheme LyricsBackgroundTheme { get; set; }
+
+        int LyricsFontStrokeWidth { get; set; }
+
         LyricsFontWeight LyricsFontWeight { get; set; }
 
-        /// <summary>
-        /// Gets or sets the LyricsGlowEffectScope
-        /// </summary>
         LineRenderingType LyricsGlowEffectScope { get; set; }
+        LineRenderingType LyricsHighlightScope { get; set; }
+
+        bool IsLyricsFloatAnimationEnabled { get; set; }
 
-        /// <summary>
-        /// Gets or sets the LyricsLineSpacingFactor
-        /// </summary>
         float LyricsLineSpacingFactor { get; set; }
 
-        /// <summary>
-        /// Gets or sets the LyricsSearchProvidersInfo
-        /// </summary>
         List<LyricsSearchProviderInfo> LyricsSearchProvidersInfo { get; set; }
+        List<AlbumArtSearchProviderInfo> AlbumArtSearchProvidersInfo { get; set; }
+        List<MediaSourceProviderInfo> MediaSourceProvidersInfo { get; set; }
+
+        EasingType LyricsScrollEasingType { get; set; }
+        int LyricsScrollDuration { get; set; }
 
-        /// <summary>
-        /// Gets or sets the LyricsVerticalEdgeOpacity
-        /// </summary>
         int LyricsVerticalEdgeOpacity { get; set; }
 
-        // App appearance
+        bool IgnoreFullscreenWindow { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ThemeType
-        /// </summary>
-        ElementTheme ThemeType { get; set; }
+        bool IsTranslationEnabled { get; set; }
+        bool ShowTranslationOnly { get; set; }
 
-        /// <summary>
-        /// Gets or sets the TitleBarType
-        /// </summary>
-        TitleBarType TitleBarType { get; set; }
+        LyricsDisplayType DisplayType { get; set; }
 
-        #endregion
+        int TimelineSyncThreshold { get; set; }
+        int LockHotKeyIndex { get; set; }
+        bool IsImmersiveMode { get; set; }
+        string LXMusicServer { get; set; }
+        DockPlacement DockPlacement { get; set; }
+        bool HideWindowWhenNotPlaying { get; set; }
+        int DockWindowHeight { get; set; }
+        int SelectedFontFamilyIndex { get; set; }
+        string LyricsFontFamily { get; set; }
+        bool IsDragEverywhereEnabled { get; set; }
     }
-
-    #endregion
 }

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

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

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

@@ -2,136 +2,83 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using BetterLyrics.WinUI3.Events;
+using BetterLyrics.WinUI3.Models;
 
 namespace BetterLyrics.WinUI3.Services
 {
-    using global::BetterLyrics.WinUI3.Events;
-    using global::BetterLyrics.WinUI3.Models;
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-
-    namespace BetterLyrics.WinUI3.Services
+    public class LibWatcherService : IDisposable, ILibWatcherService
     {
-        /// <summary>
-        /// Defines the <see cref="LibWatcherService" />
-        /// </summary>
-        public class LibWatcherService : IDisposable, ILibWatcherService
+        private readonly ISettingsService _settingsService;
+
+        private readonly Dictionary<string, FileSystemWatcher> _watchers = [];
+
+        public LibWatcherService(ISettingsService settingsService)
         {
-            #region Fields
+            _settingsService = settingsService;
+            UpdateWatchers(_settingsService.LocalMediaFolders);
+        }
 
-            /// <summary>
-            /// Defines the _settingsService
-            /// </summary>
-            private readonly ISettingsService _settingsService;
+        public event EventHandler<LibChangedEventArgs>? MusicLibraryFilesChanged;
 
-            /// <summary>
-            /// Defines the _watchers
-            /// </summary>
-            private readonly Dictionary<string, FileSystemWatcher> _watchers = [];
-
-            #endregion
-
-            #region Constructors
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="LibWatcherService"/> class.
-            /// </summary>
-            /// <param name="settingsService">The settingsService<see cref="ISettingsService"/></param>
-            public LibWatcherService(ISettingsService settingsService)
+        public void Dispose()
+        {
+            foreach (var watcher in _watchers.Values)
             {
-                _settingsService = settingsService;
-                UpdateWatchers(_settingsService.LocalLyricsFolders);
+                watcher.Dispose();
             }
+            _watchers.Clear();
+        }
 
-            #endregion
-
-            #region Events
-
-            /// <summary>
-            /// Defines the MusicLibraryFilesChanged
-            /// </summary>
-            public event EventHandler<LibChangedEventArgs>? MusicLibraryFilesChanged;
-
-            #endregion
-
-            #region Methods
-
-            /// <summary>
-            /// The Dispose
-            /// </summary>
-            public void Dispose()
+        public void UpdateWatchers(List<LocalMediaFolder> folders)
+        {
+            // 移除不再监听的
+            foreach (var key in _watchers.Keys.ToList())
             {
-                foreach (var watcher in _watchers.Values)
+                if (!folders.Any(x => x.Path == key && x.IsEnabled))
                 {
-                    watcher.Dispose();
-                }
-                _watchers.Clear();
-            }
-
-            /// <summary>
-            /// The UpdateWatchers
-            /// </summary>
-            /// <param name="folders">The folders<see cref="List{LocalLyricsFolder}"/></param>
-            public void UpdateWatchers(List<LocalLyricsFolder> folders)
-            {
-                // 移除不再监听的
-                foreach (var key in _watchers.Keys.ToList())
-                {
-                    if (!folders.Any(x => x.Path == key && x.IsEnabled))
-                    {
-                        _watchers[key].Dispose();
-                        _watchers.Remove(key);
-                    }
-                }
-
-                // 添加新的监听
-                foreach (var folder in folders)
-                {
-                    if (
-                        !_watchers.ContainsKey(folder.Path)
-                        && Directory.Exists(folder.Path)
-                        && folder.IsEnabled
-                    )
-                    {
-                        var watcher = new FileSystemWatcher(folder.Path)
-                        {
-                            IncludeSubdirectories = true,
-                            EnableRaisingEvents = true,
-                        };
-                        watcher.Created += (s, e) => OnChanged(folder.Path, e);
-                        watcher.Changed += (s, e) => OnChanged(folder.Path, e);
-                        watcher.Deleted += (s, e) => OnChanged(folder.Path, e);
-                        watcher.Renamed += (s, e) => OnChanged(folder.Path, e);
-                        _watchers[folder.Path] = watcher;
-                    }
+                    _watchers[key].Dispose();
+                    _watchers.Remove(key);
                 }
             }
 
-            /// <summary>
-            /// The OnChanged
-            /// </summary>
-            /// <param name="folder">The folder<see cref="string"/></param>
-            /// <param name="e">The e<see cref="FileSystemEventArgs"/></param>
-            private void OnChanged(string folder, FileSystemEventArgs e)
+            // 添加新的监听
+            foreach (var folder in folders)
             {
-                App.DispatcherQueue!.TryEnqueue(
-                    Microsoft.UI.Dispatching.DispatcherQueuePriority.High,
-                    () =>
+                if (
+                    !_watchers.ContainsKey(folder.Path)
+                    && Directory.Exists(folder.Path)
+                    && folder.IsEnabled
+                )
+                {
+                    var watcher = new FileSystemWatcher(folder.Path)
                     {
-                        MusicLibraryFilesChanged?.Invoke(
-                            this,
-                            new LibChangedEventArgs(folder, e.FullPath, e.ChangeType)
-                        );
-                    }
-                );
+                        IncludeSubdirectories = true,
+                        EnableRaisingEvents = true,
+                    };
+                    watcher.Created += (s, e) => OnChanged(folder.Path, e);
+                    watcher.Changed += (s, e) => OnChanged(folder.Path, e);
+                    watcher.Deleted += (s, e) => OnChanged(folder.Path, e);
+                    watcher.Renamed += (s, e) => OnChanged(folder.Path, e);
+                    _watchers[folder.Path] = watcher;
+                }
             }
+        }
 
-            #endregion
+        private void OnChanged(string folder, FileSystemEventArgs e)
+        {
+            App.DispatcherQueue!.TryEnqueue(
+                Microsoft.UI.Dispatching.DispatcherQueuePriority.High,
+                () =>
+                {
+                    MusicLibraryFilesChanged?.Invoke(
+                        this,
+                        new LibChangedEventArgs(folder, e.FullPath, e.ChangeType)
+                    );
+                }
+            );
         }
     }
 }