Browse Source

UI color refinment for dark mode system

Snoopy 4 years ago
parent
commit
af443e995f
8 changed files with 15 additions and 15 deletions
  1. 3 3
      AuthenticationUC.xaml
  2. 2 2
      BuildIco.xaml
  3. 2 2
      InitialIdleUC.xaml
  4. 1 1
      MainWindow.xaml
  5. 1 1
      MainWindow.xaml.cs
  6. 1 1
      MaintenanceUC.xaml
  7. 1 1
      ModifyIco.xaml
  8. 4 4
      PlugChargingUC.xaml

+ 3 - 3
AuthenticationUC.xaml

@@ -28,7 +28,7 @@
                 <StackPanel x:Name="uxVerifyCustomStackPanel" Orientation="Horizontal" Margin="22,0,450,12" 
                             Visibility="{Binding IsChecked,ElementName=uxVerifyCustomRadioButton,Converter={StaticResource b2v}}">
                     <Button Tag="Verify" Content="Browse" HorizontalAlignment="Left" Width="90" Height="35" 
-                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click"/>
+                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click" Foreground="Black"/>
                     <TextBox x:Name="uxVerifyExploreTextBox" VerticalContentAlignment="Center" Margin="1,0,0,0" Width="270" Height="35" 
                              Style="{StaticResource TextBoxRevealStyle}" Text="Please select an image file" IsReadOnly="True"/>
                 </StackPanel>
@@ -47,7 +47,7 @@
                 <StackPanel x:Name="uxVerifyOkCustomStackPanel" Orientation="Horizontal" Margin="22,0,450,12" 
                             Visibility="{Binding IsChecked,ElementName=uxVerifyOkCustomRadioButton,Converter={StaticResource b2v}}">
                     <Button Tag="VerifyOk" Content="Browse" HorizontalAlignment="Left" Width="90" Height="35" 
-                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click"/>
+                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click" Foreground="Black"/>
                     <TextBox x:Name="uxVerifyOkExploreTextBox" VerticalContentAlignment="Center" Margin="1,0,0,0" Width="270" Height="35" 
                              Style="{StaticResource TextBoxRevealStyle}" Text="Please select an image file" IsReadOnly="True"/>
                 </StackPanel>
@@ -66,7 +66,7 @@
                 <StackPanel x:Name="uxVerifyFailCustomStackPanel" Orientation="Horizontal" Margin="22,0,450,12" 
                             Visibility="{Binding IsChecked,ElementName=uxVerifyFailCustomRadioButton,Converter={StaticResource b2v}}">
                     <Button Tag="VerifyFail" Content="Browse" HorizontalAlignment="Left" Width="90" Height="35" 
-                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click"/>
+                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click" Foreground="Black"/>
                     <TextBox x:Name="uxVerifyFailExploreTextBox" VerticalContentAlignment="Center" Margin="1,0,0,0" Width="270" Height="35" 
                              Style="{StaticResource TextBoxRevealStyle}" Text="Please select an image file" IsReadOnly="True"/>
                 </StackPanel>

+ 2 - 2
BuildIco.xaml

@@ -18,7 +18,7 @@
                 <TextBlock Text="Load images to build ICO" HorizontalAlignment="Left" Margin="22,6,0,12"/>
                 <StackPanel Orientation="Horizontal" Margin="22,0,380,12">
                     <Button Tag="Load" Content="Browse" HorizontalAlignment="Left" Width="90" Height="35" 
-                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click"/>
+                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click" Foreground="Black"/>
                     <TextBox x:Name="uxImageBrowseTextBox" VerticalContentAlignment="Center" Margin="1,0,0,0" Width="270" Height="35" 
                              Style="{StaticResource TextBoxRevealStyle}" IsReadOnly="True"/>
                     <Button x:Name="uxRefreshButton" Margin="3,0,0,0" Width="35" 
@@ -37,7 +37,7 @@
                         </DataGrid.Columns>
                     </DataGrid>
                     <Button x:Name="uxBuildButton" Tag="Build" Content="Build" HorizontalAlignment="Left" Width="90" Height="35" Margin="0,18,0,12"  
