chores: code cleanup

This commit is contained in:
Zhe Fang
2025-11-19 17:50:59 -05:00
parent 35de1ef7db
commit c704edde19
28 changed files with 5 additions and 77 deletions

View File

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

View File

@@ -2,7 +2,6 @@ using BetterLyrics.WinUI3.Helper;
using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models;
using BetterLyrics.WinUI3.Serialization; using BetterLyrics.WinUI3.Serialization;
using BetterLyrics.WinUI3.Services.LiveStatesService; using BetterLyrics.WinUI3.Services.LiveStatesService;
using BetterLyrics.WinUI3.Services.ResourceService;
using BetterLyrics.WinUI3.Services.SettingsService; using BetterLyrics.WinUI3.Services.SettingsService;
using BetterLyrics.WinUI3.ViewModels; using BetterLyrics.WinUI3.ViewModels;
using BetterLyrics.WinUI3.Views; using BetterLyrics.WinUI3.Views;

View File

@@ -1,22 +1,10 @@
using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Helper;
using BetterLyrics.WinUI3.Services.MediaSessionsService;
using Microsoft.UI.Xaml; using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls; 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.Input;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Navigation;
using System; using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices.WindowsRuntime;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Input;
using Windows.ApplicationModel.DataTransfer; using Windows.ApplicationModel.DataTransfer;
using Windows.Foundation;
using Windows.Foundation.Collections;
// To learn more about WinUI, the WinUI project structure, // To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info. // and more about our project templates, see: http://aka.ms/winui-project-info.

View File

