Added resource classses and a missing converter.

This commit is contained in:
2025-03-24 23:31:01 -04:00
parent 9245e9c4cc
commit 97f6040122
14 changed files with 507 additions and 49 deletions

View File

@@ -9,7 +9,6 @@ using Harmonia.WinUI.Storage;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml.Media.Imaging;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
@@ -21,7 +20,6 @@ using System.Threading.Tasks;
using System.Timers;
using System.Windows.Input;
using Windows.ApplicationModel.DataTransfer;
using Windows.Storage;
using Timer = System.Timers.Timer;
namespace Harmonia.WinUI.ViewModels;
@@ -116,6 +114,8 @@ public partial class PlaylistViewModel : ViewModelBase
public ICommand RemoveMissingSongsCommand => new RelayCommand(RemoveMissingSongs);
public ICommand RemoveDuplicateSongsCommand => new RelayCommand(RemoveDuplicateSongs);
public bool IsUserUpdating { get; set; }
public PlaylistViewModel(
IAudioPlayer audioPlayer,
IAudioBitmapImageCache audioBitmapImageCache,
@@ -155,6 +155,9 @@ public partial class PlaylistViewModel : ViewModelBase
private void OnPlaylistUpdated(object? sender, PlaylistUpdatedEventArgs e)
{
if (IsUserUpdating)
return;
switch (e.Action)
{
case PlaylistUpdateAction.Add:
@@ -191,7 +194,6 @@ public partial class PlaylistViewModel : ViewModelBase
private void OnPlayingSongChanged(object? sender, EventArgs e)
{
//OnPropertyChanged(nameof(PlayingSong));
PlayingSong = _audioPlayer.PlayingSong;
}

View File

@@ -0,0 +1,18 @@
using Microsoft.Extensions.DependencyInjection;
namespace Harmonia.WinUI.ViewModels;
public class ViewModelLocator
{
//public static MainViewModel MainViewModel
// => App.ServiceProvider.GetRequiredService<MainViewModel>();
public static PlayerViewModel PlayerViewModel
=> App.ServiceProvider.GetRequiredService<PlayerViewModel>();
//public static PlayingSongInfoViewModel PlayingSongInfoViewModel
// => App.ServiceProvider.GetRequiredService<PlayingSongInfoViewModel>();
public static PlaylistViewModel PlaylistViewModel
=> App.ServiceProvider.GetRequiredService<PlaylistViewModel>();
}