muskit/MercuryConverter
1
0
Fork 0
mirror of https://github.com/muskit/MercuryConverter.git synced 2026-06-02 20:24:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

make it look prettier

Browse Source
This commit is contained in:
Alex
2025-08-08 00:08:45 -07:00
parent 78961fa8c2
commit bc8da38329
7 changed files with 49 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App.axaml
+8 -6
View File
@@ -1,15 +1,13 @@
<Application xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="MercuryConverter.App"
RequestedThemeVariant="Default">
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
RequestedThemeVariant="Default"> <!-- Dark Default Light -->
<Application.Styles>
<!-- <FluentTheme /> -->
<FluentTheme>
<FluentTheme.Palettes>
<ColorPaletteResources x:Key="Light" Accent="#ffb85add" AltHigh="White" AltLow="White" AltMedium="White" AltMediumHigh="White" AltMediumLow="White" BaseHigh="Black" BaseLow="#ffa1aeff" BaseMedium="#ff5a71c0" BaseMediumHigh="#ff2b4996" BaseMediumLow="#ff435dab" ChromeAltLow="#ff2b4996" ChromeBlackHigh="Black" ChromeBlackLow="#ffa1aeff" ChromeBlackMedium="#ff2b4996" ChromeBlackMediumLow="#ff5a71c0" ChromeDisabledHigh="#ffa1aeff" ChromeDisabledLow="#ff5a71c0" ChromeGray="#ff435dab" ChromeHigh="#ffa1aeff" ChromeLow="#ffd9e1ff" ChromeMedium="#ffced7ff" ChromeMediumLow="#ffd9e1ff" ChromeWhite="White" ListLow="#ffced7ff" ListMedium="#ffa1aeff" RegionColor="#ffccdbff" />
<ColorPaletteResources x:Key="Dark" Accent="#ff9b21dd" AltHigh="Black" AltLow="Black" AltMedium="Black" AltMediumHigh="Black" AltMediumLow="Black" BaseHigh="White" BaseLow="#994736b0" BaseMedium="#eba49be0" BaseMediumHigh="#ffbbb4ec" BaseMediumLow="#c27568c8" ChromeAltLow="#ffbbb4ec" ChromeBlackHigh="Black" ChromeBlackLow="#ffbbb4ec" ChromeBlackMedium="Black" ChromeBlackMediumLow="Black" ChromeDisabledHigh="#994736b0" ChromeDisabledLow="#eba49be0" ChromeGray="#d68d82d4" ChromeHigh="#d68d82d4" ChromeLow="#eb101272" ChromeMedium="#d61e1b82" ChromeMediumLow="#ad392da1" ChromeWhite="White" ListLow="#d61e1b82" ListMedium="#994736b0" RegionColor="#ff1c1f46" />
<ColorPaletteResources x:Key="Light" Accent="#ffb459c0" AltHigh="White" AltLow="White" AltMedium="White" AltMediumHigh="White" AltMediumLow="White" BaseHigh="Black" BaseLow="#ffa1aeff" BaseMedium="#ff5a71c0" BaseMediumHigh="#ff2b4996" BaseMediumLow="#ff435dab" ChromeAltLow="#ff2b4996" ChromeBlackHigh="Black" ChromeBlackLow="#ffa1aeff" ChromeBlackMedium="#ff2b4996" ChromeBlackMediumLow="#ff5a71c0" ChromeDisabledHigh="#ffa1aeff" ChromeDisabledLow="#ff5a71c0" ChromeGray="#ff435dab" ChromeHigh="#ffa1aeff" ChromeLow="#ffd9e1ff" ChromeMedium="#ffced7ff" ChromeMediumLow="#ffd9e1ff" ChromeWhite="White" ListLow="#ffced7ff" ListMedium="#ffa1aeff" RegionColor="#ffccdbff" />
<ColorPaletteResources x:Key="Dark" Accent="#ff9b21dd" AltHigh="Black" AltLow="Black" AltMedium="Black" AltMediumHigh="Black" AltMediumLow="Black" BaseHigh="White" BaseLow="#ff3c2d94" BaseMedium="#ff9e96d2" BaseMediumHigh="#ffb7b0e1" BaseMediumLow="#ff6d61b3" ChromeAltLow="#ffb7b0e1" ChromeBlackHigh="Black" ChromeBlackLow="#ffb7b0e1" ChromeBlackMedium="Black" ChromeBlackMediumLow="Black" ChromeDisabledHigh="#ff3c2d94" ChromeDisabledLow="#ff9e96d2" ChromeGray="#ff867cc2" ChromeHigh="#ff867cc2" ChromeLow="#ff0c0f5e" ChromeMedium="#ff18166c" ChromeMediumLow="#ff302587" ChromeWhite="White" ListLow="#ff18166c" ListMedium="#ff3c2d94" RegionColor="#ff1c1f46" />
</FluentTheme.Palettes>
<Style Selector="DataGrid:focus DataGridCell:current /template/ Grid#FocusVisual">
<Setter Property="IsVisible" Value="False" />
@@ -26,13 +24,17 @@
<ResourceDictionary x:Key="Light">
<SolidColorBrush x:Key="ExpanderHeaderBackgroundPointerOver">#40FFFFFF</SolidColorBrush>
<SolidColorBrush x:Key="DataGridContentBackground">#40FFFFFF</SolidColorBrush>
<Bitmap x:Key="BannerBitmap">/Assets/imgs/banner_light.png</Bitmap>
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<SolidColorBrush x:Key="ExpanderHeaderBackgroundPointerOver">#20000000</SolidColorBrush>
<SolidColorBrush x:Key="DataGridContentBackground">#20000000</SolidColorBrush>
<Bitmap x:Key="BannerBitmap">/Assets/imgs/banner_dark.png</Bitmap>
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
<!-- Component Override -->
<!-- Control Property Override -->
<Thickness x:Key="TabItemMargin">12</Thickness>
<!-- Control Override -->
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="Overrides/Expander.axaml"/>
</ResourceDictionary.MergedDictionaries>
Assets/imgs/banner_dark.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 57 KiB