-                            Style="{StaticResource ButtonRevealStyle}" Click="uxBuildButton_Click" Visibility="Collapsed"/>
+                            Style="{StaticResource ButtonRevealStyle}" Click="uxBuildButton_Click" Visibility="Collapsed" Foreground="Black"/>
                     <Viewbox x:Name="viewbox" Stretch="Uniform">
                         <UniformGrid x:Name="uxIcoUniformGrid" Background="AliceBlue"/>
                     </Viewbox>

+ 2 - 2
InitialIdleUC.xaml

@@ -28,7 +28,7 @@
                 <StackPanel x:Name="uxInitCustomStackPanel" Orientation="Horizontal" Margin="22,0,370,12" 
                             Visibility="{Binding IsChecked,ElementName=uxInitCustomRadioButton,Converter={StaticResource b2v}}">
                     <Button Tag="Initial" Content="Browse" HorizontalAlignment="Left" Width="90" Height="35" 
-                            Style="{StaticResource ButtonRevealStyle}" Click="uxExploreButton_Click" />
+                            Style="{StaticResource ButtonRevealStyle}" Click="uxExploreButton_Click" Foreground="Black"/>
                     <TextBox x:Name="uxInitExploreTextBox" VerticalContentAlignment="Center" Margin="1,0,0,0" Width="270" Height="35" 
                              Style="{StaticResource TextBoxRevealStyle}" Text="Please select an image file"/>
                 </StackPanel>
@@ -47,7 +47,7 @@
                 <StackPanel x:Name="uxIdleCustomStackPanel" Orientation="Horizontal" Margin="22,0,370,12" 
                             Visibility="{Binding IsChecked,ElementName=uxIdleCustomRadioButton,Converter={StaticResource b2v}}">
                     <Button Tag="Idle" Content="Browse" HorizontalAlignment="Left" Width="90" Height="35" 
-                            Style="{StaticResource ButtonRevealStyle}" Click="uxExploreButton_Click"/>
+                            Style="{StaticResource ButtonRevealStyle}" Click="uxExploreButton_Click" Foreground="Black"/>
                     <TextBox x:Name="uxIdleExploreTextBox" VerticalContentAlignment="Center" Margin="1,0,0,0" Width="270" Height="35" 
                              Style="{StaticResource TextBoxRevealStyle}" Text="Please select an image file"/>
                 </StackPanel>

+ 1 - 1
MainWindow.xaml

@@ -10,7 +10,7 @@
         fd:AcrylicWindow.Enabled="True" fd:AcrylicWindow.AcrylicWindowStyle="NoIcon"
         fd:AcrylicWindow.ExtendViewIntoTitleBar="True"
         fd:AcrylicWindow.TintColor="#FFFFFF" fd:AcrylicWindow.NoiseOpacity="0.02"
-        Title="Phihong EVSE UI Tool" Height="800" Width="1200" FontFamily="Segoe UI"
+        Title="Phihong EVSE UI Tool" Height="800" Width="1200" FontFamily="Segoe UI" Foreground="Black"
         WindowStyle="None" AllowsTransparency="True" WindowStartupLocation="CenterScreen">
     <Grid>
         <Grid.ColumnDefinitions>

+ 1 - 1
MainWindow.xaml.cs

@@ -46,7 +46,7 @@ namespace Phihong_EVSE_UI_Tool
                 Binding myBinding = new Binding("ImmersiveSystemAccentBrush");
                 myBinding.Source = new AccentColors();
                 item.SetBinding(ListViewItem.ForegroundProperty, myBinding);
-                item.Background = new SolidColorBrush(Color.FromArgb(45, 0, 0, 0));
+                item.Background = new SolidColorBrush(Color.FromArgb(40, 0, 0, 0));
 
                 uxTitleTextBlock.Text = (item.Content as StackPanel).Children.OfType<TextBlock>().First().Text;
 

+ 1 - 1
MaintenanceUC.xaml

@@ -28,7 +28,7 @@
                 <StackPanel x:Name="uxMaintainCustomStackPanel" Orientation="Horizontal" Margin="22,0,450,12" 
                             Visibility="{Binding IsChecked,ElementName=uxMaintainCustomRadioButton,Converter={StaticResource b2v}}">
                     <Button Tag="Maintain" Content="Browse" HorizontalAlignment="Left" Width="90" Height="35" 
