简单处理

sovetskyfish · Apr 19, 2020 · 9f82973 · 9f82973
1 parent 824adef
commit 9f82973
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/PixivFSUWP/App.xaml b/PixivFSUWP/App.xaml
@@ -7,9 +7,14 @@
     xmlns:converters="using:PixivFSUWP.Converters"
     RequestedTheme="Light">
     <Application.Resources>
+        <ResourceDictionary>
+            <!--<ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Dark" Source="/Themes/Dark.xaml" />
+                <ResourceDictionary x:Key="Default" Source="/Themes/Light.xaml" />
+            </ResourceDictionary.ThemeDictionaries>-->
         <converters:MultiPageVisibilityConverter x:Name="MultiPageVisibilityConverter"/>
         <converters:BookmarkHeartVisibilityConverter x:Name="BookmarkHeartVisibilityConverter"/>
-        <AcrylicBrush x:Name="PageBackGround" BackgroundSource="HostBackdrop" TintColor="White" TintOpacity="0.5" FallbackColor="White"/>
+        <AcrylicBrush x:Name="PageBackGround" BackgroundSource="HostBackdrop" TintColor="{ThemeResource SystemAltHighColor}" TintOpacity="0.5" FallbackColor="{ThemeResource SystemAltHighColor}"/>
         <ControlTemplate x:Name="ScrollViewerScrollBarlessTemplate" TargetType="ScrollViewer">
             <Grid Background="{TemplateBinding Background}">
                 <ScrollContentPresenter x:Name="ScrollContentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}" Margin="{TemplateBinding Padding}"/>
@@ -128,5 +133,6 @@
                 </Setter.Value>
             </Setter>
         </Style>
+        </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/PixivFSUWP/BigImage.xaml b/PixivFSUWP/BigImage.xaml
@@ -57,7 +57,7 @@
         <Grid x:Name="grdTip" HorizontalAlignment="Center" Grid.RowSpan="3"
               VerticalAlignment="Bottom" Margin="20" Visibility="Collapsed" Opacity="0">
             <Grid.Background>
-                <AcrylicBrush BackgroundSource="Backdrop" TintOpacity="0.2" TintColor="White" FallbackColor="White"/>
+                <AcrylicBrush BackgroundSource="Backdrop" TintOpacity="0.2" TintColor="{ThemeResource SystemAltHighColor}" FallbackColor="{ThemeResource SystemAltHighColor}"/>
             </Grid.Background>
             <TextBlock x:Name="txtTip" Margin="10" VerticalAlignment="Center" HorizontalAlignment="Center"/>
         </Grid>

diff --git a/PixivFSUWP/LoginPage.xaml b/PixivFSUWP/LoginPage.xaml
@@ -79,7 +79,7 @@
         <Grid Height="480" Width="400"
               HorizontalAlignment="Center" VerticalAlignment="Center">
             <Grid.Background>
-                <AcrylicBrush BackgroundSource="Backdrop" TintOpacity="0.4" TintColor="White" FallbackColor="#99ffffff"/>
+                <AcrylicBrush BackgroundSource="Backdrop" TintOpacity="0.4" TintColor="{ThemeResource SystemAltHighColor}" FallbackColor="{ThemeResource SystemAltMediumColor}"/>
             </Grid.Background>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
@@ -114,7 +114,7 @@
             <Button Style="{StaticResource ButtonRevealStyleWithAcrylic}" HorizontalAlignment="Center"
                         BorderThickness="1.5" VerticalAlignment="Stretch" Click="Button_Click">
                 <Button.Background>
-                    <AcrylicBrush BackgroundSource="Backdrop" TintOpacity="0.2" TintColor="White" FallbackColor="White"/>
+                    <AcrylicBrush BackgroundSource="Backdrop" TintOpacity="0.2" TintColor="{ThemeResource SystemAltHighColor}" FallbackColor="{ThemeResource SystemAltHighColor}"/>
                 </Button.Background>
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -133,7 +133,7 @@
             <Button Style="{StaticResource ButtonRevealStyleWithAcrylic}" HorizontalAlignment="Center"
                         BorderThickness="1.5" VerticalAlignment="Stretch" x:Name="btnReport" Click="btnReport_Click">
                 <Button.Background>