@@ -1,7 +1,5 @@
// 2025/6/23 by Zhe Fang // 2025/6/23 by Zhe Fang
using BetterLyrics.WinUI3.Helper;
namespace BetterLyrics.WinUI3.Enums namespace BetterLyrics.WinUI3.Enums
{ {
public enum LyricsSearchProvider public enum LyricsSearchProvider

View File

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

View File

@@ -1,7 +1,4 @@
using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Enums;
using System;
using System.Collections.Generic;
using System.Text;
namespace BetterLyrics.WinUI3.Extensions namespace BetterLyrics.WinUI3.Extensions
{ {

View File

@@ -1,8 +1,6 @@
using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Enums;
using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Helper;
using System; using System;
using System.Collections.Generic;
using System.Text;
namespace BetterLyrics.WinUI3.Extensions namespace BetterLyrics.WinUI3.Extensions
{ {

View File

@@ -1,9 +1,5 @@
using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Enums;
using NTextCat.Commons;
using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
namespace BetterLyrics.WinUI3.Extensions namespace BetterLyrics.WinUI3.Extensions
{ {

View File

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

View File

@@ -4,7 +4,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
namespace BetterLyrics.WinUI3.Helper namespace BetterLyrics.WinUI3.Helper

View File

@@ -1,7 +1,6 @@
using BetterLyrics.WinUI3.Services.ResourceService; using BetterLyrics.WinUI3.Services.ResourceService;
using CommunityToolkit.Mvvm.DependencyInjection; using CommunityToolkit.Mvvm.DependencyInjection;
using System; using System;
using System.Linq;
namespace BetterLyrics.WinUI3.Helper namespace BetterLyrics.WinUI3.Helper
{ {

View File

@@ -1,5 +1,4 @@
using BetterLyrics.WinUI3.Constants; using BetterLyrics.WinUI3.Constants;
using Lyricify.Lyrics.Providers;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;

View File

@@ -1,6 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;

View File

@@ -1,14 +1,9 @@
using DevWinUI; using Microsoft.UI.Xaml.Media.Imaging;
using Microsoft.UI.Xaml.Media.Imaging;
using System; using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Vanara.PInvoke; using Vanara.PInvoke;
using Vanara.Windows.Shell; using Vanara.Windows.Shell;

View File

@@ -14,7 +14,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Vanara.PInvoke; using Vanara.PInvoke;
using Vanara.Windows.Shell;
using Windows.ApplicationModel.Core; using Windows.ApplicationModel.Core;
using Windows.Foundation; using Windows.Foundation;
using WinRT.Interop; using WinRT.Interop;

View File

@@ -1,17 +1,11 @@
// 2025/6/23 by Zhe Fang // 2025/6/23 by Zhe Fang
using BetterLyrics.WinUI3.Collections; using BetterLyrics.WinUI3.Collections;
using BetterLyrics.WinUI3.Constants;
using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Enums;
using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Helper;
using BetterLyrics.WinUI3.Hooks;
using BetterLyrics.WinUI3.ViewModels;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.DependencyInjection;
using Microsoft.UI.Xaml.Media.Imaging;
using System; using System;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
namespace BetterLyrics.WinUI3.Models namespace BetterLyrics.WinUI3.Models
{ {

View File

@@ -2,7 +2,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
namespace BetterLyrics.WinUI3.Parsers.LyricsParser namespace BetterLyrics.WinUI3.Parsers.LyricsParser

View File

@@ -1,8 +1,6 @@
using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
namespace BetterLyrics.WinUI3.Parsers.LyricsParser namespace BetterLyrics.WinUI3.Parsers.LyricsParser
{ {

View File

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

View File

@@ -5,12 +5,8 @@ using BetterLyrics.WinUI3.Extensions;
using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Helper;
using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models;
using Lyricify.Lyrics.Parsers; using Lyricify.Lyrics.Parsers;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions;
using System.Xml.Linq;
namespace BetterLyrics.WinUI3.Parsers.LyricsParser namespace BetterLyrics.WinUI3.Parsers.LyricsParser
{ {

View File

@@ -1,7 +1,6 @@
using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Extensions;
using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Helper;
using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models;
using Lyricify.Lyrics.Providers.Web.QQMusic;
using System; using System;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;

View File

@@ -18,10 +18,8 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Net.Http; using System.Net.Http;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Nodes;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Documents;
namespace BetterLyrics.WinUI3.Services.LyricsSearchService namespace BetterLyrics.WinUI3.Services.LyricsSearchService
{ {

View File

@@ -23,9 +23,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging;
using CommunityToolkit.Mvvm.Messaging.Messages; using CommunityToolkit.Mvvm.Messaging.Messages;
using CommunityToolkit.WinUI; using CommunityToolkit.WinUI;
using DevWinUI;
using EvtSource; using EvtSource;
using Lyricify.Lyrics.Providers;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.UI.Dispatching; using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Controls;
@@ -34,7 +32,6 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices.WindowsRuntime; using System.Runtime.InteropServices.WindowsRuntime;
using System.Text.Json; using System.Text.Json;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Vanara.Windows.Shell; using Vanara.Windows.Shell;
using Windows.Media.Control; using Windows.Media.Control;

View File

@@ -1,8 +1,5 @@
using ComputeSharp; using ComputeSharp;
using ComputeSharp.D2D1; using ComputeSharp.D2D1;
using System;
using System.Collections.Generic;
using System.Text;
namespace BetterLyrics.WinUI3.Shaders namespace BetterLyrics.WinUI3.Shaders
{ {

View File

@@ -1,6 +1,5 @@
using ComputeSharp; using ComputeSharp;
using ComputeSharp.D2D1; using ComputeSharp.D2D1;
using static Vanara.PInvoke.Ole32.PROPERTYKEY.System;
namespace BetterLyrics.WinUI3.Shaders namespace BetterLyrics.WinUI3.Shaders
{ {

View File

@@ -1,9 +1,7 @@
using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Enums;
using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Extensions;
using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Helper;
using BetterLyrics.WinUI3.Shaders;
using CommunityToolkit.WinUI; using CommunityToolkit.WinUI;
using ComputeSharp.D2D1.WinUI;
using Microsoft.Graphics.Canvas; using Microsoft.Graphics.Canvas;
using Microsoft.Graphics.Canvas.Brushes; using Microsoft.Graphics.Canvas.Brushes;
using Microsoft.Graphics.Canvas.Effects; using Microsoft.Graphics.Canvas.Effects;

View File

@@ -16,7 +16,6 @@ using Microsoft.Graphics.Canvas;
using Microsoft.Graphics.Canvas.Geometry; using Microsoft.Graphics.Canvas.Geometry;
using Microsoft.Graphics.Canvas.Text; using Microsoft.Graphics.Canvas.Text;
using Microsoft.UI; using Microsoft.UI;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Text; using Microsoft.UI.Text;
using Microsoft.UI.Xaml; using Microsoft.UI.Xaml;
using System; using System;

View File

@@ -118,8 +118,8 @@ namespace BetterLyrics.WinUI3.ViewModels
((SongInfo?)_mediaSessionsService.CurrentSongInfo?.Clone() ?? new()) ((SongInfo?)_mediaSessionsService.CurrentSongInfo?.Clone() ?? new())
.WithTitle(MappedSongSearchQuery.MappedTitle) .WithTitle(MappedSongSearchQuery.MappedTitle)
.WithArtist(MappedSongSearchQuery.MappedArtist.SplitByCommonSplitter()) .WithArtist(MappedSongSearchQuery.MappedArtist.SplitByCommonSplitter())
.WithAlbum(MappedSongSearchQuery.MappedAlbum), .WithAlbum(MappedSongSearchQuery.MappedAlbum),
!_settingsService.AppSettings.GeneralSettings.IgnoreCacheWhenSearching, !_settingsService.AppSettings.GeneralSettings.IgnoreCacheWhenSearching,
token); token);
return result; return result;
}, token)]; }, token)];