更改了灰字使用的颜色资源使灰字更清晰

sovetskyfish · Apr 28, 2020 · 53329d7 · 53329d7
1 parent 3b28670
commit 53329d7
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/PixivFSUWP/IllustDetailPage.xaml b/PixivFSUWP/IllustDetailPage.xaml
@@ -71,7 +71,7 @@
                             </Ellipse.Fill>
                         </Ellipse>
                         <TextBlock x:Name="txtAuthor" Margin="10,0" Grid.Column="1" FontSize="16" FontWeight="Bold" VerticalAlignment="Bottom"/>
-                        <TextBlock x:Name="txtAuthorAccount" Margin="10,0" Grid.Row="1" Grid.Column="1" FontSize="14" Foreground="{ThemeResource SystemChromeDisabledLowColor}" VerticalAlignment="Top"/>
+                        <TextBlock x:Name="txtAuthorAccount" Margin="10,0" Grid.Row="1" Grid.Column="1" FontSize="14" Foreground="{ThemeResource SystemBaseMediumColor}" VerticalAlignment="Top"/>
                     </Grid>
                 </Button>
                 <Button Style="{StaticResource ButtonRevealStyle}" x:Name="btnPlay" Click="BtnPlay_Click"
@@ -137,7 +137,7 @@
                 <TextBox TextWrapping="Wrap" AcceptsReturn="True" x:Name="txtComment" Height="80" PlaceholderText="编写评论..."/>
                 <StackPanel Margin="0 5 0 0" Orientation="Horizontal">
                     <Button x:Name="btnPublishComment" Click="btnPublishComment_Click">发表评论</Button>
-                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="12" Foreground="{ThemeResource SystemChromeDisabledLowColor}">*请带着鼓励和建设性的态度发表评论</TextBlock>
+                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="12" Foreground="{ThemeResource SystemBaseMediumColor}">*请带着鼓励和建设性的态度发表评论</TextBlock>
                 </StackPanel>
             </StackPanel>
             <ListView x:Name="listComments" Margin="0,15" IncrementalLoadingTrigger="None" SelectionMode="None"
@@ -170,10 +170,10 @@
                                         </Ellipse.Fill>
                                     </Ellipse>
                                     <TextBlock Margin="5,0" Grid.Column="1" FontSize="14" FontWeight="Bold" VerticalAlignment="Bottom" Text="{Binding UserName}"/>
-                                    <TextBlock Margin="5,0" Grid.Row="1" Grid.Column="1" FontSize="12" Foreground="{ThemeResource SystemChromeDisabledLowColor}" VerticalAlignment="Top" Text="{Binding UserAccount}"/>
+                                    <TextBlock Margin="5,0" Grid.Row="1" Grid.Column="1" FontSize="12" Foreground="{ThemeResource SystemBaseMediumColor}" VerticalAlignment="Top" Text="{Binding UserAccount}"/>
                                 </Grid>
                                 <TextBlock Grid.Row="1" Margin="0,5,0,0" Text="{Binding Comment}" TextWrapping="WrapWholeWords"/>
-                                <TextBlock Grid.Row="2" Margin="0,3,0,0" Text="{Binding DateTime}" FontSize="12" Foreground="{ThemeResource SystemChromeDisabledLowColor}"/>
+                                <TextBlock Grid.Row="2" Margin="0,3,0,0" Text="{Binding DateTime}" FontSize="12" Foreground="{ThemeResource SystemBaseMediumColor}"/>
                                 <ListView Grid.Row="3" Margin="10,5,0,0" Visibility="{Binding ChildrenComments,Converter={StaticResource ChildrenCommentVisibilityConverter}}"
                                           ItemsSource="{Binding ChildrenComments}" SelectionMode="None"
                                           ScrollViewer.VerticalScrollMode="Disabled" ScrollViewer.HorizontalScrollMode="Disabled">
@@ -201,10 +201,10 @@
                                                             </Ellipse.Fill>
                                                         </Ellipse>
                                                         <TextBlock Margin="5,0" Grid.Column="1" FontSize="14" FontWeight="Bold" VerticalAlignment="Bottom" Text="{Binding UserName}"/>
-                                                        <TextBlock Margin="5,0" Grid.Row="1" Grid.Column="1" FontSize="12" Foreground="{ThemeResource SystemChromeDisabledLowColor}" VerticalAlignment="Top" Text="{Binding UserAccount}"/>
+                                                        <TextBlock Margin="5,0" Grid.Row="1" Grid.Column="1" FontSize="12" Foreground="{ThemeResource SystemBaseMediumColor}" VerticalAlignment="Top" Text="{Binding UserAccount}"/>
                                                     </Grid>
                                                     <TextBlock Grid.Row="1" Text="{Binding Comment}" TextWrapping="WrapWholeWords"/>
-                                                    <TextBlock Grid.Row="2" Margin="0,3,0,0" Text="{Binding DateTime}" FontSize="12" Foreground="{ThemeResource SystemChromeDisabledLowColor}"/>
+                                                    <TextBlock Grid.Row="2" Margin="0,3,0,0" Text="{Binding DateTime}" FontSize="12" Foreground="{ThemeResource SystemBaseMediumColor}"/>
                                                 </Grid>
                                             </Border>
                                         </DataTemplate>

diff --git a/PixivFSUWP/SearchPage.xaml b/PixivFSUWP/SearchPage.xaml
@@ -125,7 +125,7 @@
                 </Grid>
                 <StackPanel Margin="0 10 0 0" HorizontalAlignment="Left" Orientation="Horizontal">
                     <TextBlock FontSize="14" FontWeight="Bold" x:Uid="TrendingTags"/>
