From 181a06c932fe46f4531af661f6ccebc1a694ca99 Mon Sep 17 00:00:00 2001 From: Zhe Fang Date: Sun, 23 Nov 2025 09:46:18 -0500 Subject: [PATCH] add: support 0 duration for lyrics animation --- .../BetterLyrics.WinUI3/Constants/Link.cs | 23 +++--- .../Controls/AboutControl.xaml | 13 ++-- .../Controls/LyricsEffectSettingsControl.xaml | 8 +- .../Controls/LyricsSearchControl.xaml | 4 + .../Controls/LyricsWindowSettingsControl.xaml | 2 +- .../Controls/PlaybackSettingsControl.xaml | 19 ++--- .../Helper/CanvasHelper.cs | 5 +- .../BetterLyrics.WinUI3/Helper/FileHelper.cs | 2 + .../Helper/ValueTransition.cs | 7 +- .../BetterLyrics.WinUI3/Models/LyricsLine.cs | 73 +++++++++++-------- .../Models/LyricsSearchResult.cs | 3 + .../Services/DiscordService/DiscordService.cs | 2 +- .../LyricsSearchService.cs | 2 +- .../Strings/en-US/Resources.resw | 11 ++- .../Strings/ja-JP/Resources.resw | 11 ++- .../Strings/ko-KR/Resources.resw | 11 ++- .../Strings/zh-CN/Resources.resw | 11 ++- .../Strings/zh-TW/Resources.resw | 11 ++- .../ViewModels/AboutControlViewModel.cs | 2 +- .../LyricsRendererViewModel.Draw.cs | 2 +- .../LyricsRendererViewModel.Update.cs | 22 +++++- 21 files changed, 161 insertions(+), 83 deletions(-) diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Link.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Link.cs index 7dca2e4..8650113 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Link.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Link.cs @@ -2,16 +2,17 @@ { public static class Link { - public const string MicrosoftStoreUrl = "https://apps.microsoft.com/detail/9p1wcd1p597r"; - public const string GitHubUrl = "https://github.com/jayfunc/BetterLyrics"; - public const string ShareHubUrl = $"{GitHubUrl}/blob/dev/ShareHub/index.md"; - public const string TermsOfServiceUrl = $"{GitHubUrl}/blob/dev/TermsofService.md"; - public const string PrivacyPolicy = $"{GitHubUrl}/blob/dev/PrivacyPolicy.md"; - public const string WikiUrl = "https://jayfunc.blog/work/betterlyrics"; - public const string AppleMusicCfgUrl = $"{WikiUrl}#lyrics-sources-configuration"; - public const string FAQUrl = $"{WikiUrl}#faq"; - public const string QQGroupUrl = "https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info"; - public const string DiscordUrl = "https://discord.gg/5yAQPnyCKv"; - public const string TelegramUrl = "https://t.me/+svhSLZ7awPsxNGY1"; + public const string MicrosoftStore = "https://apps.microsoft.com/detail/9p1wcd1p597r"; + + public const string GitHub = "https://github.com/jayfunc/BetterLyrics"; + public const string ShareHub = $"{GitHub}/blob/dev/ShareHub/index.md"; + public const string TermsOfService = $"{GitHub}/blob/dev/TermsofService.md"; + public const string PrivacyPolicy = $"{GitHub}/blob/dev/PrivacyPolicy.md"; + public const string UserGuide = $"{GitHub}/wiki/User-Guide"; + public const string AppleMusicCfg = $"{UserGuide}#lyrics-source-configuration"; + + public const string QQGroup = "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 Discord = "https://discord.gg/5yAQPnyCKv"; + public const string Telegram = "https://t.me/+svhSLZ7awPsxNGY1"; } } diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml index afbb56c..ae85261 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml @@ -51,11 +51,10 @@ - - - + + - + @@ -65,9 +64,9 @@ - - - + + + diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsEffectSettingsControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsEffectSettingsControl.xaml index a8e5d51..c9e3f00 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsEffectSettingsControl.xaml +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsEffectSettingsControl.xaml @@ -224,7 +224,7 @@ - + @@ -246,7 +246,7 @@ Default="500" Frequency="50" Maximum="1000" - Minimum="50" + Minimum="0" Unit="ms" Value="{x:Bind LyricsEffectSettings.LyricsScrollTopDuration, Mode=TwoWay}" /> @@ -255,7 +255,7 @@ Default="500" Frequency="50" Maximum="1000" - Minimum="50" + Minimum="0" Unit="ms" Value="{x:Bind LyricsEffectSettings.LyricsScrollDuration, Mode=TwoWay}" /> @@ -264,7 +264,7 @@ Default="500" Frequency="50" Maximum="1000" - Minimum="50" + Minimum="0" Unit="ms" Value="{x:Bind LyricsEffectSettings.LyricsScrollBottomDuration, Mode=TwoWay}" /> diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml index 7dc9d22..ee7f256 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml @@ -195,6 +195,10 @@ x:Uid="LyricsPageMatchPercentage" Unit="%" Value="{x:Bind MatchPercentage, Mode=OneWay}" /> + - + diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml index 8e7ac14..4781efc 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml @@ -308,9 +308,7 @@ HorizontalAlignment="Stretch" HorizontalContentAlignment="Left"> - - @@ -321,13 +319,9 @@ HorizontalAlignment="Stretch" HorizontalContentAlignment="Left"> - - - - - - - - - - - + @@ -508,7 +499,7 @@ Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, FontSize=12, Glyph=}" - NavigateUri="{x:Bind constants:Link.AppleMusicCfgUrl}" /> + NavigateUri="{x:Bind constants:Link.AppleMusicCfg}" />