chores: remove unused files

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

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

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

@@ -1,6 +1,6 @@
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Hooks;
-using BetterLyrics.WinUI3.Models.Db;
+using BetterLyrics.WinUI3.Models.DbContext;
 using BetterLyrics.WinUI3.Services.AlbumArtSearchService;
 using BetterLyrics.WinUI3.Services.DiscordService;
 using BetterLyrics.WinUI3.Services.FileSystemService;
@@ -18,7 +18,6 @@ using BetterLyrics.WinUI3.Services.TransliterationService;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -26,7 +25,6 @@ using Microsoft.UI.Xaml;
 using Microsoft.Windows.AppLifecycle; // 关键：App生命周期管理
 using Serilog;
 using System;
-using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml.cs

@@ -1,8 +1,6 @@
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
-using System.Threading.Tasks;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

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

@@ -1,5 +1,5 @@
 using BetterLyrics.WinUI3.Hooks;
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs

@@ -5,9 +5,9 @@ using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Logic;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Lyrics;
 using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Renderer;
-using BetterLyrics.WinUI3.Services.LastFMService;
 using BetterLyrics.WinUI3.Services.GSMTCService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.DependencyInjection;
@@ -25,7 +25,6 @@ using System.Threading.Tasks;
 using Windows.Foundation;
 using Windows.Storage.Streams;
 using Windows.UI;
