feat: Enhance button styles and layout across various views for improved UI consistency
This commit is contained in:
@@ -19,10 +19,22 @@
|
||||
<ColumnDefinition Width="80" />
|
||||
<ColumnDefinition Width="80" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Button Width="70" Height="50" Margin="10,0,0,0" Content="B" Command="{Binding BackCommand}" />
|
||||
<Button Width="70" Height="50" Margin="10,0,0,0" Classes="icon-yellow" Command="{Binding BackCommand}">
|
||||
<Viewbox Width="22" Height="22">
|
||||
<Path Fill="Gray" Data="M14.7 5.3L8 12L14.7 18.7L16.1 17.3L10.8 12L16.1 6.7Z" />
|
||||
</Viewbox>
|
||||
</Button>
|
||||
<TextBlock Grid.Column="1" FontSize="20" Foreground="White" Text="{Binding TopPanelTitle}" HorizontalAlignment="Center" VerticalAlignment="Center" />
|
||||
<Button Grid.Column="2" Width="50" Height="70" Margin="10,0,0,0" Content="F" Command="{Binding FullscreenCommand}" />
|
||||
<Button Grid.Column="3" Width="70" Height="70" Margin="10,0,0,0" Content="X" Command="{Binding CloseAppCommand}" />
|
||||
<Button Grid.Column="2" Width="50" Height="70" Margin="10,0,0,0" Classes="icon-yellow" Command="{Binding FullscreenCommand}">
|
||||
<Viewbox Width="22" Height="22">
|
||||
<Path Fill="Gray" Data="M4 9V4H9V6H6V9H4M15 4H20V9H18V6H15V4M20 15V20H15V18H18V15H20M9 20H4V15H6V18H9V20Z" />
|
||||
</Viewbox>
|
||||
</Button>
|
||||
<Button Grid.Column="3" Width="70" Height="70" Margin="10,0,0,0" Classes="icon-red" Command="{Binding CloseAppCommand}">
|
||||
<Viewbox Width="22" Height="22">
|
||||
<Path Stroke="White" StrokeThickness="2.5" Data="M5,5 L19,19 M19,5 L5,19" />
|
||||
</Viewbox>
|
||||
</Button>
|
||||
</Grid>
|
||||
|
||||
<Border Grid.Row="1"
|
||||
@@ -49,13 +61,21 @@
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="180" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="100" />
|
||||
<ColumnDefinition Width="70" />
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Button Width="50" Height="70" Margin="10,0,10,0" Content="-" Command="{Binding PreviousCommand}" />
|
||||
<Button Width="50" Height="70" Margin="10,0,10,0" Classes="icon-yellow" Command="{Binding PreviousCommand}">
|
||||
<Viewbox Width="18" Height="18">
|
||||
<Path Fill="Gray" Data="M8 12L14 6V18Z" />
|
||||
</Viewbox>
|
||||
</Button>
|
||||
<TextBlock FontSize="15" Foreground="White" Text="Ch" HorizontalAlignment="Center" VerticalAlignment="Center" />
|
||||
<Button Width="50" Height="70" Margin="10,0,10,0" Content="+" Command="{Binding NextCommand}" />
|
||||
<Button Width="50" Height="70" Margin="10,0,10,0" Classes="icon-yellow" Command="{Binding NextCommand}">
|
||||
<Viewbox Width="18" Height="18">
|
||||
<Path Fill="Gray" Data="M16 12L10 18V6Z" />
|
||||
</Viewbox>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
|
||||
<Button Grid.Column="1"
|
||||
@@ -72,11 +92,6 @@
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
|
||||
<StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Button Width="70" Height="50" Margin="8,0,0,0" Content="G" Command="{Binding ShowProgramListCommand}" />
|
||||
<Button Width="70" Height="50" Margin="8,0,0,0" Content="Open" Command="{Binding OpenStreamCommand}" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
|
||||
@@ -15,9 +15,10 @@
|
||||
</ListBox.ItemsPanel>
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Button Width="170"
|
||||
Height="130"
|
||||
Margin="8"
|
||||
<Button Width="150"
|
||||
Height="70"
|
||||
Margin="8,6"
|
||||
Classes="card"
|
||||
Background="#B0000000"
|
||||
BorderBrush="Yellow"
|
||||
BorderThickness="2"
|
||||
@@ -25,8 +26,7 @@
|
||||
CommandParameter="{Binding}">
|
||||
<TextBlock Text="{Binding Name}"
|
||||
Foreground="White"
|
||||
FontSize="20"
|
||||
FontWeight="Bold"
|
||||
FontSize="15"
|
||||
TextWrapping="Wrap"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
|
||||
@@ -14,27 +14,31 @@
|
||||
</ListBox.ItemsPanel>
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Button Width="170"
|
||||
Height="130"
|
||||
Margin="8"
|
||||
<Button Width="150"
|
||||
Height="70"
|
||||
Margin="8,6"
|
||||
Classes="card"
|
||||
Background="#B0000000"
|
||||
BorderBrush="Yellow"
|
||||
BorderThickness="2"
|
||||
Command="{Binding DataContext.SelectGroupCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
|
||||
CommandParameter="{Binding}">
|
||||
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="6">
|
||||
<Grid RowDefinitions="*,Auto" VerticalAlignment="Center" HorizontalAlignment="Stretch">
|
||||
<TextBlock Text="{Binding Name}"
|
||||
Foreground="White"
|
||||
FontSize="20"
|
||||
FontWeight="Bold"
|
||||
FontSize="15"
|
||||
TextWrapping="Wrap"
|
||||
HorizontalAlignment="Center"
|
||||
TextAlignment="Center" />
|
||||
VerticalAlignment="Center"
|
||||
TextAlignment="Center"
|
||||
Margin="4,0" />
|
||||
<TextBlock Text="{Binding Count}"
|
||||
Grid.Row="1"
|
||||
Foreground="White"
|
||||
FontSize="16"
|
||||
HorizontalAlignment="Center" />
|
||||
</StackPanel>
|
||||
FontSize="10"
|
||||
HorizontalAlignment="Center"
|
||||
Margin="0,0,0,2" />
|
||||
</Grid>
|
||||
</Button>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
<Button Width="106"
|
||||
Height="145"
|
||||
Margin="3"
|
||||
Classes="card"
|
||||
Background="#B0000000"
|
||||
BorderBrush="Yellow"
|
||||
BorderThickness="2"
|
||||
|
||||
@@ -15,7 +15,11 @@
|
||||
<TextBox Text="{Binding PlaylistURL}" />
|
||||
<TextBlock Foreground="White" FontSize="22" FontWeight="Bold" Text="Playlist Name" />
|
||||
<TextBox Text="{Binding PlaylistName}" />
|
||||
<Button Content="Add" Width="70" Height="70" HorizontalAlignment="Center" Command="{Binding AddPlaylistCommand}" />
|
||||
<Button Width="70" Height="70" HorizontalAlignment="Center" Classes="icon-green" Command="{Binding AddPlaylistCommand}">
|
||||
<Viewbox Width="24" Height="24">
|
||||
<Path Fill="White" Data="M11 5H13V11H19V13H13V19H11V13H5V11H11V5Z" />
|
||||
</Viewbox>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
|
||||
<ListBox Height="250"
|
||||
@@ -31,9 +35,13 @@
|
||||
<Button Grid.Column="2"
|
||||
Width="70"
|
||||
Height="70"
|
||||
Content="-"
|
||||
Classes="icon-red"
|
||||
CommandParameter="{Binding}"
|
||||
Command="{Binding DataContext.PlaylistDeleteCommand, RelativeSource={RelativeSource AncestorType=UserControl}}" />
|
||||
Command="{Binding DataContext.PlaylistDeleteCommand, RelativeSource={RelativeSource AncestorType=UserControl}}">
|
||||
<Viewbox Width="24" Height="24">
|
||||
<Path Fill="White" Data="M5 11H19V13H5Z" />
|
||||
</Viewbox>
|
||||
</Button>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
@@ -43,8 +51,16 @@
|
||||
<CheckBox Margin="10" Foreground="White" FontSize="25" IsChecked="{Binding StartLastScreen}" Content="Remember last" />
|
||||
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
|
||||
<Button Width="70" Height="70" Margin="10,0,50,0" Content="B" Command="{Binding BackCommand}" />
|
||||
<Button Width="70" Height="70" Content="OK" Command="{Binding SaveCommand}" />
|
||||
<Button Width="70" Height="70" Margin="10,0,50,0" Classes="icon-yellow" Command="{Binding BackCommand}">
|
||||
<Viewbox Width="24" Height="24">
|
||||
<Path Fill="Gray" Data="M14.7 5.3L8 12L14.7 18.7L16.1 17.3L10.8 12L16.1 6.7Z" />
|
||||
</Viewbox>
|
||||
</Button>
|
||||
<Button Width="70" Height="70" Classes="icon-lightgreen" Command="{Binding SaveCommand}">
|
||||
<Viewbox Width="24" Height="24">
|
||||
<Path Fill="Gray" Data="M9 16.2L4.8 12L3.4 13.4L9 19L21 7L19.6 5.6Z" />
|
||||
</Viewbox>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Viewbox>
|
||||
|
||||
Reference in New Issue
Block a user