diff --git a/PixivFSUWP/App.xaml b/PixivFSUWP/App.xaml index 94b2831..d6b650d 100644 --- a/PixivFSUWP/App.xaml +++ b/PixivFSUWP/App.xaml @@ -5,11 +5,16 @@ xmlns:viewmodels="using:PixivFSUWP.ViewModels" xmlns:local="using:PixivFSUWP" xmlns:converters="using:PixivFSUWP.Converters" - RequestedTheme="Light"> + > + + + + + - + @@ -25,7 +30,7 @@ - + @@ -128,5 +133,6 @@ + diff --git a/PixivFSUWP/App.xaml.cs b/PixivFSUWP/App.xaml.cs index 9fd8067..64954f0 100644 --- a/PixivFSUWP/App.xaml.cs +++ b/PixivFSUWP/App.xaml.cs @@ -34,6 +34,15 @@ public App() this.InitializeComponent(); this.Suspending += OnSuspending; this.UnhandledException += App_UnhandledException; + switch (localSettings.Values["ColorTheme"]) + { + case false: + Current.RequestedTheme = ApplicationTheme.Light; + break; + case true: + Current.RequestedTheme = ApplicationTheme.Dark; + break; + } } private void App_UnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e) diff --git a/PixivFSUWP/Assets/PixivHeader_L.png b/PixivFSUWP/Assets/PixivHeader_L.png new file mode 100644 index 0000000..ddc594f Binary files /dev/null and b/PixivFSUWP/Assets/PixivHeader_L.png differ diff --git a/PixivFSUWP/Assets/PixivText_L.png b/PixivFSUWP/Assets/PixivText_L.png new file mode 100644 index 0000000..7ea227b Binary files /dev/null and b/PixivFSUWP/Assets/PixivText_L.png differ diff --git a/PixivFSUWP/Assets/Pixiv_Logo.svg b/PixivFSUWP/Assets/Pixiv_Logo.svg new file mode 100644 index 0000000..23130c0 --- /dev/null +++ b/PixivFSUWP/Assets/Pixiv_Logo.svg @@ -0,0 +1,5 @@ + + + diff --git a/PixivFSUWP/BigImage.xaml b/PixivFSUWP/BigImage.xaml index 12ee14e..8724bc2 100644 --- a/PixivFSUWP/BigImage.xaml +++ b/PixivFSUWP/BigImage.xaml @@ -57,7 +57,7 @@ - + diff --git a/PixivFSUWP/Controls/Pixiv_Logo.xaml b/PixivFSUWP/Controls/Pixiv_Logo.xaml new file mode 100644 index 0000000..8cd5f93 --- /dev/null +++ b/PixivFSUWP/Controls/Pixiv_Logo.xaml @@ -0,0 +1,13 @@ + diff --git a/PixivFSUWP/Controls/Pixiv_Logo.xaml.cs b/PixivFSUWP/Controls/Pixiv_Logo.xaml.cs new file mode 100644 index 0000000..bb545d5 --- /dev/null +++ b/PixivFSUWP/Controls/Pixiv_Logo.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Navigation; + +//https://go.microsoft.com/fwlink/?LinkId=234236 上介绍了“用户控件”项模板 + +namespace PixivFSUWP.Controls +{ + public sealed partial class Pixiv_Logo + { + public Pixiv_Logo() + { + this.InitializeComponent(); + } + } +} diff --git a/PixivFSUWP/IllustDetailPage.xaml b/PixivFSUWP/IllustDetailPage.xaml index ab646b2..714be5d 100644 --- a/PixivFSUWP/IllustDetailPage.xaml +++ b/PixivFSUWP/IllustDetailPage.xaml @@ -54,7 +54,7 @@ + Margin="5,0,0,0" Background="{ThemeResource SystemChromeLowColor}" BorderThickness="1.5" x:Name="btnNewComment" IsChecked="False"/> - *请带着鼓励和建设性的态度发表评论 + *请带着鼓励和建设性的态度发表评论 - + @@ -170,10 +170,10 @@ - + - + @@ -201,10 +201,10 @@ - + - + diff --git a/PixivFSUWP/LoginPage.xaml b/PixivFSUWP/LoginPage.xaml index 7137717..52c2a57 100644 --- a/PixivFSUWP/LoginPage.xaml +++ b/PixivFSUWP/LoginPage.xaml @@ -26,7 +26,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -87,7 +87,11 @@ - + + + + + @@ -96,7 +100,8 @@ - + diff --git a/PixivFSUWP/SearchPage.xaml b/PixivFSUWP/SearchPage.xaml index 3839b93..51baad8 100644 --- a/PixivFSUWP/SearchPage.xaml +++ b/PixivFSUWP/SearchPage.xaml @@ -69,7 +69,7 @@ - + @@ -125,7 +125,7 @@ - + diff --git a/PixivFSUWP/SettingsPage.xaml b/PixivFSUWP/SettingsPage.xaml index 06045e6..ff7d6d2 100644 --- a/PixivFSUWP/SettingsPage.xaml +++ b/PixivFSUWP/SettingsPage.xaml @@ -28,7 +28,7 @@ - + @@ -59,12 +59,12 @@ - + - + @@ -152,7 +152,7 @@ - @@ -231,7 +231,7 @@