-                    <AcrylicBrush BackgroundSource="Backdrop" TintOpacity="0.2" TintColor="White" FallbackColor="White"/>
+                    <AcrylicBrush BackgroundSource="Backdrop" TintOpacity="0.2" TintColor="{ThemeResource SystemAltHighColor}" FallbackColor="{ThemeResource SystemAltHighColor}"/>
                 </Button.Background>
                 <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" 
                                   FontSize="16" Glyph="&#xED15;"/>

diff --git a/PixivFSUWP/MainPage.xaml b/PixivFSUWP/MainPage.xaml
@@ -74,7 +74,7 @@
         <Grid x:Name="grdTip" HorizontalAlignment="Center"
               VerticalAlignment="Bottom" Margin="20" Visibility="Collapsed" Opacity="0">
             <Grid.Background>
-                <AcrylicBrush BackgroundSource="Backdrop" TintOpacity="0.2" TintColor="White" FallbackColor="White"/>
+                <AcrylicBrush BackgroundSource="Backdrop" TintOpacity="0.2" TintColor="{ThemeResource SystemAltHighColor}" FallbackColor="{ThemeResource SystemAltHighColor}"/>
             </Grid.Background>
             <TextBlock x:Name="txtTip" Margin="10" VerticalAlignment="Center" HorizontalAlignment="Center"/>
         </Grid>

diff --git a/PixivFSUWP/SearchPage.xaml b/PixivFSUWP/SearchPage.xaml
@@ -69,7 +69,7 @@
         <Grid x:Name="grdSearchPanel"
               VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
             <Grid.Background>
-                <AcrylicBrush x:Name="detailBackground" BackgroundSource="Backdrop" TintOpacity="0.2" TintColor="White" FallbackColor="White"/>
+                <AcrylicBrush x:Name="detailBackground" BackgroundSource="Backdrop" TintOpacity="0.2" TintColor="{ThemeResource SystemAltHighColor}" FallbackColor="{ThemeResource SystemAltHighColor}"/>
             </Grid.Background>
             <StackPanel Margin="0 75 0 0" Orientation="Vertical" Width="500" x:Name="stkMain"
                         HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="Collapsed">

diff --git a/PixivFSUWP/UserDetailPage.xaml b/PixivFSUWP/UserDetailPage.xaml
@@ -106,7 +106,7 @@
             <Button Style="{StaticResource ButtonRevealStyleWithAcrylic}" HorizontalAlignment="Center"
                         BorderThickness="1.5" VerticalAlignment="Stretch" Click="Button_Click">
                 <Button.Background>
-                    <AcrylicBrush BackgroundSource="Backdrop" TintOpacity="0.2" TintColor="White" FallbackColor="White"/>
+                    <AcrylicBrush BackgroundSource="Backdrop" TintOpacity="0.2" TintColor="{ThemeResource SystemAltHighColor}" FallbackColor="{ThemeResource SystemAltHighColor}"/>
                 </Button.Background>
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -129,7 +129,7 @@
         </Grid>
         <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" x:Name="grdDetail">
             <Grid.Background>
-                <AcrylicBrush x:Name="detailBackground" BackgroundSource="Backdrop" TintOpacity="0.2" TintColor="White" FallbackColor="White"/>
+                <AcrylicBrush x:Name="detailBackground" BackgroundSource="Backdrop" TintOpacity="0.2" TintColor="{ThemeResource SystemAltHighColor}" FallbackColor="{ThemeResource SystemAltHighColor}"/>
             </Grid.Background>
             <Grid.RowDefinitions>
                 <RowDefinition Height="75"/>