mirrors/FRESHMusicPlayer
1
0
Fork 0
mirror of https://github.com/Royce551/FRESHMusicPlayer.git synced 2025-01-22 10:51:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Play/enqueue/delete buttons!

Browse source
This commit is contained in:
Royce551 2022-04-11 06:07:44 -05:00
parent b0cc3ea817
commit ca64bea422
3 changed files with 57 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/LibraryTab.axaml
View file

@ -4,11 +4,17 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:FRESHMusicPlayer.ViewModels"
xmlns:resx ="clr-namespace:FRESHMusicPlayer.Properties"
xmlns:svg="clr-namespace:Avalonia.Svg.Skia;assembly=Avalonia.Svg.Skia"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="500"
x:Class="FRESHMusicPlayer.Views.LibraryTab">
<UserControl.DataContext>
<vm:LibraryTabViewModel/>
</UserControl.DataContext>
<UserControl.Resources>
<svg:SvgImage x:Key="Play" Source="/Assets/play.svg"/>
<svg:SvgImage x:Key="Enqueue" Source="/Assets/enqueue.svg"/>
<svg:SvgImage x:Key="Delete" Source="/Assets/delete.svg"/>
</UserControl.Resources>
<DockPanel>
<ListBox DockPanel.Dock="Left" Background="{DynamicResource SecondaryColor}" Width="{Binding SidebarWidth}" Items="{Binding CategoryItems}" SelectedItem="{Binding SelectedCategory}" VirtualizationMode="Simple">
@ -27,24 +33,35 @@
<Button DockPanel.Dock="Right" Command="{Binding EnqueueAllCommand}" Content="Enqueue All" FontSize="12"/>
</DockPanel>
<ListBox Background="{DynamicResource BackgroundColor}" Items="{Binding ContentItems}" VirtualizationMode="Simple">
<ListBox Background="{DynamicResource BackgroundColor}" Items="{Binding ContentItems}" VirtualizationMode="Simple" SelectionMode="Toggle">
<ListBox.Styles>
<Style Selector="ListBoxItem">
<Setter Property="Padding" Value="10,2"/>
<Setter Property="Margin" Value="0"/>
<Setter Property="IsHitTestVisible" Value="False"/>
</Style>
</ListBox.Styles>
<ListBox.DataTemplates>
<DataTemplate>
<Border CornerRadius="2" BorderBrush="{DynamicResource ForegroundColor}" Background="{DynamicResource ForegroundColor}" BorderThickness="1">
<Grid RowDefinitions="1*,Auto" ColumnDefinitions="1*,Auto" Margin="5,2">
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding Title}" FontSize="16" TextTrimming="CharacterEllipsis"/>
<StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal">
<Grid RowDefinitions="1*,Auto" ColumnDefinitions="1*,Auto" Margin="5,0">
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding Title}" FontSize="16" TextTrimming="CharacterEllipsis" Margin="0,2,0,0"/>
<StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" Margin="0,0,0,2">
<TextBlock Text="{Binding Artist}" FontSize="9" Foreground="{DynamicResource SecondaryTextColor}"/>
<TextBlock Text="・ " FontSize="9" Foreground="{DynamicResource SecondaryTextColor}"/>
<TextBlock Text="{Binding Album}" FontSize="9" Foreground="{DynamicResource SecondaryTextColor}"/>
</StackPanel>
<StackPanel Grid.RowSpan="2" Grid.Column="1" Orientation="Horizontal">
<Button IsVisible="{Binding $parent[2].IsPointerOver}" Click="OnPlayButtonClick" VerticalAlignment="Center" Width="30" Height="30" Margin="0,-5">
<Image Source="{DynamicResource Play}"/>
</Button>
<Button IsVisible="{Binding $parent[2].IsPointerOver}" Click="OnEnqueueButtonClick" VerticalAlignment="Center" Width="30" Height="30" Margin="0,-5">
<Image Source="{DynamicResource Enqueue}"/>
</Button>
<Button IsVisible="{Binding $parent[2].IsPointerOver}" Click="OnDeleteButtonClick" VerticalAlignment="Center" Width="30" Height="30" Margin="0,-5">
<Image Source="{DynamicResource Delete}"/>
</Button>
</StackPanel>
</Grid>
</Border>
</DataTemplate>

37
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/LibraryTab.axaml.cs
View file

@ -1,5 +1,7 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Markup.Xaml;
using FRESHMusicPlayer.ViewModels;
@ -7,6 +9,8 @@ namespace FRESHMusicPlayer.Views
{
public partial class LibraryTab : UserControl
{
private LibraryTabViewModel ViewModel => DataContext as LibraryTabViewModel;
public LibraryTab()
{
InitializeComponent();
@ -14,12 +18,39 @@ namespace FRESHMusicPlayer.Views
public LibraryTab SetStuff(MainWindowViewModel mainWindowVm, Tab selectedTab, string initialSearch = null)
{
var viewModel = DataContext as LibraryTabViewModel;
viewModel.MainWindowWm = mainWindowVm;
viewModel.Initialize(selectedTab, initialSearch);
ViewModel.MainWindowWm = mainWindowVm;
ViewModel.Initialize(selectedTab, initialSearch);
return this;
}
private async void OnPlayButtonClick(object sender, RoutedEventArgs e)
{
var cmd = (Button)sender;
if (cmd.DataContext is DatabaseTrack x)
{
ViewModel.MainWindowWm.Player.Queue.Clear();
await ViewModel.MainWindowWm.Player.PlayAsync(x.Path);
}
}
private void OnEnqueueButtonClick(object sender, RoutedEventArgs e)
{
var cmd = (Button)sender;
if (cmd.DataContext is DatabaseTrack x)
{
ViewModel.MainWindowWm.Player.Queue.Add(x.Path);
}
}
private void OnDeleteButtonClick(object sender, RoutedEventArgs e)
{
var cmd = (Button)sender;
if (cmd.DataContext is DatabaseTrack x)
{
ViewModel.MainWindowWm.Library.Remove(x.Path);
}
}
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);

2
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/MainWindow.axaml
View file

@ -23,8 +23,6 @@
<svg:SvgImage x:Key="ShuffleTrue" Source="/Assets/shuffleTrue.svg"/>
<svg:SvgImage x:Key="SkipNext" Source="/Assets/skipNext.svg"/>
<svg:SvgImage x:Key="SkipPrevious" Source="/Assets/skipPrevious.svg"/>
<svg:SvgImage x:Key="Enqueue" Source="/Assets/enqueue.svg"/>
<svg:SvgImage x:Key="Delete" Source="/Assets/delete.svg"/>
<svg:SvgImage x:Key="Settings" Source="/Assets/settings.svg"/>
<svg:SvgImage x:Key="Queue" Source="/Assets/queue.svg"/>
<svg:SvgImage x:Key="Notification" Source="/Assets/notification.svg"/>