-using System.Numerics;
 
 namespace BetterLyrics.WinUI3.Controls
 {

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

@@ -8,6 +8,7 @@
     xmlns:dev="using:DevWinUI"
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:local="using:BetterLyrics.WinUI3.Controls"
+    xmlns:lyricsmodels="using:BetterLyrics.WinUI3.Models.Lyrics"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:models="using:BetterLyrics.WinUI3.Models"
     xmlns:ui="using:CommunityToolkit.WinUI"
@@ -242,7 +243,7 @@
                         </interactivity:DataTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
                     <Pivot.HeaderTemplate>
-                        <DataTemplate x:DataType="models:LyricsData">
+                        <DataTemplate x:DataType="lyricsmodels:LyricsData">
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock Style="{StaticResource BodyTextBlockStyle}" Text="{x:Bind LanguageCode, Mode=OneWay, Converter={StaticResource LanguageCodeToDisplayedNameConverter}}" />
                                 <InfoBadge
@@ -254,13 +255,13 @@
                         </DataTemplate>
                     </Pivot.HeaderTemplate>
                     <Pivot.ItemTemplate>
-                        <DataTemplate x:DataType="models:LyricsData">
+                        <DataTemplate x:DataType="lyricsmodels:LyricsData">
                             <ListView
                                 ItemContainerStyle="{StaticResource ListViewStretchedItemContainerStyle}"
                                 ItemsSource="{x:Bind LyricsLines, Mode=OneWay}"
                                 SelectionMode="None">
                                 <ListView.ItemTemplate>
-                                    <DataTemplate x:DataType="models:LyricsLine">
+                                    <DataTemplate x:DataType="lyricsmodels:LyricsLine">
                                         <Grid Margin="0,6" ColumnSpacing="6">
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="Auto" />

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

@@ -1,4 +1,4 @@
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Lyrics;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml.Controls;

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

@@ -1,6 +1,6 @@
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Hooks;
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Serialization;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.ViewModels;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml

@@ -10,6 +10,7 @@
     xmlns:local="using:BetterLyrics.WinUI3.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:models="using:BetterLyrics.WinUI3.Models"
+    xmlns:settingsmodels="using:BetterLyrics.WinUI3.Models.Settings"
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
@@ -50,7 +51,7 @@
                         ItemsSource="{x:Bind ViewModel.AppSettings.LocalMediaFolders, Mode=OneWay}"
                         SelectionMode="None">
                         <ListView.ItemTemplate>
-                            <DataTemplate x:DataType="models:MediaFolder">
+                            <DataTemplate x:DataType="settingsmodels:MediaFolder">
                                 <dev:SettingsExpander IsExpanded="True">
 
                                     <dev:SettingsExpander.HeaderIcon>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs

@@ -1,11 +1,8 @@
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using System;
-using System.Threading.Tasks;
-using Windows.System;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml.cs

@@ -1,20 +1,14 @@
 using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Hooks;
-using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.Services.GSMTCService;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using CommunityToolkit.Mvvm.Messaging;
-using CommunityToolkit.Mvvm.Messaging.Messages;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media.Imaging;
 using System;
 using System.Numerics;
-using BetterLyrics.WinUI3.Extensions;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PatronControl.xaml.cs

@@ -1,17 +1,5 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlayQueue.xaml.cs

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

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

@@ -13,6 +13,7 @@
     xmlns:local="using:BetterLyrics.WinUI3.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:models="using:BetterLyrics.WinUI3.Models"
+    xmlns:settingsmodels="using:BetterLyrics.WinUI3.Models.Settings"
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
@@ -60,7 +61,7 @@
                         ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
                         SelectedItem="{x:Bind ViewModel.SelectedMediaSourceProvider, Mode=TwoWay}">
                         <ComboBox.ItemTemplate>
-                            <DataTemplate x:DataType="models:MediaSourceProviderInfo">
+                            <DataTemplate x:DataType="settingsmodels:MediaSourceProviderInfo">
                                 <Grid Padding="2,4" ColumnSpacing="12">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto" />
@@ -172,7 +173,7 @@
                                 <ScalarTransition />
                             </ListView.OpacityTransition>
                             <ListView.ItemTemplate>
-                                <DataTemplate x:DataType="models:AlbumArtSearchProviderInfo">
+                                <DataTemplate x:DataType="settingsmodels:AlbumArtSearchProviderInfo">
                                     <dev:SettingsCard Header="{Binding Provider, Converter={StaticResource AlbumArtSearchProviderToDisplayNameConverter}, Mode=OneWay}">
                                         <dev:SettingsCard.HeaderIcon>
                                             <FontIcon FontFamily="Segoe UI Symbol" Glyph="&#x283F;" />
@@ -219,7 +220,7 @@
                                 </Style>
                             </ListView.ItemContainerStyle>
                             <ListView.ItemTemplate>
-                                <DataTemplate x:DataType="models:LyricsSearchProviderInfo">
+                                <DataTemplate x:DataType="settingsmodels:LyricsSearchProviderInfo">
                                     <Grid>
                                         <dev:SettingsExpander Header="{Binding Provider, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}, Mode=OneWay}" IsExpanded="{Binding IsMatchingThresholdOverwritten, Mode=OneWay}">
                                             <dev:SettingsExpander.HeaderIcon>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs

@@ -1,6 +1,6 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.LocalizationService;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/StatsDashboardControl.xaml.cs

@@ -1,20 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using 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 BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using BetterLyrics.WinUI3.Enums;
+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.

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/WindowSettingsControl.xaml.cs

@@ -1,5 +1,4 @@
 using BetterLyrics.WinUI3.Hooks;
-using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/DoubleToDecimalConverter.cs

@@ -1,7 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace BetterLyrics.WinUI3.Converter
 {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PathToImageConverter.cs

@@ -2,9 +2,7 @@
 using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Text;
 
 namespace BetterLyrics.WinUI3.Converter
 {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/UriStringToDecodedAbsoluteUri.cs

@@ -1,8 +1,6 @@
 using BetterLyrics.WinUI3.Extensions;
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace BetterLyrics.WinUI3.Converter
 {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AutoScanInterval.cs

@@ -1,8 +1,4 @@
-using System;
+namespace BetterLyrics.WinUI3.Enums
-using System.Collections.Generic;
-using System.Text;
-
-namespace BetterLyrics.WinUI3.Enums
 {
     public enum AutoScanInterval
     {

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

@@ -1,14 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum Language
-    {
-        FollowSystem,
-        English,
-        SimplifiedChinese,
-        TraditionalChinese,
-        Japanese,
-        Korean,
-    }
-}

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

@@ -1,10 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum LocalSearchTargetProps
-    {
-        LyricsOnly,
-        LyricsAndAlbumArt,
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/SettingsStoreType.cs

@@ -1,8 +0,0 @@
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum SettingsStoreType
-    {
-        Container,
-        JSON
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ShortcutID.cs

@@ -1,6 +1,6 @@
 namespace BetterLyrics.WinUI3.Enums
 {
-    public enum ShortcutID
+    public enum ShortcutId
     {
         LyricsWindowShowOrHide,
         LyricsWindowSwitch,

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/StatsRange.cs

@@ -1,8 +1,4 @@
-using System;
+namespace BetterLyrics.WinUI3.Enums
-using System.Collections.Generic;
-using System.Text;
-
-namespace BetterLyrics.WinUI3.Enums
 {
     public enum StatsRange
     {

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

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Windows.Graphics.Imaging;
-using Windows.UI;
-
-namespace BetterLyrics.WinUI3.Events
-{
-    public class AlbumArtChangedEventArgs(SoftwareBitmap? albumArtSwBitmap, List<Color> albumArtLightAccentColors, List<Color> albumArtDarkAccentColors) : EventArgs
-    {
-        public SoftwareBitmap? AlbumArtSwBitmap { get; set; } = albumArtSwBitmap;
-        public List<Color> AlbumArtLightAccentColors { get; set; } = albumArtLightAccentColors;
-        public List<Color> AlbumArtDarkAccentColors { get; set; } = albumArtDarkAccentColors;
-    }
-}

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

@@ -1,14 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
-using System.IO;
-
-namespace BetterLyrics.WinUI3.Events
-{
-    public class LibChangedEventArgs(string folder, string filePath, WatcherChangeTypes changeType) : EventArgs
-    {
-        public WatcherChangeTypes ChangeType { get; } = changeType;
-        public string FilePath { get; } = filePath;
-        public string Folder { get; } = folder;
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LyricsChangedEventArgs.cs

@@ -1,10 +0,0 @@
-using BetterLyrics.WinUI3.Models;
-using System;
-
-namespace BetterLyrics.WinUI3.Events
-{
-    public class LyricsChangedEventArgs(LyricsData? lyricsData) : EventArgs
-    {
-        public LyricsData? LyricsData { get; } = lyricsData;
-    }
-}

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

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsDataExtensions.cs

@@ -1,9 +1,8 @@
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Lyrics;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace BetterLyrics.WinUI3.Extensions
 {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsSearchProviderExtensions.cs

@@ -1,6 +1,4 @@
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Helper;
-using System;
 
 namespace BetterLyrics.WinUI3.Extensions
 {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsWindowStatusExtensions.cs

@@ -1,6 +1,5 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Hooks;
-using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.LocalizationService;
 using BetterLyrics.WinUI3.Views;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/SongInfoExtensions.cs

@@ -1,4 +1,5 @@
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Entities;
 using System;
 using System.Globalization;
 using System.Security.Cryptography;

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

@@ -4,7 +4,6 @@ using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Hooks;
 using Microsoft.UI;
 using Microsoft.UI.Xaml;
-using SkiaSharp;
 using System;
 using System.Collections.Generic;
 using System.Drawing.Imaging;

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

@@ -3,7 +3,6 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Serialization;
 using System;
 using System.Collections.Generic;
 using System.IO;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FolderTreeBuilder.cs

@@ -1,8 +1,9 @@
-using System;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Settings;
+using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Collections.ObjectModel;
-using BetterLyrics.WinUI3.Models;
+using System.Linq;
 
 public static class FolderTreeBuilder
 {

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

@@ -3,7 +3,6 @@ using BetterLyrics.WinUI3.Services.LocalizationService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using NTextCat;
 using System.Collections.Generic;
-using System.ComponentModel.Design;
 using System.Globalization;
 using System.Linq;
 using Windows.Globalization;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WebDavProbeHelper.cs

@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Helper

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/GlobalHotKeyHook.cs

@@ -20,7 +20,7 @@ namespace BetterLyrics.WinUI3.Hooks
         /// <param name="id"></param>
         /// <param name="keys"></param>
         /// <param name="action"></param>
-        private static void RegisterHotKey(Window window, ShortcutID id, List<string> keys, Action action)
+        private static void RegisterHotKey(Window window, ShortcutId id, List<string> keys, Action action)
         {
             if (keys.Count == 0) return;
 
@@ -58,7 +58,7 @@ namespace BetterLyrics.WinUI3.Hooks
             }
         }
 
-        private static void UnregisterHotKey(Window window, ShortcutID id)
+        private static void UnregisterHotKey(Window window, ShortcutId id)
         {
             HWND hwnd = WindowNative.GetWindowHandle(window);
             User32.UnregisterHotKey(hwnd, (int)id);
@@ -66,13 +66,13 @@ namespace BetterLyrics.WinUI3.Hooks
             _keys.Remove((int)id);
         }
 
-        public static void UpdateHotKey(Window window, ShortcutID id, List<string> keys, Action action)
+        public static void UpdateHotKey(Window window, ShortcutId id, List<string> keys, Action action)
         {
             UnregisterHotKey(window, id);
             RegisterHotKey(window, id, keys, action);
         }
 
-        public static bool IsHotKeyRegistered(ShortcutID id)
+        public static bool IsHotKeyRegistered(ShortcutId id)
         {
             return _actions.ContainsKey((int)id);
         }
@@ -82,7 +82,7 @@ namespace BetterLyrics.WinUI3.Hooks
             return _keys.ContainsValue(keys);
         }
 
-        public static bool TryInvokeAction(ShortcutID id)
+        public static bool TryInvokeAction(ShortcutId id)
         {
             return TryInvokeAction((int)id);
         }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/TaskbarHook.cs

@@ -7,7 +7,6 @@ using FlaUI.Core.EventHandlers;
 using FlaUI.UIA3;
 using Microsoft.UI.Dispatching;
 using System;
-using System.Diagnostics;
 using System.Drawing;
 using System.Threading;
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs

@@ -1,7 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.WinUI;
 using Microsoft.UI.Dispatching;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsAnimator.cs

@@ -1,6 +1,7 @@
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Lyrics;
 using BetterLyrics.WinUI3.Models.Settings;
+using DevWinUI;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -31,7 +32,7 @@ namespace BetterLyrics.WinUI3.Logic
             bool isLayoutChanged,
             bool isPrimaryPlayingLineChanged,
             bool isMouseScrollingChanged,
-            double currentProgressMs
+            double currentPositionMs
         )
         {
             if (lines == null) return;
@@ -48,7 +49,7 @@ namespace BetterLyrics.WinUI3.Logic
                 var line = lines.ElementAtOrDefault(i);
                 if (line == null) continue;
 
-                bool isSecondaryLinePlaying = currentProgressMs >= line.StartMs && currentProgressMs <= line.EndMs;
+                bool isSecondaryLinePlaying = line.StartMs <= currentPositionMs && currentPositionMs <= line.EndMs;
                 if (i == primaryPlayingLineIndex) isSecondaryLinePlaying = true;
                 bool isSecondaryLinePlayingChanged = line.IsPlayingLastFrame != isSecondaryLinePlaying;
                 line.IsPlayingLastFrame = isSecondaryLinePlaying;
@@ -150,6 +151,93 @@ namespace BetterLyrics.WinUI3.Logic
                     line.YOffsetTransition.StartTransition(targetYScrollOffset);
                 }
 
+                if (line.RenderLyricsOriginalChars != null)
+                {
+                    foreach (var renderChar in line.RenderLyricsOriginalChars)
+                    {
+                        var syllable = line.LyricsSyllables.FirstOrDefault(x => x.StartIndex <= renderChar.Index && renderChar.Index <= x.EndIndex);
+                        if (syllable == null) continue;
+
+                        var avgCharDuration = syllable.DurationMs / syllable.Length;
+                        if (avgCharDuration == null || avgCharDuration == 0) continue;
+
+                        var charStartMs = syllable.StartMs + (renderChar.Index - syllable.StartIndex) * avgCharDuration.Value;
+                        var charEndMs = charStartMs + avgCharDuration;
+                        var progressPlayed = (currentPositionMs - charStartMs) / avgCharDuration.Value;
+                        progressPlayed = Math.Clamp(progressPlayed, 0, 1);
+                        renderChar.ProgressPlayed = progressPlayed;
+
+                        bool isCharPlaying = charStartMs <= currentPositionMs && currentPositionMs <= charEndMs;
+                        bool isCharPlayingChanged = renderChar.IsPlayingLastFrame != isCharPlaying;
+
+                        if (isSecondaryLinePlayingChanged || isCharPlayingChanged)
+                        {
+                            if (lyricsEffect.IsLyricsScaleEffectEnabled)
+                            {
+                                double targetScale =
+                                    lyricsEffect.IsLyricsScaleEffectAmountAutoAdjust ? 1.15 : lyricsEffect.LyricsScaleEffectAmount / 100.0;
+
+                                if (isCharPlayingChanged)
+                                {
+                                    if (syllable.DurationMs >= lyricsEffect.LyricsScaleEffectLongSyllableDuration)
+                                    {
+                                        renderChar.ScaleTransition.SetDuration((syllable.DurationMs ?? 0) / 1000.0 / 2);
+                                        renderChar.ScaleTransition.StartTransition(isCharPlaying ? targetScale : 1);
+                                    }
+                                }
+                            }
+
+                            if (lyricsEffect.IsLyricsGlowEffectEnabled)
+                            {
+                                double targetGlow = lyricsEffect.IsLyricsGlowEffectAmountAutoAdjust ? renderChar.LayoutRect.Height * 0.2 : lyricsEffect.LyricsGlowEffectAmount;
+                                switch (lyricsEffect.LyricsGlowEffectScope)
+                                {
+                                    case Enums.LyricsEffectScope.LongDurationSyllable:
+                                        if (isCharPlayingChanged)
+                                        {
+                                            if (syllable.DurationMs >= lyricsEffect.LyricsGlowEffectLongSyllableDuration)
+                                            {
+                                                renderChar.GlowTransition.SetDuration((syllable.DurationMs ?? 0) / 1000.0 / 2);
+                                                renderChar.GlowTransition.StartTransition(isCharPlaying ? targetGlow : 0);
+                                            }
+                                        }
+                                        break;
+                                    case Enums.LyricsEffectScope.LineStartToCurrentChar:
+                                        if (isSecondaryLinePlayingChanged)
+                                        {
+                                            renderChar.GlowTransition.SetDuration(renderChar.AnimationDuration);
+                                            renderChar.GlowTransition.StartTransition(isSecondaryLinePlaying ? targetGlow : 0);
+                                        }
+                                        break;
+                                    default:
+                                        break;
+                                }
+                            }
+
+                            if (lyricsEffect.IsLyricsFloatAnimationEnabled)
+                            {
+                                double targetFloat =
+                                    lyricsEffect.IsLyricsFloatAnimationAmountAutoAdjust ? renderChar.LayoutRect.Height * 0.1 : lyricsEffect.LyricsFloatAnimationAmount;
+
+                                if (isSecondaryLinePlayingChanged)
+                                {
+                                    renderChar.FloatTransition.StartTransition(isSecondaryLinePlaying ? targetFloat : 0);
+                                }
+                                if (isCharPlayingChanged)
+                                {
+                                    renderChar.FloatTransition.StartTransition(0);
+                                }
+                            }
+
+                            renderChar.IsPlayingLastFrame = isCharPlaying;
+                        }
+
+                        renderChar.ScaleTransition.Update(elapsedTime);
+                        renderChar.GlowTransition.Update(elapsedTime);
+                        renderChar.FloatTransition.Update(elapsedTime);
+                    }
+                }
+
                 line.AngleTransition.Update(elapsedTime);
                 line.ScaleTransition.Update(elapsedTime);
                 line.BlurAmountTransition.Update(elapsedTime);

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsLayoutManager.cs

@@ -1,5 +1,5 @@
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Lyrics;
 using BetterLyrics.WinUI3.Models.Settings;
 using Microsoft.Graphics.Canvas.UI.Xaml;
 using System;
@@ -123,6 +123,8 @@ namespace BetterLyrics.WinUI3.Logic
 
                 // 更新中心点
                 line.UpdateCenterPosition(lyricsWidth, style.LyricsAlignmentType);
+
+                line.RecalculateCharacterGeometries();
             }
         }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsSynchronizer.cs

@@ -1,4 +1,5 @@
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Lyrics;
 using System;
 using System.Collections.Generic;
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/FilesIndexDbContext.cs

@@ -1,14 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace BetterLyrics.WinUI3.Models.Db
-{
-    public partial class FilesIndexDbContext : DbContext
-    {
-        public FilesIndexDbContext(DbContextOptions<FilesIndexDbContext> options) : base(options) { }
-
-        public DbSet<FilesIndexItem> FilesIndex { get; set; }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/LyricsCacheDbContext.cs

@@ -1,14 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace BetterLyrics.WinUI3.Models.Db
-{
-    public partial class LyricsCacheDbContext : DbContext
-    {
-        public LyricsCacheDbContext(DbContextOptions<LyricsCacheDbContext> options) : base(options) { }
-
-        public DbSet<LyricsCacheItem> LyricsCache { get; set; } 
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/PlayHistoryDbContext.cs

@@ -1,14 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace BetterLyrics.WinUI3.Models.Db
-{
-    public partial class PlayHistoryDbContext : DbContext
-    {
-        public PlayHistoryDbContext(DbContextOptions<PlayHistoryDbContext> options) : base(options) { }
-
-        public DbSet<PlayHistoryItem> PlayHistory { get; set; }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/FilesIndexDbContext.cs

@@ -0,0 +1,12 @@
+using BetterLyrics.WinUI3.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+
+namespace BetterLyrics.WinUI3.Models.DbContext
+{
+    public partial class FilesIndexDbContext : Microsoft.EntityFrameworkCore.DbContext
+    {
+        public FilesIndexDbContext(DbContextOptions<FilesIndexDbContext> options) : base(options) { }
+
+        public DbSet<FilesIndexItem> FilesIndex { get; set; }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/LyricsCacheDbContext.cs

@@ -0,0 +1,11 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace BetterLyrics.WinUI3.Models.DbContext
+{
+    public partial class LyricsCacheDbContext : Microsoft.EntityFrameworkCore.DbContext
+    {
+        public LyricsCacheDbContext(DbContextOptions<LyricsCacheDbContext> options) : base(options) { }
+
+        public DbSet<LyricsCacheItem> LyricsCache { get; set; }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/PlayHistoryDbContext.cs

@@ -0,0 +1,12 @@
+using BetterLyrics.WinUI3.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+
+namespace BetterLyrics.WinUI3.Models.DbContext
+{
+    public partial class PlayHistoryDbContext : Microsoft.EntityFrameworkCore.DbContext
+    {
+        public PlayHistoryDbContext(DbContextOptions<PlayHistoryDbContext> options) : base(options) { }
+
+        public DbSet<PlayHistoryItem> PlayHistory { get; set; }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/SongSearchMapDbContext.cs

@@ -1,11 +1,8 @@
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
-namespace BetterLyrics.WinUI3.Models.Db
+namespace BetterLyrics.WinUI3.Models.DbContext
 {
-    public partial class SongSearchMapDbContext : DbContext
+    public partial class SongSearchMapDbContext : Microsoft.EntityFrameworkCore.DbContext
     {
         public DbSet<MappedSongSearchQuery> SongSearchMap { get; set; }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/FilesIndexItem.cs

@@ -3,7 +3,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace BetterLyrics.WinUI3.Models
+namespace BetterLyrics.WinUI3.Models.Entities
 {
     [Index(nameof(MediaFolderId))] // 普通索引
     [Index(nameof(ParentUri))]     // 普通索引

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/LyricsCacheItem.cs

@@ -1,8 +1,6 @@
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Extensions;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.EntityFrameworkCore;
-using NTextCat.Commons;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/PlayHistoryItem.cs

@@ -3,7 +3,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace BetterLyrics.WinUI3.Models
+namespace BetterLyrics.WinUI3.Models.Entities
 {
     [Index(nameof(Title))]
     [Index(nameof(Artist))]

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs

@@ -1,5 +1,6 @@
 using ATL;
 using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models.Entities;
 using System;
 using System.IO;
 using System.Linq;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FolderNode.cs

@@ -1,9 +1,6 @@
 using BetterLyrics.WinUI3.Enums;
 using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Text;
 
 namespace BetterLyrics.WinUI3.Models
 {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Http/CutletDockerRequest.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace BetterLyrics.WinUI3.Models
+namespace BetterLyrics.WinUI3.Models.Http
 {
     public class CutletDockerRequest
     {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Http/CutletDockerResponse.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace BetterLyrics.WinUI3.Models
+namespace BetterLyrics.WinUI3.Models.Http
 {
     public class CutletDockerResponse
     {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Http/LibreTranslateResponse.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace BetterLyrics.WinUI3.Models
+namespace BetterLyrics.WinUI3.Models.Http
 {
     public class LibreTranslateResponse
     {

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

@@ -0,0 +1,12 @@
+namespace BetterLyrics.WinUI3.Models.Lyrics
+{
+    public class LyricsChar
+    {
+        public int StartMs { get; set; }
+        public int EndMs { get; set; }
+        public int DurationMs => EndMs - StartMs;
+
+        public string Text { get; set; } = "";
+        public int Index { get; set; }
+    }
+}

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

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace BetterLyrics.WinUI3.Models
+namespace BetterLyrics.WinUI3.Models.Lyrics
 {
     public class LyricsData
     {

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

@@ -2,7 +2,7 @@
 
 using System.Collections.Generic;
 
-namespace BetterLyrics.WinUI3.Models
+namespace BetterLyrics.WinUI3.Models.Lyrics
 {
     public class LyricsLine
     {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsSyllable.cs

@@ -1,13 +1,18 @@
 // 2025/6/23 by Zhe Fang
 
-namespace BetterLyrics.WinUI3.Models
+namespace BetterLyrics.WinUI3.Models.Lyrics
 {
     public class LyricsSyllable
     {
-        public int? EndMs { get; set; }
-        public int StartIndex { get; set; }
-        public int StartMs { get; set; }
         public string Text { get; set; } = string.Empty;
+        public int Length => Text.Length;
+
+        public int StartIndex { get; set; }
+        public int EndIndex => StartIndex + Length - 1;
+
+        public int StartMs { get; set; }
+        public int? EndMs { get; set; }
+
         public int? DurationMs => EndMs - StartMs;
         public bool IsLongDuration => DurationMs >= 700;
     }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsChar.cs

@@ -0,0 +1,40 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using Windows.Foundation;
+
+namespace BetterLyrics.WinUI3.Models.Lyrics
+{
+    public class RenderLyricsChar : LyricsChar
+    {
+        public Rect LayoutRect { get; set; }
+
+        public double AnimationDuration { get; set; } = 0.3;
+
+        public ValueTransition<double> ScaleTransition { get; set; }
+        public ValueTransition<double> GlowTransition { get; set; }
+        public ValueTransition<double> FloatTransition { get; set; }
+
+        public double ProgressPlayed { get; set; } = 0; // 0~1
+
+        public bool IsPlayingLastFrame { get; set; } = false;
+
+        public RenderLyricsChar()
+        {
+            ScaleTransition = new(
+                initialValue: 1.0,
+                durationSeconds: AnimationDuration,
+                easingType: EasingType.EaseInOutSine
+            );
+            GlowTransition = new(
+                initialValue: 0,
+                durationSeconds: AnimationDuration,
+                easingType: EasingType.EaseInOutSine
+            );
+            FloatTransition = new(
+                initialValue: 0,
+                durationSeconds: AnimationDuration,
+                easingType: EasingType.EaseInOutSine
+            );
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsLine.cs

@@ -5,14 +5,19 @@ using Microsoft.Graphics.Canvas.Geometry;
 using Microsoft.Graphics.Canvas.Text;
 using Microsoft.Graphics.Canvas.UI.Xaml;
 using Microsoft.UI;
+using System.Collections.Generic;
+using System.Linq;
 using System.Numerics;
 using Windows.UI;
 
-namespace BetterLyrics.WinUI3.Models
+namespace BetterLyrics.WinUI3.Models.Lyrics
 {
     public class RenderLyricsLine : LyricsLine
     {
+        public List<RenderLyricsChar> RenderLyricsOriginalChars { get; set; } = [];
+
         public double AnimationDuration { get; set; } = 0.3;
+
         public ValueTransition<double> AngleTransition { get; set; }
         public ValueTransition<double> BlurAmountTransition { get; set; }
         public ValueTransition<double> PhoneticOpacityTransition { get; set; }
@@ -231,5 +236,26 @@ namespace BetterLyrics.WinUI3.Models
             }
         }
 
+        public void RecalculateCharacterGeometries()
+        {
+            RenderLyricsOriginalChars.Clear();
+            if (OriginalCanvasTextLayout == null) return;
+
+            var textLength = OriginalText.Length;
+
+            for (int i = 0; i < textLength; i++)
+            {
+                var region = OriginalCanvasTextLayout.GetCharacterRegions(i, 1).FirstOrDefault();
+                var bounds = region.LayoutBounds;
+
+                RenderLyricsOriginalChars.Add(new RenderLyricsChar()
+                {
+                    Index = i,
+                    LayoutRect = bounds,
+                    Text = OriginalText[i].ToString()
+                });
+            }
+        }
+
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayerStatDisplayItem.cs

@@ -1,15 +0,0 @@
-using BetterLyrics.WinUI3.Helper;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    public class PlayerStatDisplayItem
-    {
-        public string PlayerId { get; set; }
-        public int PlayCount { get; set; }
-
-        public string PlayerName => PlayerIdHelper.GetDisplayName(PlayerId);
-    }
-}

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

@@ -3,7 +3,7 @@
 using BetterLyrics.WinUI3.Enums;
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace BetterLyrics.WinUI3.Models
+namespace BetterLyrics.WinUI3.Models.Settings
 {
     public partial class AlbumArtSearchProviderInfo : ObservableRecipient
     {

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

@@ -3,7 +3,7 @@
 using BetterLyrics.WinUI3.Enums;
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace BetterLyrics.WinUI3.Models
+namespace BetterLyrics.WinUI3.Models.Settings
 {
     public partial class LyricsSearchProviderInfo : ObservableRecipient
     {

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

@@ -1,6 +1,5 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Hooks;
-using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.UI.Dispatching;
@@ -10,7 +9,7 @@ using System.Linq;
 using System.Text.Json.Serialization;
 using Windows.Foundation;
 
-namespace BetterLyrics.WinUI3.Models
+namespace BetterLyrics.WinUI3.Models.Settings
 {
     public partial class LyricsWindowStatus : ObservableRecipient, ICloneable
     {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MediaFolder.cs

@@ -6,9 +6,8 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Text.Json.Serialization;
-using System.Threading;
 
-namespace BetterLyrics.WinUI3.Models
+namespace BetterLyrics.WinUI3.Models.Settings
 {
     public partial class MediaFolder : ObservableRecipient
     {

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

@@ -8,7 +8,7 @@ using System;
 using System.Linq;
 using System.Text.Json.Serialization;
 
-namespace BetterLyrics.WinUI3.Models
+namespace BetterLyrics.WinUI3.Models.Settings
 {
     public partial class MediaSourceProviderInfo : ObservableRecipient
     {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MusicGallerySettings.cs

@@ -1,6 +1,5 @@
 using BetterLyrics.WinUI3.Enums;
 using CommunityToolkit.Mvvm.ComponentModel;
-using System;
 using System.Collections.ObjectModel;
 
 namespace BetterLyrics.WinUI3.Models.Settings

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

@@ -1,8 +1,7 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.ViewModels;
-using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace BetterLyrics.WinUI3.Models
+namespace BetterLyrics.WinUI3.Models.Settings
 {
     public partial class SongsTabInfo : BaseViewModel
     {

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

@@ -1,7 +1,6 @@
 // 2025/6/23 by Zhe Fang
 
 using CommunityToolkit.Mvvm.ComponentModel;
-using NTextCat.Commons;
 using System;
 
 namespace BetterLyrics.WinUI3.Models

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/ArtistPlayCount.cs

@@ -1,8 +1,4 @@
-using System;
+namespace BetterLyrics.WinUI3.Models.Stats
-using System.Collections.Generic;
-using System.Text;
-
-namespace BetterLyrics.WinUI3.Models.Stats
 {
     public class ArtistPlayCount
     {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/HourlyStatBar.cs

@@ -1,8 +1,4 @@
-using System;
+namespace BetterLyrics.WinUI3.Models.Stats
-using System.Collections.Generic;
-using System.Text;
-
-namespace BetterLyrics.WinUI3.Models.Stats
 {
     public class HourlyStatBar
     {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/PlayerStats.cs

@@ -1,8 +1,4 @@
-using System;
+namespace BetterLyrics.WinUI3.Models.Stats
-using System.Collections.Generic;
-using System.Text;
-
-namespace BetterLyrics.WinUI3.Models.Stats
 {
     public class PlayerStats
     {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/SongPlayCount.cs

@@ -1,8 +1,4 @@
-using System;
+namespace BetterLyrics.WinUI3.Models.Stats
-using System.Collections.Generic;
-using System.Text;
-
-namespace BetterLyrics.WinUI3.Models.Stats
 {
     public class SongPlayCount
     {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Lrc.cs

@@ -1,4 +1,4 @@
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Lyrics;
 using System;
 using System.Collections.Generic;
 using System.Linq;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.QrcKrc.cs

@@ -1,4 +1,4 @@
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Lyrics;
 using System.Collections.Generic;
 using System.Linq;
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Ttml.cs

@@ -1,8 +1,7 @@
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Lyrics;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.RegularExpressions;
 using System.Xml.Linq;
 
 namespace BetterLyrics.WinUI3.Parsers.LyricsParser

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.cs

@@ -4,6 +4,7 @@ using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Lyrics;
 using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.TranslationService;
 using BetterLyrics.WinUI3.Services.TransliterationService;

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

@@ -1,5 +1,6 @@
 using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Lyrics;
 using BetterLyrics.WinUI3.Models.Settings;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Effects;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/PlayingLineRenderer.cs

@@ -1,5 +1,6 @@
 using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Lyrics;
 using BetterLyrics.WinUI3.Models.Settings;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Brushes;
@@ -7,7 +8,6 @@ using Microsoft.Graphics.Canvas.Effects;
 using Microsoft.Graphics.Canvas.Text;
 using Microsoft.Graphics.Canvas.UI.Xaml;
 using System;
-using System.Linq;
 using System.Numerics;
 using Windows.Foundation;
 using Windows.UI;
@@ -118,7 +118,7 @@ namespace BetterLyrics.WinUI3.Renderer
 
             foreach (var subLineRegion in lineRegions)
             {
-                DrawSubLineRegion(resourceCreator, ds, source, line, subLineRegion, curCharIndex, fadeWidth, bgColor, fgColor, state, settings);
+                DrawSubLineRegion(resourceCreator, ds, source, line, subLineRegion, curCharIndex, fadeWidth, bgColor, fgColor, settings);
             }
         }
 
@@ -132,7 +132,6 @@ namespace BetterLyrics.WinUI3.Renderer
             float fadeWidth,
             Color bgColor,
             Color fgColor,
-            LinePlaybackState state,
             LyricsEffectSettings settings)
         {
             var playedOpacity = line.PlayedOriginalOpacityTransition.Value;
@@ -187,7 +186,7 @@ namespace BetterLyrics.WinUI3.Renderer
                         int endCharIndex = subLineRegion.CharacterIndex + subLineRegion.CharacterCount;
                         for (int i = subLineRegion.CharacterIndex; i < endCharIndex; i++)
                         {
-                            DrawSingleCharacter(ds, line, i, curCharIndex, textWithOpacityLayer, state, settings);
+                            DrawSingleCharacter(ds, line, i, textWithOpacityLayer);
                         }
                     }
                 }
@@ -199,161 +198,43 @@ namespace BetterLyrics.WinUI3.Renderer
         /// </summary>
         /// <param name="ds"></param>
         /// <param name="line"></param>
-        /// <param name="charIndex">遍历的字符索引</param>
+        /// <param name="charIndex">遍历的字符索引（相对于整行）</param>
-        /// <param name="exactProgressIndex">当前播放字符相对于整行的索引</param>
+        /// <param name="exactProgressIndex">当前播放字符的索引（相对于整行）</param>
         /// <param name="source"></param>
         /// <param name="state"></param>
-        /// <param name="settings"></param>
         private void DrawSingleCharacter(
             CanvasDrawingSession ds,
             RenderLyricsLine line,
             int charIndex,
-            double exactProgressIndex,
+            ICanvasImage source)
-            ICanvasImage source,
-            LinePlaybackState state,
-            LyricsEffectSettings settings)
         {
-            var curCharIndexInt = (int)Math.Floor(exactProgressIndex);
+            if (charIndex >= line.RenderLyricsOriginalChars.Count) return;
-            if (line.OriginalCanvasTextLayout == null) return;
 
-            var charRegions = line.OriginalCanvasTextLayout.GetCharacterRegions(charIndex, 1);
+            RenderLyricsChar renderChar = line.RenderLyricsOriginalChars[charIndex];
-            if (charRegions.Length == 0) return;
-            var charRegion = charRegions[0];
-            var charLayoutBounds = charRegion.LayoutBounds;
 
+            var rect = renderChar.LayoutRect;
             var sourceCharRect = new Rect(
-                charLayoutBounds.X + line.OriginalPosition.X,
+                rect.X + line.OriginalPosition.X,
-                charLayoutBounds.Y + line.OriginalPosition.Y,
+                rect.Y + line.OriginalPosition.Y,
-                charLayoutBounds.Width,
+                rect.Width,
-                charLayoutBounds.Height
+                rect.Height
             );
 
-            double floatOffset = 0;
+            double scale = renderChar.ScaleTransition.Value;
-            double scale = 1;
+            double glow = renderChar.GlowTransition.Value;
-            double glow = 0;
+            double floatOffset = renderChar.FloatTransition.Value;
 
-            bool drawGlow = false;
+            var destCharRect = sourceCharRect.Scale(scale).AddY(floatOffset);
 
-            if (settings.IsLyricsFloatAnimationEnabled)
+            // Draw glow
-            {
+            if (glow > 0)
-                double targetFloatOffset;
-                if (settings.IsLyricsFloatAnimationAmountAutoAdjust)
-                {
-                    targetFloatOffset = sourceCharRect.Height * 0.1;
-                }
-                else
-                {
-                    targetFloatOffset = settings.LyricsFloatAnimationAmount;
-                }
-
-                // 已经浮完了的
-                if (charIndex < curCharIndexInt)
-                {
-                    floatOffset = 0;
-                }
-                // 正在浮的
-                else if (charIndex == curCharIndexInt)
-                {
-                    var p = exactProgressIndex - curCharIndexInt;
-                    floatOffset = -targetFloatOffset + p * targetFloatOffset;
-                }
-                // 还没浮的
-                else
-                {
-                    floatOffset = -targetFloatOffset;
-                }
-
-                // 制造句间上浮过度动画，这里用任何一个 Transition 都行，主要是获取当前行的进入视野的 Progress
-                floatOffset *= line.YOffsetTransition.Progress;
-            }
-
-            var parentSyllable = line.LyricsSyllables.FirstOrDefault(x => x.StartIndex <= charIndex && charIndex < x.StartIndex + x.Text.Length);
-
-            if (settings.IsLyricsScaleEffectEnabled)
-            {
-                if (parentSyllable != null && parentSyllable.StartIndex == state.SyllableStartIndex)
-                {
-                    if (parentSyllable.DurationMs >= settings.LyricsScaleEffectLongSyllableDuration)
-                    {
-                        if (settings.IsLyricsScaleEffectAmountAutoAdjust)
-                        {
-                            scale += Math.Sin(state.SyllableProgress * Math.PI) * 0.15;
-                        }
-                        else
-                        {
-                            scale += Math.Sin(state.SyllableProgress * Math.PI) * (settings.LyricsScaleEffectAmount / 100.0 - 1);
-                        }
-                    }
-                }
-            }
-
-            if (settings.IsLyricsGlowEffectEnabled)
-            {
-                double maxGlow;
-                if (settings.IsLyricsGlowEffectAmountAutoAdjust)
-                {
-                    maxGlow = sourceCharRect.Height * 0.2;
-                }
-                else
-                {
-                    maxGlow = settings.LyricsGlowEffectAmount;
-                }
-                switch (settings.LyricsGlowEffectScope)
-                {
-                    case Enums.LyricsEffectScope.LongDurationSyllable:
-                        if (parentSyllable != null && parentSyllable.StartIndex == state.SyllableStartIndex)
-                        {
-                            if (parentSyllable.DurationMs >= settings.LyricsGlowEffectLongSyllableDuration)
-                            {
-                                glow = maxGlow * Math.Sin(state.SyllableProgress * Math.PI);
-                                drawGlow = true;
-                            }
-                        }
-                        break;
-                    case Enums.LyricsEffectScope.LineStartToCurrentChar:
-                        // 已经唱了的
-                        if (charIndex < curCharIndexInt)
-                        {
-                            glow = maxGlow;
-                            drawGlow = true;
-                        }
-                        // 正在唱的
-                        else if (charIndex == curCharIndexInt)
-                        {
-                            var p = exactProgressIndex - curCharIndexInt;
-                            glow = p * maxGlow;
-                            drawGlow = true;
-                        }
-                        // 还没唱的
-                        else { }
-                        glow *= Math.Clamp(line.OriginalText.Length - exactProgressIndex, 0, 1);
-                        break;
-                    default:
-                        break;
-                }
-            }
-
-            var destCharRect = sourceCharRect.Scale(scale).AddY(-floatOffset);
-
-            if (drawGlow)
             {
                 var sourcePlayedCharRect = new Rect(
                     sourceCharRect.X,
                     sourceCharRect.Y,
-                    sourceCharRect.Width,
+                    sourceCharRect.Width * renderChar.ProgressPlayed,
                     sourceCharRect.Height
                 );
-
-                if (charIndex == curCharIndexInt)
-                {
-                    var p = exactProgressIndex - curCharIndexInt;
-                    sourcePlayedCharRect.Width *= p;
-                }
-                else if (charIndex > curCharIndexInt)
-                {
-                    sourcePlayedCharRect.Width = 0;
-                }
-
                 using (var glowEffect = new GaussianBlurEffect
                 {
                     Source = new CropEffect
@@ -366,10 +247,11 @@ namespace BetterLyrics.WinUI3.Renderer
                     BorderMode = EffectBorderMode.Soft
                 })
                 {
-                    ds.DrawImage(glowEffect, destCharRect.Extend(sourceCharRect.Height), sourceCharRect.Extend(sourceCharRect.Height));
+                    ds.DrawImage(glowEffect, destCharRect.Extend(destCharRect.Height), sourceCharRect.Extend(sourceCharRect.Height));
                 }
             }
 
+            // Draw the top layer
             ds.DrawImage(source, destCharRect, sourceCharRect);
         }
     }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/UnplayingLineRenderer.cs

@@ -1,4 +1,4 @@
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Lyrics;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Effects;
 using Microsoft.Graphics.Canvas.Text;

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

@@ -1,6 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Http;
 using BetterLyrics.WinUI3.Models.Settings;
 using System.Text.Json;
 using System.Text.Json.Serialization;

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

@@ -1,6 +1,7 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Entities;
 using BetterLyrics.WinUI3.Services.FileSystemService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using Microsoft.Extensions.Logging;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs

@@ -1,8 +1,9 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Models.Db;
+using BetterLyrics.WinUI3.Models.DbContext;
-using BetterLyrics.WinUI3.Services.FileSystemService.Providers;
+using BetterLyrics.WinUI3.Models.Entities;
+using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.LocalizationService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.ViewModels;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IFileSystemService.cs

@@ -1,5 +1,5 @@
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Entities;
-using BetterLyrics.WinUI3.Services.FileSystemService.Providers;
+using BetterLyrics.WinUI3.Models.Settings;
 using System;
 using System.Collections.Generic;
 using System.IO;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IUnifiedFileSystem.cs

@@ -1,4 +1,4 @@
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Entities;
 using System;
 using System.Collections.Generic;
 using System.IO;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/FTPFileSystem.cs

@@ -1,11 +1,11 @@
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Entities;
+using BetterLyrics.WinUI3.Models.Settings;
 using FluentFTP;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net; // 用于 WebUtility.UrlDecode
-using System.Text; // ★ 修复 Encoding 报错的关键
 using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/LocalFileSystem.cs

@@ -1,5 +1,6 @@
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Entities;
+using BetterLyrics.WinUI3.Models.Settings;
 using System;
 using System.Collections.Generic;
 using System.IO;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBFileSystem.cs

@@ -1,5 +1,6 @@
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Entities;
+using BetterLyrics.WinUI3.Models.Settings;
 using SMBLibrary;
 using SMBLibrary.Client;
 using System;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/WebDavFileSystem.cs

@@ -1,5 +1,6 @@
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Entities;
+using BetterLyrics.WinUI3.Models.Settings;
 using System;
 using System.Collections.Generic;
 using System.IO;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.AlbumArtUpdater.cs

@@ -2,6 +2,7 @@
 using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Settings;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.Extensions.Logging;
 using Microsoft.UI;
@@ -9,7 +10,6 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.LyricsUpdater.cs

@@ -1,11 +1,10 @@
 using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Lyrics;
 using BetterLyrics.WinUI3.Parsers.LyricsParser;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.WinUI;
 using Microsoft.Extensions.Logging;
-using Microsoft.UI.Dispatching;
 using System.Threading;
 using System.Threading.Tasks;
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.cs

@@ -3,7 +3,6 @@
 using BetterLyrics.WinUI3.Collections;
 using BetterLyrics.WinUI3.Constants;
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Events;
 using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Hooks;
@@ -29,7 +28,6 @@ using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System;
-using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Text.Json;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/IGSMTCService.cs

@@ -1,6 +1,8 @@
 // 2025/6/23 by Zhe Fang
 
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Lyrics;
+using BetterLyrics.WinUI3.Models.Settings;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System;
 using System.ComponentModel;