-                    <TextBlock Margin="5 0 0 0" FontSize="12" Foreground="{ThemeResource SystemChromeDisabledLowColor}" VerticalAlignment="Bottom" x:Uid="TagWarning"/>
+                    <TextBlock Margin="5 0 0 0" FontSize="12" Foreground="{ThemeResource SystemBaseMediumColor}" VerticalAlignment="Bottom" x:Uid="TagWarning"/>
                 </StackPanel>
                 <ItemsControl x:Name="panelTags" Margin="0 5 0 0">
                     <ItemsControl.ItemTemplate>

diff --git a/PixivFSUWP/SettingsPage.xaml b/PixivFSUWP/SettingsPage.xaml
@@ -28,7 +28,7 @@
                     </Ellipse.Fill>
                 </Ellipse>
                 <TextBlock Text="{Binding DisplayName}" Margin="10,0" Grid.Column="1" VerticalAlignment="Bottom"/>
-                <TextBlock Text="{Binding Account}" Margin="10,0" Grid.Row="1" Grid.Column="1" Foreground="{ThemeResource SystemChromeDisabledLowColor}" VerticalAlignment="Top"/>
+                <TextBlock Text="{Binding Account}" Margin="10,0" Grid.Row="1" Grid.Column="1" Foreground="{ThemeResource SystemBaseMediumColor}" VerticalAlignment="Top"/>
                 <TextBlock Text="{Binding Contributions,Converter={StaticResource ContributionsConverter}}" Grid.RowSpan="2" Grid.Column="2" VerticalAlignment="Center"/>
             </Grid>
         </DataTemplate>
@@ -59,12 +59,12 @@
                 <TextBlock Margin="0,2" HorizontalTextAlignment="Left" Grid.Column="2" x:Name="txtID"/>
                 <StackPanel Margin="0,2" Grid.Row="1" Grid.Column="2" Orientation="Horizontal">
                     <TextBlock HorizontalTextAlignment="Left" x:Name="txtName"/>
-                    <TextBlock HorizontalTextAlignment="Left" x:Name="txtAccount" Foreground="{ThemeResource SystemChromeDisabledLowColor}"/>
+                    <TextBlock HorizontalTextAlignment="Left" x:Name="txtAccount" Foreground="{ThemeResource SystemBaseMediumColor}"/>
                 </StackPanel>
                 <TextBlock Margin="0,2" Grid.Row="2" Grid.Column="2" HorizontalTextAlignment="Left" x:Name="txtEmail"/>
                 <StackPanel Grid.Row="3" Grid.ColumnSpan="3">
                     <Button Style="{StaticResource ButtonRevealStyle}" BorderThickness="1.5" Margin="0,5,0,0" x:Name="btnLogout" Click="BtnLogout_Click" HorizontalAlignment="Stretch" x:Uid="Logout"/>
-                    <TextBlock FontSize="12" Foreground="{ThemeResource SystemChromeDisabledLowColor}" x:Uid="LogoutWarning"/>
+                    <TextBlock FontSize="12" Foreground="{ThemeResource SystemBaseMediumColor}" x:Uid="LogoutWarning"/>
                 </StackPanel>
             </Grid>
             <!--TODO：完善UI-->

diff --git a/PixivFSUWP/Strings/zh-Hans/Resources.resw b/PixivFSUWP/Strings/zh-Hans/Resources.resw
@@ -561,4 +561,24 @@
 您想关闭它们吗？</value>
     <comment>PlainText</comment>
   </data>
+  <data name="ColorTheme.Text" xml:space="preserve">
+    <value>颜色主题</value>
+    <comment>TextBlock</comment>
+  </data>
+  <data name="DarkColorTheme.Content" xml:space="preserve">
+    <value>深色</value>
+    <comment>ComboBoxItem</comment>
+  </data>
+  <data name="DefaultColorTheme.Content" xml:space="preserve">
+    <value>跟随系统</value>
+    <comment>ComboBoxItem</comment>
+  </data>
+  <data name="LightColorTheme.Content" xml:space="preserve">
+    <value>浅色</value>
+    <comment>ComboBoxItem</comment>
+  </data>
+  <data name="RestartApplyColorTheme" xml:space="preserve">
+    <value>重新启动以应用设置</value>
+    <comment>PlainText</comment>
+  </data>
 </root>
diff --git a/PixivFSUWP/UserDetailPage.xaml b/PixivFSUWP/UserDetailPage.xaml
@@ -123,7 +123,7 @@
                         </Ellipse.Fill>
                     </Ellipse>
                     <TextBlock x:Name="txtAuthor" Margin="10,0" Grid.Column="1" FontSize="16" FontWeight="Bold" VerticalAlignment="Bottom"/>
-                    <TextBlock x:Name="txtAuthorAccount" Margin="10,0" Grid.Row="1" Grid.Column="1" FontSize="14" Foreground="{ThemeResource SystemChromeDisabledLowColor}" VerticalAlignment="Top"/>
+                    <TextBlock x:Name="txtAuthorAccount" Margin="10,0" Grid.Row="1" Grid.Column="1" FontSize="14" Foreground="{ThemeResource SystemBaseMediumColor}" VerticalAlignment="Top"/>
                 </Grid>
             </Button>
         </Grid>
@@ -152,7 +152,7 @@
                         </Grid>
                         <TextBlock Margin="5" x:Name="txtUsername" FontSize="20" FontWeight="Bold" 
                            HorizontalAlignment="Center"/>
-                        <TextBlock x:Name="txtAccount" FontSize="14" Foreground="{ThemeResource SystemChromeDisabledLowColor}"
+                        <TextBlock x:Name="txtAccount" FontSize="14" Foreground="{ThemeResource SystemBaseMediumColor}"
                            HorizontalAlignment="Center"/>
                     </StackPanel>
                 </Grid>