refactoring

This commit is contained in:
Alex
2025-08-11 23:02:15 -07:00
parent db136ffbe7
commit 32396c3210
8 changed files with 13 additions and 11 deletions
+55
View File
@@ -0,0 +1,55 @@
<Panel xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:MercuryConverter.UI.Views"
x:Class="MercuryConverter.UI.Views.Selection"
>
<DockPanel>
<!-- Sidebar -->
<TabControl Margin="8 8 0 0" Width="250" DockPanel.Dock="Right">
<TabControl.Resources>
<ResourceDictionary>
<Thickness x:Key="TabItemHeaderMargin">12 0 12 15</Thickness>
<Thickness x:Key="TabItemMargin">0 0 0 0</Thickness>
</ResourceDictionary>
</TabControl.Resources>
<TabItem Header="Info" FontSize="16">
<StackPanel Name="SelectionInfo">
<Image Name="InfoImageJacket" Margin="24 0 24 0" Source="/Assets/imgs/jacket-placeholder.png"/>
<TextBlock Name="InfoNameText" Text="Name" FontWeight="Bold" HorizontalAlignment="Center" Margin="0 10 0 0"/>
<TextBlock Name="InfoArtistText" Text="Artist" HorizontalAlignment="Center"/>
<TextBlock Name="InfoSourceText" Text="Source" HorizontalAlignment="Center"/>
</StackPanel>
</TabItem>
<TabItem Header="Filters" FontSize="16">
<StackPanel>
<!-- Sources Filter -->
<TextBlock Text="Sources" FontWeight="Bold" Margin="0 0 0 4"/>
<StackPanel Margin="10 0 0 0" Name="FilterSourceContainer"/>
<!-- Categories Filter -->
<TextBlock Text="Categories" FontWeight="Bold" Margin="0 20 0 4"/>
<StackPanel Margin="10 0 0 0" Name="FilterCategoryContainer"/>
</StackPanel>
</TabItem>
</TabControl>
<!-- Song Listing Table -->
<DockPanel>
<DockPanel Margin="0 4 0 8" DockPanel.Dock="Top">
<!-- <ComboBox DockPanel.Dock="Right" Width="160" PlaceholderText="Source filter" Name="SourceFilter"/> -->
<TextBox Watermark="Search for title, artist, designer..."/>
</DockPanel>
<UserControl Background="{DynamicResource DataGridContentBackground}">
<DataGrid Name="ListingTable" IsReadOnly="True" SelectionMode="Extended" ItemsSource="{Binding SongCollection}">
<DataGrid.Columns>
<DataGridTextColumn Header="ID" Width="90" Binding="{Binding Id}"/>
<DataGridTextColumn Header="Title" Width="*" Binding="{Binding Name}"/>
<DataGridTextColumn Header="Artist" Width="*" Binding="{Binding Artist}"/>
<DataGridTextColumn Header="Source" Width="150" Binding="{Binding Source}"/>
</DataGrid.Columns>
</DataGrid>
</UserControl>
</DockPanel>
</DockPanel>
</Panel>
+80
View File
@@ -0,0 +1,80 @@
using Microsoft.VisualBasic;
using System;
using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.Threading.Tasks;
using Avalonia.Controls;
using MercuryConverter.Data;
using Avalonia;
namespace MercuryConverter.UI.Views;
public partial class Selection : Panel
{
public static ObservableCollection<Song> SongCollection { get; } = new();
public Selection()
{
InitializeComponent();
ListingTable.SelectionMode = DataGridSelectionMode.Extended;
foreach (var (k, v) in Consts.NUM_SOURCE)
{
FilterSourceContainer.Children.Add(
new CheckBox
{
Name = $"FilterSourceCheckbox{k}",
Content = v,
}
);
}
foreach (var (k, v) in Consts.CATEGORY_INDEX)
{
if (k == -1)
continue;
FilterCategoryContainer.Children.Add(
new CheckBox
{
Name = $"FilterCategoryCheckbox{k}",
Content = v,
}
);
}
SongCollection.CollectionChanged += OnSongsChg;
DataContext = this;
// placeholder data
if (SongCollection.Count == 0)
{
SongCollection.Add(
new Song { Id = "S00-000", Name = "A Name", Artist = "An Artist", Source = Consts.NUM_SOURCE[2] }
);
SongCollection.Add(
new Song { Id = "S00-001", Name = "A Name", Artist = "An Artist", Source = Consts.NUM_SOURCE[3] }
);
}
}
private void OnSongsChg(object? sender, NotifyCollectionChangedEventArgs e)
{
Console.WriteLine("Songs collection changed!");
if (e.NewItems != null)
{
Console.WriteLine("Added...");
foreach (Song added in e.NewItems)
{
Console.WriteLine($"[{added.Id}] {added.Artist} - {added.Name}");
}
}
if (e.OldItems != null)
{
Console.WriteLine("Removed...");
foreach (Song rem in e.OldItems)
{
Console.WriteLine($"[{rem.Id}] {rem.Artist} - {rem.Name}");
}
}
}
}