Various updates.

This commit is contained in:
2025-03-30 23:18:40 -04:00
parent b7ba8341a1
commit f7cacf0bbb
11 changed files with 322 additions and 57 deletions

View File

@@ -11,17 +11,26 @@
mc:Ignorable="d">
<UserControl.Resources>
<SolidColorBrush x:Key="SongItemTitleBrush" Color="#dddddd"/>
<SolidColorBrush x:Key="SongItemSubtitleBrush" Color="#aaaaaa"/>
<Style x:Key="PlayerGrid" TargetType="Grid">
<Setter Property="Background" Value="#1a1a1a"/>
<Setter Property="Padding" Value="10"/>
<Setter Property="Background" Value="Transparent"/>
</Style>
<Style x:Key="SongTitleTextBlock" TargetType="TextBlock">
<Setter Property="FontSize" Value="16"/>
<Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="TextTrimming" Value="CharacterEllipsis"/>
<Setter Property="Foreground" Value="{StaticResource SongItemTitleBrush}"/>
</Style>
<Style x:Key="SongImage" TargetType="Image">
<Setter Property="Width" Value="80"/>
<Setter Property="Height" Value="80"/>
</Style>
</UserControl.Resources>
<Grid Style="{StaticResource PlayerGrid}">
<Grid.ColumnDefinitions>
<ColumnDefinition></ColumnDefinition>
@@ -43,15 +52,16 @@
<Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition>
</Grid.RowDefinitions>
<TextBlock
Grid.Column="0"
Foreground="#aaaaaa"
Text="{Binding Position, Converter={StaticResource SecondsToString}}"
FontSize="13"
Margin="0 0 6 0"
VerticalAlignment="Center"
LineHeight="0">
</TextBlock>
<Border Grid.Column="0" Background="Transparent" Padding="0 8" Width="60" CornerRadius="4" VerticalAlignment="Center" Margin="0 0 6 0">
<TextBlock
Foreground="#aaaaaa"
Text="{Binding Position, Converter={StaticResource SecondsToString}}"
FontSize="13"
HorizontalAlignment="Right"
VerticalAlignment="Center">
</TextBlock>
</Border>
<Slider
Name="PositionSlider"
Loaded="PositionSlider_Loaded"
@@ -59,19 +69,22 @@
Value="{Binding CurrentPosition, Mode=TwoWay, UpdateSourceTrigger=Explicit}"
Minimum="0"
Maximum="{Binding MaxPosition, Mode=OneWay}"
IsEnabled="{Binding CanUpdatePosition, Mode=OneWay}"
ThumbToolTipValueConverter="{StaticResource SecondsToString}"
VerticalAlignment="Center"
VerticalContentAlignment="Center" />
<TextBlock
Grid.Column="2"
Foreground="#aaaaaa"
Text="{Binding MaxPosition, Converter={StaticResource SecondsToString}}"
FontSize="13"
Margin="6 0 0 0"
VerticalAlignment="Center">
</TextBlock>
<Border Grid.Column="2" Background="Transparent" Padding="0 8" Width="60" CornerRadius="4" VerticalAlignment="Center" Margin="6 0 0 0">
<TextBlock
Foreground="#aaaaaa"
Text="{Binding MaxPosition, Converter={StaticResource SecondsToString}}"
FontSize="13"
VerticalAlignment="Center">
</TextBlock>
</Border>
</Grid>
<!-- Song Info -->
<Grid Grid.Row="1" Grid.Column="0" Name="PlayingSongGrid">
<StackPanel Orientation="Horizontal">
@@ -80,10 +93,10 @@
<Canvas Background="#19000000"></Canvas>
</Grid>
<StackPanel VerticalAlignment="Center">
<TextBlock Foreground="#dddddd" FontWeight="SemiBold" FontSize="16" LineHeight="20" Text="{Binding Song, Converter={StaticResource SongTitle}}"></TextBlock>
<TextBlock Foreground="#aaaaaa" FontSize="14" LineHeight="20" Text="{Binding Song.Artists, Converter={StaticResource ArtistsToString}}"></TextBlock>
<TextBlock Foreground="#aaaaaa" FontSize="14" LineHeight="20" Text="{Binding Song.Album}"></TextBlock>
<TextBlock Foreground="#777" FontSize="12" Visibility="{Binding Song, Converter={StaticResource NullVisibility}}" FontWeight="Normal" Opacity="1.0">
<TextBlock Foreground="#dddddd" FontWeight="SemiBold" FontSize="16" Text="{Binding Song, Converter={StaticResource SongTitle}}"></TextBlock>
<TextBlock Foreground="#aaaaaa" FontSize="14" Text="{Binding Song.Artists, Converter={StaticResource ArtistsToString}}"></TextBlock>
<TextBlock Foreground="#aaaaaa" FontSize="14" Text="{Binding Song.Album}"></TextBlock>
<TextBlock Foreground="#777" FontSize="12" Visibility="{Binding Song, Converter={StaticResource NullVisibility}}">
<Run Text="{Binding Song.FileType}"></Run><Run Text=" - "></Run><Run Text="{Binding Song.BitRate}"></Run><Run Text=" kbps - "></Run><Run Text="{Binding Song.SampleRate}"></Run><Run Text=" Hz"></Run>
</TextBlock>
</StackPanel>