diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs index f9173be..6dbf2d7 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs @@ -25,7 +25,6 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Vanara.PInvoke; -using WinUIEx; namespace BetterLyrics.WinUI3 { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtAreaEffectSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtAreaEffectSettingsControl.xaml.cs index fb91ce4..e0bb151 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtAreaEffectSettingsControl.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtAreaEffectSettingsControl.xaml.cs @@ -1,18 +1,6 @@ using BetterLyrics.WinUI3.Models.Settings; 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. diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml.cs index e6ef29f..7359b10 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml.cs @@ -4,12 +4,8 @@ using BetterLyrics.WinUI3.Services.SettingsService; using CommunityToolkit.Mvvm.DependencyInjection; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Media; using System.Collections.Generic; -using System.Collections.Immutable; -using System.Collections.ObjectModel; using System.Linq; -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. diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ImageSwitcher.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ImageSwitcher.xaml.cs index f1e6caa..5142037 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ImageSwitcher.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ImageSwitcher.xaml.cs @@ -1,19 +1,7 @@ using BetterLyrics.WinUI3.Enums; 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 System.Threading.Tasks; -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. diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs index 441550a..b595d5a 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs @@ -10,7 +10,6 @@ using BetterLyrics.WinUI3.Renderer; using BetterLyrics.WinUI3.Services.LastFMService; using BetterLyrics.WinUI3.Services.MediaSessionsService; using BetterLyrics.WinUI3.Services.SettingsService; -using BetterLyrics.WinUI3.Views; using CommunityToolkit.Mvvm.DependencyInjection; using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging.Messages; @@ -20,9 +19,7 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; -using System.Numerics; using Windows.Foundation; using Windows.UI; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml index 4c452d4..d599070 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml @@ -103,11 +103,7 @@ LyricsWindowStatus="{Binding}" Tapped="DemoWindowGrid_Tapped" /> - - - - - + + + + + + + + diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs index a03fb4b..3679035 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs @@ -9,11 +9,9 @@ using CommunityToolkit.Mvvm.DependencyInjection; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Input; -using NTextCat.Commons; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Threading.Tasks; using Windows.Storage; // To learn more about WinUI, the WinUI project structure, @@ -197,5 +195,17 @@ namespace BetterLyrics.WinUI3.Controls } } } + + private void CloseStatusButton_Click(object sender, RoutedEventArgs e) + { + if (sender is FrameworkElement element) + { + if (element.DataContext is LyricsWindowStatus data) + { + var window = WindowHook.GetWindows().FirstOrDefault(x => x.LyricsWindowStatus == data); + window?.CloseWindow(); + } + } + } } } diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml.cs index d13c9bb..4b95463 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml.cs @@ -1,4 +1,3 @@ -using ATL; using BetterLyrics.WinUI3.Hooks; using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Services.MediaSessionsService; @@ -9,20 +8,10 @@ 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.Media.Imaging; -using Microsoft.UI.Xaml.Navigation; using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Numerics; -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. diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml index 6854464..41aae05 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml @@ -53,7 +53,7 @@ - + OnTaskbarBoundsChanged; + + public TaskbarHook() + { + _timer = new DispatcherTimer(); + _timer.Interval = TimeSpan.FromMilliseconds(50); + _timer.Tick += Timer_Tick; + } + + private void Timer_Tick(object? sender, object e) + { + } + + } +} diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs index f971570..1e1c406 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs @@ -1,13 +1,8 @@ // 2025/6/23 by Zhe Fang using BetterLyrics.WinUI3.Enums; -using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; - -using BetterLyrics.WinUI3.Services.MediaSessionsService; -using BetterLyrics.WinUI3.Services.SettingsService; using BetterLyrics.WinUI3.Views; -using CommunityToolkit.Mvvm.DependencyInjection; using CommunityToolkit.WinUI; using Microsoft.UI.Dispatching; using Microsoft.UI.Windowing; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs index fc21919..ac692c3 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs @@ -1,7 +1,6 @@ using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Services.ResourceService; using CommunityToolkit.Mvvm.DependencyInjection; -using DevWinUI; using System; using System.Collections.Generic; using System.Linq; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsLine.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsLine.cs index bedfa6b..bb5e9b3 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsLine.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsLine.cs @@ -1,16 +1,6 @@ // 2025/6/23 by Zhe Fang -using BetterLyrics.WinUI3.Enums; -using BetterLyrics.WinUI3.Extensions; -using BetterLyrics.WinUI3.Helper; -using Microsoft.Graphics.Canvas.Geometry; -using Microsoft.Graphics.Canvas.Text; -using Microsoft.Graphics.Canvas.UI.Xaml; -using Microsoft.UI; -using System; using System.Collections.Generic; -using System.Numerics; -using Windows.UI; namespace BetterLyrics.WinUI3.Models { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/RenderLyricsLine.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/RenderLyricsLine.cs index 1dc0f7b..efcb0c1 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/RenderLyricsLine.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/RenderLyricsLine.cs @@ -5,10 +5,7 @@ using Microsoft.Graphics.Canvas.Geometry; using Microsoft.Graphics.Canvas.Text; using Microsoft.Graphics.Canvas.UI.Xaml; using Microsoft.UI; -using System; -using System.Collections.Generic; using System.Numerics; -using System.Text; using Windows.UI; namespace BetterLyrics.WinUI3.Models diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtAreaEffectSettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtAreaEffectSettings.cs index 351ed99..00825b0 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtAreaEffectSettings.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtAreaEffectSettings.cs @@ -1,8 +1,6 @@ using BetterLyrics.WinUI3.Enums; using CommunityToolkit.Mvvm.ComponentModel; using System; -using System.Collections.Generic; -using System.Text; namespace BetterLyrics.WinUI3.Models.Settings { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/GeneralSettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/GeneralSettings.cs index 34cc81e..74d11af 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/GeneralSettings.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/GeneralSettings.cs @@ -13,7 +13,7 @@ namespace BetterLyrics.WinUI3.Models.Settings [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ExitOnLyricsWindowClosed { get; set; } = false; [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ListenOnNewPlaybackSource { get; set; } = true; [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IgnoreCacheWhenSearching { get; set; } = false; - + [ObservableProperty][NotifyPropertyChangedRecipients] public partial List LyricsWindowSwitchShortcut { get; set; } = new List() { "Ctrl", "Alt", "S" }; [ObservableProperty][NotifyPropertyChangedRecipients] public partial List PlayOrPauseShortcut { get; set; } = new List { "Ctrl", "Alt", "P" }; [ObservableProperty][NotifyPropertyChangedRecipients] public partial List NextSongShortcut { get; set; } = new List { "Ctrl", "Alt", "Right" }; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsEffectSettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsEffectSettings.cs index 867a715..6ea2044 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsEffectSettings.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsEffectSettings.cs @@ -13,7 +13,7 @@ namespace BetterLyrics.WinUI3.Models.Settings [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsGlowEffectLongSyllableDuration { get; set; } = 700; // 700ms [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsGlowEffectAmountAutoAdjust { get; set; } = true; [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsGlowEffectAmount { get; set; } = 8; - + [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsScaleEffectEnabled { get; set; } = true; [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsScaleEffectLongSyllableDuration { get; set; } = 700; // 700ms [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsScaleEffectAmountAutoAdjust { get; set; } = true; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsStyleSettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsStyleSettings.cs index 4fe86a0..b71fc34 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsStyleSettings.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsStyleSettings.cs @@ -17,19 +17,19 @@ namespace BetterLyrics.WinUI3.Models.Settings [ObservableProperty][NotifyPropertyChangedRecipients] public partial TextAlignmentType LyricsAlignmentType { get; set; } = TextAlignmentType.Left; [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsFontStrokeWidth { get; set; } = 0; - + [ObservableProperty][NotifyPropertyChangedRecipients] public partial Color LyricsCustomBgFontColor { get; set; } = Colors.White; [ObservableProperty][NotifyPropertyChangedRecipients] public partial Color LyricsCustomFgFontColor { get; set; } = Colors.White; [ObservableProperty][NotifyPropertyChangedRecipients] public partial Color LyricsCustomStrokeFontColor { get; set; } = Colors.White; - + [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsFontColorType LyricsBgFontColorType { get; set; } = LyricsFontColorType.AdaptiveGrayed; [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsFontColorType LyricsFgFontColorType { get; set; } = LyricsFontColorType.AdaptiveGrayed; [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsFontColorType LyricsStrokeFontColorType { get; set; } = LyricsFontColorType.AdaptiveGrayed; - + [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsFontWeight LyricsFontWeight { get; set; } = LyricsFontWeight.Bold; - + [ObservableProperty][NotifyPropertyChangedRecipients] public partial double LyricsLineSpacingFactor { get; set; } = 0.5; - + [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LyricsCJKFontFamily { get; set; } = FontHelper.SystemFontFamilies.FirstOrDefault() ?? ""; [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LyricsWesternFontFamily { get; set; } = FontHelper.SystemFontFamilies.FirstOrDefault() ?? ""; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/PlayingLineRenderer.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/PlayingLineRenderer.cs index 790e5c8..5604e92 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/PlayingLineRenderer.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/PlayingLineRenderer.cs @@ -1,7 +1,6 @@ using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; -using DevWinUI; using Microsoft.Graphics.Canvas; using Microsoft.Graphics.Canvas.Brushes; using Microsoft.Graphics.Canvas.Effects; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.AlbumArtUpdater.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.AlbumArtUpdater.cs index ad84bf7..b82cd82 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.AlbumArtUpdater.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.AlbumArtUpdater.cs @@ -2,7 +2,6 @@ using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; -using BetterLyrics.WinUI3.Views; using CommunityToolkit.Mvvm.ComponentModel; using Microsoft.Extensions.Logging; using Microsoft.UI; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.LyricsUpdater.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.LyricsUpdater.cs index 9412fd5..8761d49 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.LyricsUpdater.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.LyricsUpdater.cs @@ -54,6 +54,8 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService await SetTranslatedTextAsync(settings, token); if (token.IsCancellationRequested) return; + SetCurrentLyricsData(); + IsTranslating = false; } @@ -177,8 +179,6 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService SetCurrentLyricsData(); await RefreshTranslationAsync(settings, token); - - SetCurrentLyricsData(); } private void ApplyChinesePreference() diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs index b2d5bf9..e63cb6a 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs @@ -24,10 +24,8 @@ using CommunityToolkit.WinUI; using EvtSource; using Microsoft.Extensions.Logging; using Microsoft.UI.Dispatching; -using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using System; -using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices.WindowsRuntime; using System.Text.Json; @@ -35,7 +33,6 @@ using System.Threading.Tasks; using Vanara.Windows.Shell; using Windows.Media.Control; using Windows.Storage.Streams; -using Windows.UI; using WindowsMediaController; namespace BetterLyrics.WinUI3.Services.MediaSessionsService @@ -71,7 +68,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService public MediaSessionsService( ISettingsService settingsService, IAlbumArtSearchService albumArtSearchService, - ILyricsSearchService musicSearchService, + ILyricsSearchService lyricsSearchService, ILibWatcherService libWatcherService, IDiscordService discordService, ITranslateService libreTranslateService, @@ -79,7 +76,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService { _settingsService = settingsService; _albumArtSearchService = albumArtSearchService; - _lyrcsSearchService = musicSearchService; + _lyrcsSearchService = lyricsSearchService; _libWatcherService = libWatcherService; _translateService = libreTranslateService; _discordService = discordService; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/ISettingsService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/ISettingsService.cs index 212d25d..0b88465 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/ISettingsService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/ISettingsService.cs @@ -1,7 +1,6 @@ // 2025/6/23 by Zhe Fang using BetterLyrics.WinUI3.Models.Settings; -using System.Threading.Tasks; namespace BetterLyrics.WinUI3.Services.SettingsService { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/SettingsService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/SettingsService.cs index de3809f..6ae4833 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/SettingsService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/SettingsService.cs @@ -8,13 +8,11 @@ using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Serialization; using BetterLyrics.WinUI3.ViewModels; -using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.WinUI; using Microsoft.UI.Dispatching; using System; using System.IO; using System.Linq; -using System.Threading.Tasks; using Windows.Globalization; namespace BetterLyrics.WinUI3.Services.SettingsService diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw index 192f3bf..a3c48e1 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw @@ -717,6 +717,9 @@ Click-through shortcut keys + + Close + Collapse dropdown @@ -729,6 +732,9 @@ Configuration name + + Configure playback source + Copy diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw index cd8f89e..5a7a68c 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw @@ -717,6 +717,9 @@ クリックスルーショートカットキー + + 閉じる + ドロップダウンを折りたたみます @@ -729,6 +732,9 @@ 設定名 + + 再生ソースを設定します + コピー diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw index 5f5a922..e2028e0 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw @@ -717,6 +717,9 @@ 바로 가기 키를 클릭하세요 + + 닫기 + 드롭다운 접기 @@ -729,6 +732,9 @@ 환경 설정 + + 재생 소스 구성 + 접수 diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw index aff24fa..5df41ec 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw @@ -717,6 +717,9 @@ 点击穿透快捷键 + + 关闭 + 折叠下拉列表 @@ -729,6 +732,9 @@ 配置名称 + + 配置播放源 + 拷贝 diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw index e55761f..f38cd84 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw @@ -717,6 +717,9 @@ 點選穿透快捷鍵 + + 關閉 + 收起下拉列表 @@ -729,6 +732,9 @@ 配置名稱 + + 配置播放來源 + 複製 diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSettingsControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSettingsControlViewModel.cs index 070ed3c..214909a 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSettingsControlViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSettingsControlViewModel.cs @@ -1,6 +1,5 @@ using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Hooks; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.SettingsService; using BetterLyrics.WinUI3.Views; @@ -8,7 +7,6 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging.Messages; -using System.Collections.ObjectModel; using System.Linq; using System.Numerics; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSwitchControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSwitchControlViewModel.cs index c91277e..3356d8b 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSwitchControlViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSwitchControlViewModel.cs @@ -1,5 +1,4 @@ -using BetterLyrics.WinUI3.Models; -using BetterLyrics.WinUI3.Models.Settings; +using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.SettingsService; using CommunityToolkit.Mvvm.ComponentModel; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryWindowViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryWindowViewModel.cs index 9e6eba6..b20bba7 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryWindowViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryWindowViewModel.cs @@ -1,9 +1,6 @@ using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.SettingsService; using CommunityToolkit.Mvvm.ComponentModel; -using System; -using System.Collections.Generic; -using System.Text; namespace BetterLyrics.WinUI3.ViewModels { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingBarViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingBarViewModel.cs index b00fc23..9ad6405 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingBarViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingBarViewModel.cs @@ -4,9 +4,6 @@ using BetterLyrics.WinUI3.Services.MediaSessionsService; using BetterLyrics.WinUI3.Views; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using System; -using System.Collections.Generic; -using System.Text; using System.Threading.Tasks; namespace BetterLyrics.WinUI3.ViewModels diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingPageViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingPageViewModel.cs index c14e0f3..189c8f9 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingPageViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingPageViewModel.cs @@ -1,13 +1,10 @@ // 2025/6/23 by Zhe Fang using BetterLyrics.WinUI3.Hooks; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Services.MediaSessionsService; using BetterLyrics.WinUI3.Views; -using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using System.Threading.Tasks; namespace BetterLyrics.WinUI3.ViewModels { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingWindowViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingWindowViewModel.cs index fe96e81..50f12c6 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingWindowViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingWindowViewModel.cs @@ -1,26 +1,9 @@ // 2025/6/23 by Zhe Fang -using BetterLyrics.WinUI3.Enums; -using BetterLyrics.WinUI3.Helper; -using BetterLyrics.WinUI3.Hooks; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; -using BetterLyrics.WinUI3.Services.MediaSessionsService; using BetterLyrics.WinUI3.Services.SettingsService; using BetterLyrics.WinUI3.ViewModels; -using BetterLyrics.WinUI3.Views; using CommunityToolkit.Mvvm.ComponentModel; -using CommunityToolkit.Mvvm.Messaging; -using CommunityToolkit.Mvvm.Messaging.Messages; -using CommunityToolkit.WinUI; -using Microsoft.UI; -using Microsoft.UI.Dispatching; -using Microsoft.UI.Windowing; -using Microsoft.UI.Xaml; -using System.Collections.Generic; -using Windows.UI; -using WinRT.Interop; -using WinUIEx; namespace BetterLyrics.WinUI3 { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml.cs index 8326377..9d2edb6 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml.cs @@ -1,6 +1,5 @@ using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Hooks; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.MediaSessionsService; using BetterLyrics.WinUI3.ViewModels; @@ -12,7 +11,6 @@ using Microsoft.UI.Windowing; using Microsoft.UI.Xaml; using System.Threading.Tasks; using Windows.Graphics.Imaging; -using Windows.UI; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingPage.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingPage.xaml.cs index 32d85db..0a9fc4d 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingPage.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingPage.xaml.cs @@ -3,7 +3,6 @@ using BetterLyrics.WinUI3.Controls; using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Helper; -using BetterLyrics.WinUI3.Hooks; using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.MediaSessionsService; @@ -17,9 +16,7 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Documents; using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Xaml.Media.Imaging; using System; -using System.Numerics; using System.Threading.Tasks; namespace BetterLyrics.WinUI3.Views diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs index 2fa9701..9fb23df 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs @@ -16,19 +16,11 @@ using Microsoft.UI.Dispatching; using Microsoft.UI.Windowing; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Input; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Drawing.Imaging; -using System.Linq; -using System.Text; using System.Threading.Tasks; -using Vanara.PInvoke; using Windows.Foundation; using Windows.Graphics.Imaging; using Windows.UI; using WinRT.Interop; -using WinUIEx.Messaging; namespace BetterLyrics.WinUI3.Views { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml.cs index 3d0b6d8..19fa16e 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml.cs @@ -1,11 +1,9 @@ using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Hooks; -using BetterLyrics.WinUI3.Services.ResourceService; using BetterLyrics.WinUI3.ViewModels; using CommunityToolkit.Mvvm.DependencyInjection; using Microsoft.UI.Windowing; using Microsoft.UI.Xaml; -using Microsoft.Win32; namespace BetterLyrics.WinUI3.Views { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SystemTrayWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SystemTrayWindow.xaml.cs index 0e6083f..c917ceb 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SystemTrayWindow.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SystemTrayWindow.xaml.cs @@ -9,22 +9,8 @@ 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.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.Diagnostics; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using System.Threading.Tasks; using Vanara.PInvoke; -using Windows.Foundation; -using Windows.Foundation.Collections; using WinUIEx.Messaging; // To learn more about WinUI, the WinUI project structure,