Assets/imgs/banner_light.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 59 KiB

Assets/jacket-placeholder.png → Assets/imgs/jacket-placeholder.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 94 KiB

MainWindow.axaml
+10 -1
View File
@@ -12,6 +12,15 @@
ExtendClientAreaToDecorationsHint="True"
>
<!-- Components -->
<Panel>
<!-- Banner -->
<StackPanel>
<UserControl Background="{DynamicResource SystemAltHighColor}" Height="86"/>
</StackPanel>
<StackPanel HorizontalAlignment="Right">
<Image Height="86" Source="{DynamicResource BannerBitmap}"/>
</StackPanel>
<DockPanel>
<Menu Name="MenuBar" DockPanel.Dock="Top">
<MenuItem Header="File">
@@ -26,6 +35,6 @@
<TabItem Header="export">
</TabItem>
</TabControl>
</DockPanel>
</Panel>
</Window>
Views/Selection/Selection.axaml
+9 -3
View File
@@ -8,13 +8,19 @@
<DockPanel>
<ContentControl Name="SelectionInfo" DockPanel.Dock="Right" Width="250">
<StackPanel Margin="12">
<Image Source="/Assets/jacket-placeholder.png"/>
<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"/>
<UserControl Margin="0 24 0 0">
</UserControl>
</StackPanel>
</ContentControl>
<DockPanel Margin="0 0 8 0">
<DockPanel Margin="0 0 0 8" DockPanel.Dock="Top">
<DockPanel Margin="0 4 0 8" DockPanel.Dock="Top">
<ComboBox DockPanel.Dock="Right" Width="160" PlaceholderText="Source filter" Name="SourceFilter"/>
<TextBox Margin="0 0 8 0" Watermark="Search for title, artist, charter..."/>
<TextBox Margin="0 0 8 0" Watermark="Search for title, artist, designer..."/>
</DockPanel>
<UserControl Background="{DynamicResource DataGridContentBackground}">
<DataGrid Name="ListingTable" IsReadOnly="True" SelectionMode="Extended" ItemsSource="{Binding SongCollection}">
Views/Selection/Selection.axaml.cs
+4 -2
View File
@@ -26,13 +26,15 @@ public partial class Selection : Panel
DataContext = this;
// test 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-000", Name = "A Name", Artist = "An Artist", Source = Consts.NUM_SOURCE[3] }
new Song { Id = "S00-001", Name = "A Name", Artist = "An Artist", Source = Consts.NUM_SOURCE[3] }
);
}
}
private void OnSongsChg(object? sender, NotifyCollectionChangedEventArgs e)