Skip to content

Commit

Permalink
Redesigned the "Converter" page (#116)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Leo-Peyronnet
Leo-Peyronnet committed Feb 16, 2022
1 parent 9c1ff80 commit 8de992f
Showing 1 changed file with 49 additions and 38 deletions.
87 changes: 49 additions & 38 deletions ColorPicker/Pages/ConverterPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,45 +93,56 @@
<TextBlock x:Name="ValidMsgTxt" FontWeight="Bold" FontSize="12" VerticalAlignment="Center"/>
</StackPanel>

<StackPanel Orientation="Horizontal" Grid.Row="2">
<Border x:Name="ColorDisplayer" CornerRadius="10" Margin="10" d:Background="Red" Grid.Column="0" Height="100" Width="100"/>
<StackPanel Margin="0,10,0,0" VerticalAlignment="Center">
<TextBlock FontWeight="Bold" FontSize="14" Text="{x:Static lang:Resources.RGB}" x:Name="RGBTxt"/>
<TextBlock FontWeight="Bold" FontSize="14" Text="{x:Static lang:Resources.HEX}" x:Name="HEXTxt"/>
<TextBlock FontWeight="Bold" FontSize="14" Text="{x:Static lang:Resources.HSV}" x:Name="HSVTxt"/>
<TextBlock FontWeight="Bold" FontSize="14" Text="{x:Static lang:Resources.HSL}" x:Name="HSLTxt"/>
<TextBlock FontWeight="Bold" FontSize="14" Text="{x:Static lang:Resources.CMYK}" x:Name="CMYKTxt"/>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="2">
<Border x:Name="ColorDisplayer" CornerRadius="10" Margin="10" d:Background="Red" Grid.Column="0" Height="100" Width="100"/>
<Grid Margin="0,10,0,0" VerticalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>

<StackPanel Orientation="Horizontal" Grid.Row="3" HorizontalAlignment="Center">
<Button x:Name="CopyBtn" Click="CopyBtn_Click" Content="{x:Static lang:Resources.CopyRGB}" HorizontalAlignment="Center" Padding="10,5,10,5" Style="{DynamicResource TabButtonStyle}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background2}}" FontWeight="Bold" Margin="0,10,10,0">
<Button.ToolTip>
<ToolTip Content="{x:Static lang:Resources.CopyRGB}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
</Button.ToolTip>
</Button>
<Button x:Name="CopyHEXBtn" Click="CopyHEXBtn_Click" Content="{x:Static lang:Resources.CopyHEX}" HorizontalAlignment="Center" Padding="10,5,10,5" Style="{DynamicResource TabButtonStyle}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background2}}" FontWeight="Bold" Margin="0,10,10,0">
<Button.ToolTip>
<ToolTip Content="{x:Static lang:Resources.CopyHEX}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
</Button.ToolTip>
</Button>
<Button x:Name="CopyHSVBtn" Click="CopyHSVBtn_Click" Content="{x:Static lang:Resources.CopyHSV}" HorizontalAlignment="Center" Padding="10,5,10,5" Style="{DynamicResource TabButtonStyle}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background2}}" FontWeight="Bold" Margin="0,10,10,0">
<Button.ToolTip>
<ToolTip Content="{x:Static lang:Resources.CopyHSV}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
</Button.ToolTip>
</Button>
<Button x:Name="CopyHSLBtn" Click="CopyHSLBtn_Click" Content="{x:Static lang:Resources.CopyHSL}" HorizontalAlignment="Center" Padding="10,5,10,5" Style="{DynamicResource TabButtonStyle}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background2}}" FontWeight="Bold" Margin="0,10,10,0">
<Button.ToolTip>
<ToolTip Content="{x:Static lang:Resources.CopyHSL}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
</Button.ToolTip>
</Button>
<Button x:Name="CopyCMYKBtn" Click="CopyCMYKBtn_Click" Content="{x:Static lang:Resources.CopyCMYK}" HorizontalAlignment="Center" Padding="10,5,10,5" Style="{DynamicResource TabButtonStyle}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background2}}" FontWeight="Bold" Margin="0,10,0,0">
<Button.ToolTip>
<ToolTip Content="{x:Static lang:Resources.CopyCMYK}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
</Button.ToolTip>
</Button>
</StackPanel>
</Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>

<TextBlock FontWeight="Bold" FontSize="14" Text="{x:Static lang:Resources.RGB}" x:Name="RGBTxt" VerticalAlignment="Center"/>
<TextBlock FontWeight="Bold" FontSize="14" Text="{x:Static lang:Resources.HEX}" x:Name="HEXTxt" Grid.Row="1" VerticalAlignment="Center"/>
<TextBlock FontWeight="Bold" FontSize="14" Text="{x:Static lang:Resources.HSV}" x:Name="HSVTxt" Grid.Row="2" VerticalAlignment="Center"/>
<TextBlock FontWeight="Bold" FontSize="14" Text="{x:Static lang:Resources.HSL}" x:Name="HSLTxt" Grid.Row="3" VerticalAlignment="Center"/>
<TextBlock FontWeight="Bold" FontSize="14" Text="{x:Static lang:Resources.CMYK}" x:Name="CMYKTxt" Grid.Row="4" VerticalAlignment="Center"/>

<Button x:Name="CopyBtn" Click="CopyBtn_Click" Content="&#xF32C;" HorizontalAlignment="Left" Padding="5" Style="{DynamicResource TabButtonStyle}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background2}}" Margin="2" Grid.Column="1" VerticalAlignment="Center" FontFamily="..\Fonts\#FluentSystemIcons-Regular">
<Button.ToolTip>
<ToolTip Content="{x:Static lang:Resources.CopyRGB}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
</Button.ToolTip>
</Button>
<Button x:Name="CopyHEXBtn" Click="CopyHEXBtn_Click" Content="&#xF32C;" HorizontalAlignment="Left" Padding="5" Style="{DynamicResource TabButtonStyle}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background2}}" Margin="2" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" FontFamily="..\Fonts\#FluentSystemIcons-Regular">
<Button.ToolTip>
<ToolTip Content="{x:Static lang:Resources.CopyHEX}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
</Button.ToolTip>
</Button>
<Button x:Name="CopyHSVBtn" Click="CopyHSVBtn_Click" Content="&#xF32C;" HorizontalAlignment="Left" Padding="5" Style="{DynamicResource TabButtonStyle}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background2}}" Margin="2" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" FontFamily="..\Fonts\#FluentSystemIcons-Regular">
<Button.ToolTip>
<ToolTip Content="{x:Static lang:Resources.CopyHSV}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
</Button.ToolTip>
</Button>
<Button x:Name="CopyHSLBtn" Click="CopyHSLBtn_Click" Content="&#xF32C;" HorizontalAlignment="Left" Padding="5" Style="{DynamicResource TabButtonStyle}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background2}}" Margin="2" Grid.Row="3" Grid.Column="1" VerticalAlignment="Center" FontFamily="..\Fonts\#FluentSystemIcons-Regular">
<Button.ToolTip>
<ToolTip Content="{x:Static lang:Resources.CopyHSL}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
</Button.ToolTip>
</Button>
<Button x:Name="CopyCMYKBtn" Click="CopyCMYKBtn_Click" Content="&#xF32C;" HorizontalAlignment="Left" Padding="5" Style="{DynamicResource TabButtonStyle}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background2}}" Margin="2" Grid.Row="4" Grid.Column="1" VerticalAlignment="Center" FontFamily="..\Fonts\#FluentSystemIcons-Regular">
<Button.ToolTip>
<ToolTip Content="{x:Static lang:Resources.CopyCMYK}" Foreground="{Binding Source={StaticResource Foreground1}}" Background="{Binding Source={StaticResource Background1}}"/>
</Button.ToolTip>
</Button>
</Grid>
</StackPanel>
</Grid>
</StackPanel>
</Grid>
</Grid>
Expand Down

0 comments on commit 8de992f

Please sign in to comment.