-                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click"/>
+                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click" Foreground="Black"/>
                     <TextBox x:Name="uxMaintainExploreTextBox" VerticalContentAlignment="Center" Margin="1,0,0,0" Width="270" Height="35" 
                              Style="{StaticResource TextBoxRevealStyle}" Text="Please select an image file" IsReadOnly="True"/>
                 </StackPanel>

+ 1 - 1
ModifyIco.xaml

@@ -29,7 +29,7 @@
                 <StackPanel x:Name="uxLogoCustomStackPanel" Orientation="Horizontal" Margin="22,0,450,12" 
                             Visibility="{Binding IsChecked,ElementName=uxLogoCustomRadioButton,Converter={StaticResource b2v}}">
                     <Button Tag="Logo" Content="Browse" HorizontalAlignment="Left" Width="90" Height="35"
-                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click"/>
+                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click" Foreground="Black"/>
                     <TextBox x:Name="uxLogoBrowseTextBox" VerticalContentAlignment="Center" Margin="1,0,0,0" Width="270" Height="35" 
                              Style="{StaticResource TextBoxRevealStyle}" Text="Please select logo image" IsReadOnly="True"/>
                 </StackPanel>

+ 4 - 4
PlugChargingUC.xaml

@@ -28,7 +28,7 @@
                 <StackPanel x:Name="uxPlugCustomStackPanel" Orientation="Horizontal" Margin="22,0,450,12" 
                             Visibility="{Binding IsChecked,ElementName=uxPlugCustomRadioButton,Converter={StaticResource b2v}}">
                     <Button Tag="Plug" Content="Browse" HorizontalAlignment="Left" Width="90" Height="35" 
-                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click"/>
+                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click" Foreground="Black"/>
                     <TextBox x:Name="uxPlugExploreTextBox" VerticalContentAlignment="Center" Margin="1,0,0,0" Width="270" Height="35" 
                              Style="{StaticResource TextBoxRevealStyle}" Text="Please select an image file" IsReadOnly="True"/>
                 </StackPanel>
@@ -47,7 +47,7 @@
                 <StackPanel x:Name="uxPrechargeCustomStackPanel" Orientation="Horizontal" Margin="22,0,450,12" 
                             Visibility="{Binding IsChecked,ElementName=uxPrechargeCustomRadioButton,Converter={StaticResource b2v}}">
                     <Button Tag="Precharge" Content="Browse" HorizontalAlignment="Left" Width="90" Height="35" 
-                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click"/>
+                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click" Foreground="Black"/>
                     <TextBox x:Name="uxPrechargeExploreTextBox" VerticalContentAlignment="Center" Margin="1,0,0,0" Width="270" Height="35" 
                              Style="{StaticResource TextBoxRevealStyle}" Text="Please select an image file" IsReadOnly="True"/>
                 </StackPanel>
@@ -66,7 +66,7 @@
                 <StackPanel x:Name="uxChargingCustomStackPanel" Orientation="Horizontal" Margin="22,0,450,12" 
                             Visibility="{Binding IsChecked,ElementName=uxChargingCustomRadioButton,Converter={StaticResource b2v}}">
                     <Button Tag="Charging" Content="Browse" HorizontalAlignment="Left" Width="90" Height="35" 
-                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click"/>
+                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click" Foreground="Black"/>
                     <TextBox x:Name="uxChargingExploreTextBox" VerticalContentAlignment="Center" Margin="1,0,0,0" Width="270" Height="35" 
                              Style="{StaticResource TextBoxRevealStyle}" Text="Please select an image file" IsReadOnly="True"/>
                 </StackPanel>
@@ -85,7 +85,7 @@
                 <StackPanel x:Name="uxCompleteCustomStackPanel" Orientation="Horizontal" Margin="22,0,450,12" 
                             Visibility="{Binding IsChecked,ElementName=uxCompleteCustomRadioButton,Converter={StaticResource b2v}}">
                     <Button Tag="Complete" Content="Browse" HorizontalAlignment="Left" Width="90" Height="35" 
-                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click"/>
+                            Style="{StaticResource ButtonRevealStyle}" Click="uxBrowseButton_Click" Foreground="Black"/>
                     <TextBox x:Name="uxCompleteExploreTextBox" VerticalContentAlignment="Center" Margin="1,0,0,0" Width="270" Height="35" 
                              Style="{StaticResource TextBoxRevealStyle}" Text="Please select an image file" IsReadOnly="True"/>
                 </StackPanel>