diff --git a/Harmonia.WinUI/App.xaml.cs b/Harmonia.WinUI/App.xaml.cs index 947280e..66ba4f6 100644 --- a/Harmonia.WinUI/App.xaml.cs +++ b/Harmonia.WinUI/App.xaml.cs @@ -1,4 +1,4 @@ -using Harmonia.Core.Extensions; +using Harmonia.Core.Extensions; using Harmonia.WinUI.Caching; using Harmonia.WinUI.Storage; using Harmonia.WinUI.ViewModels; @@ -23,7 +23,7 @@ public partial class App : Application //services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/Harmonia.WinUI/Harmonia.WinUI.csproj b/Harmonia.WinUI/Harmonia.WinUI.csproj index 92c7d16..13cddf0 100644 --- a/Harmonia.WinUI/Harmonia.WinUI.csproj +++ b/Harmonia.WinUI/Harmonia.WinUI.csproj @@ -1,4 +1,4 @@ - + WinExe net10.0-windows10.0.26100.0 @@ -68,7 +68,7 @@ Designer - + Designer diff --git a/Harmonia.WinUI/MainWindow.xaml b/Harmonia.WinUI/MainWindow.xaml index 16ead50..fe41142 100644 --- a/Harmonia.WinUI/MainWindow.xaml +++ b/Harmonia.WinUI/MainWindow.xaml @@ -11,15 +11,29 @@ mc:Ignorable="d" Title="Harmonia.WinUI"> + + + + + - + + + + + + + + + + @@ -28,15 +42,15 @@ - + - + - + diff --git a/Harmonia.WinUI/MainWindow.xaml.cs b/Harmonia.WinUI/MainWindow.xaml.cs index 376e62a..2dd425c 100644 --- a/Harmonia.WinUI/MainWindow.xaml.cs +++ b/Harmonia.WinUI/MainWindow.xaml.cs @@ -4,8 +4,18 @@ namespace Harmonia.WinUI; public sealed partial class MainWindow : Window { + private const string ApplicationTitle = "Harmonia"; + public MainWindow() { InitializeComponent(); + InitializeTitleBar(); + } + + private void InitializeTitleBar() + { + Title = ApplicationTitle; + ExtendsContentIntoTitleBar = true; + SetTitleBar(AppTitleBar); } } \ No newline at end of file diff --git a/Harmonia.WinUI/ViewModels/PlaylistViewModel.cs b/Harmonia.WinUI/ViewModels/PlaylistDetailViewModel.cs similarity index 99% rename from Harmonia.WinUI/ViewModels/PlaylistViewModel.cs rename to Harmonia.WinUI/ViewModels/PlaylistDetailViewModel.cs index 617bf03..b1aa457 100644 --- a/Harmonia.WinUI/ViewModels/PlaylistViewModel.cs +++ b/Harmonia.WinUI/ViewModels/PlaylistDetailViewModel.cs @@ -1,4 +1,4 @@ -using CommunityToolkit.Mvvm.Input; +using CommunityToolkit.Mvvm.Input; using Harmonia.Core.Caching; using Harmonia.Core.Engine; using Harmonia.Core.Imaging; @@ -27,7 +27,7 @@ using DispatcherQueueTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer; namespace Harmonia.WinUI.ViewModels; -public partial class PlaylistViewModel : ViewModelBase +public partial class PlaylistDetailViewModel : ViewModelBase { private readonly IPlaylistManager _playlistManager; private readonly IAudioPlayer _audioPlayer; @@ -126,7 +126,7 @@ public partial class PlaylistViewModel : ViewModelBase public event EventHandler? PlayingSongChangedAutomatically; - public PlaylistViewModel( + public PlaylistDetailViewModel( IAudioPlayer audioPlayer, IAudioImageCache audioImageCache, IAudioBitmapImageCache audioBitmapImageCache, diff --git a/Harmonia.WinUI/ViewModels/ViewModelLocator.cs b/Harmonia.WinUI/ViewModels/ViewModelLocator.cs index 6a1ac44..dc3f132 100644 --- a/Harmonia.WinUI/ViewModels/ViewModelLocator.cs +++ b/Harmonia.WinUI/ViewModels/ViewModelLocator.cs @@ -1,4 +1,4 @@ -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; namespace Harmonia.WinUI.ViewModels; @@ -13,6 +13,6 @@ public class ViewModelLocator public static PlayingSongViewModel PlayingSongViewModel => App.ServiceProvider.GetRequiredService(); - public static PlaylistViewModel PlaylistViewModel - => App.ServiceProvider.GetRequiredService(); + public static PlaylistDetailViewModel PlaylistDetailViewModel + => App.ServiceProvider.GetRequiredService(); } \ No newline at end of file diff --git a/Harmonia.WinUI/Views/PlaylistView.xaml b/Harmonia.WinUI/Views/PlaylistDetailView.xaml similarity index 98% rename from Harmonia.WinUI/Views/PlaylistView.xaml rename to Harmonia.WinUI/Views/PlaylistDetailView.xaml index 627e1a5..b709a72 100644 --- a/Harmonia.WinUI/Views/PlaylistView.xaml +++ b/Harmonia.WinUI/Views/PlaylistDetailView.xaml @@ -1,5 +1,5 @@ - diff --git a/Harmonia.WinUI/Views/PlaylistView.xaml.cs b/Harmonia.WinUI/Views/PlaylistDetailView.xaml.cs similarity index 97% rename from Harmonia.WinUI/Views/PlaylistView.xaml.cs rename to Harmonia.WinUI/Views/PlaylistDetailView.xaml.cs index 3b313e7..5289105 100644 --- a/Harmonia.WinUI/Views/PlaylistView.xaml.cs +++ b/Harmonia.WinUI/Views/PlaylistDetailView.xaml.cs @@ -1,4 +1,4 @@ -using CommunityToolkit.WinUI; +using CommunityToolkit.WinUI; using Harmonia.Core.Imaging; using Harmonia.Core.Playlists; using Harmonia.WinUI.ViewModels; @@ -18,15 +18,15 @@ using Windows.UI.Popups; namespace Harmonia.WinUI.Views; -public sealed partial class PlaylistView : UserControl +public sealed partial class PlaylistDetailView : UserControl { - private readonly PlaylistViewModel _viewModel; + private readonly PlaylistDetailViewModel _viewModel; - public PlaylistView() + public PlaylistDetailView() { InitializeComponent(); - _viewModel = (PlaylistViewModel)DataContext; + _viewModel = (PlaylistDetailViewModel)DataContext; _viewModel.PropertyChanging += OnViewModelPropertyChanging; _viewModel.PropertyChanged += OnViewModelPropertyChanged; _viewModel.PlayingSongChangedAutomatically += OnPlayingSongChangedAutomatically;