diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsBackgroundSettingsControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsBackgroundSettingsControl.xaml index e3024ad..719e947 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsBackgroundSettingsControl.xaml +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsBackgroundSettingsControl.xaml @@ -114,15 +114,15 @@ Value="{x:Bind LyricsBackgroundSettings.FluidOverlayOpacity, Mode=TwoWay}" /> + + + + + + + - - - - - - - throw new ArgumentOutOfRangeException(nameof(generatorType)), }; } + public static Task GetAccentColorsAsync(BitmapDecoder decoder, int count, PaletteGeneratorType generatorType, bool? isDark = null) { return generatorType switch diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsBackgroundSettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsBackgroundSettings.cs index 2143831..22a3662 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsBackgroundSettings.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsBackgroundSettings.cs @@ -28,7 +28,7 @@ namespace BetterLyrics.WinUI3.Models.Settings [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsSpectrumOverlayEnabled { get; set; } = false; - [ObservableProperty][NotifyPropertyChangedRecipients] public partial PaletteGeneratorType PaletteGeneratorType { get; set; } = PaletteGeneratorType.OctTree; + [ObservableProperty][NotifyPropertyChangedRecipients] public partial PaletteGeneratorType PaletteGeneratorType { get; set; } = PaletteGeneratorType.MedianCut; public LyricsBackgroundSettings() { } diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsEffectSettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsEffectSettings.cs index bbd8d90..9713dc2 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsEffectSettings.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsEffectSettings.cs @@ -12,7 +12,7 @@ namespace BetterLyrics.WinUI3.Models.Settings { [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsBlurAmount { get; set; } = 5; - [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsLineFadeEnabled { get; set; } = false; + [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsLineFadeEnabled { get; set; } = true; [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsGlowEffectEnabled { get; set; } = true; [ObservableProperty][NotifyPropertyChangedRecipients] public partial LineRenderingType LyricsGlowEffectScope { get; set; } = LineRenderingType.CurrentChar; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs index 362a1db..afc7daf 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs @@ -36,6 +36,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService IRecipient>, IRecipient>, IRecipient>, + IRecipient>, IRecipient>, IRecipient>> { @@ -685,5 +686,16 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService } } } + + public void Receive(PropertyChangedMessage message) + { + if (message.Sender is LyricsBackgroundSettings) + { + if (message.PropertyName == nameof(LyricsBackgroundSettings.PaletteGeneratorType)) + { + UpdateAlbumArt(); + } + } + } } } diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw index 93ef8f3..f8983c8 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw @@ -976,6 +976,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi Media library + + Conservative + Monitor this playback source @@ -1006,6 +1009,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi None + + Aggressive + Opacity @@ -1013,7 +1019,7 @@ If you encounter any problems, please go to the Settings page, About tab, and vi Open in file explorer - Palette Generator Type + Color picker style This folder is already included in the existing folder and does not need to be added again diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw index f07ca1e..20caec1 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw @@ -976,6 +976,9 @@ メディアライブラリ + + 保守的 + この再生ソースを監視します @@ -1006,6 +1009,9 @@ なし + + 急進的だ + 不透明度 @@ -1013,7 +1019,7 @@ ファイルエクスプローラーで開きます - パレット生成器タイプ + カラーピックスタイル このフォルダーは既存のフォルダーに既に含まれており、再度追加する必要はありません diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw index 430e610..b9bc8c0 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw @@ -976,6 +976,9 @@ 미디어 라이브러리 + + 안전하게 + 이 재생 소스를 모니터링하십시오 @@ -1006,6 +1009,9 @@ 없음 + + 공격적인 + 투명도 @@ -1013,7 +1019,7 @@ 파일 탐색기에서 열립니다 - 팔레트 생성기 유형 + 색상 선택 스타일 이 폴더는 이미 기존 폴더에 포함되어 있으며 다시 추가 할 필요가 없습니다. diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw index acae9d8..5bc179d 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw @@ -976,6 +976,9 @@ 媒体库 + + 保守 + 监听此播放源 @@ -1006,6 +1009,9 @@ + + 激进 + 不透明度 @@ -1013,7 +1019,7 @@ 在文件资源管理器中打开 - 取色算法 + 取色风格 该文件夹已包含在已有文件夹中,无需再次添加 diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw index 662f3e1..263cc15 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw @@ -976,6 +976,9 @@ 媒體庫 + + 保守 + 監聽此播放來源 @@ -1006,6 +1009,9 @@ + + 激進 + 專輯背景層不透明度 @@ -1013,7 +1019,7 @@ 在檔案總管中開啟 - 取色算法 + 取色風格 該資料夾已包含在已有資料夾中,無需再次添加