From fb91f5c25c319ec22fa8b386219b3cee46d50aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=88=B0=E9=98=9F=E7=9A=84=E5=81=B6=E5=83=8F-=E5=B2=9B?= =?UTF-8?q?=E9=A3=8E=E9=85=B1=EF=BC=81?= Date: Mon, 20 Apr 2020 01:59:11 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E7=AE=80=E5=8D=95=E6=B7=BB=E5=8A=A0DarkM?= =?UTF-8?q?ode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PixivFSUWP/App.xaml | 291 +++++--- PixivFSUWP/Assets/GH_64_L.png | Bin 0 -> 1648 bytes PixivFSUWP/Assets/PixivHeader_L.png | Bin 0 -> 7031 bytes PixivFSUWP/Assets/PixivText_L.png | Bin 0 -> 6738 bytes PixivFSUWP/Assets/QQ_64_L.png | Bin 0 -> 3538 bytes PixivFSUWP/Assets/SauceNAO_L.png | Bin 0 -> 996 bytes .../Assets/SplashScreen.scale-200_L.png | Bin 0 -> 7257 bytes PixivFSUWP/BigImage.xaml | 124 +++- PixivFSUWP/IllustDetailPage.xaml | 446 +++++++++--- PixivFSUWP/LoginPage.xaml | 8 +- PixivFSUWP/MainPage.xaml | 138 ++-- PixivFSUWP/PixivFSUWP.csproj | 15 + PixivFSUWP/SearchPage.xaml | 320 ++++++--- PixivFSUWP/Themes/Dark.xaml | 8 + PixivFSUWP/Themes/Light.xaml | 8 + PixivFSUWP/UserDetailPage.xaml | 675 +++++++++++++----- PixivFSUWP/WaterfallPage.xaml | 96 ++- 17 files changed, 1492 insertions(+), 637 deletions(-) create mode 100644 PixivFSUWP/Assets/GH_64_L.png create mode 100644 PixivFSUWP/Assets/PixivHeader_L.png create mode 100644 PixivFSUWP/Assets/PixivText_L.png create mode 100644 PixivFSUWP/Assets/QQ_64_L.png create mode 100644 PixivFSUWP/Assets/SauceNAO_L.png create mode 100644 PixivFSUWP/Assets/SplashScreen.scale-200_L.png create mode 100644 PixivFSUWP/Themes/Dark.xaml create mode 100644 PixivFSUWP/Themes/Light.xaml diff --git a/PixivFSUWP/App.xaml b/PixivFSUWP/App.xaml index 94b2831..ffe8342 100644 --- a/PixivFSUWP/App.xaml +++ b/PixivFSUWP/App.xaml @@ -2,131 +2,186 @@ x:Class="PixivFSUWP.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:viewmodels="using:PixivFSUWP.ViewModels" - xmlns:local="using:PixivFSUWP" xmlns:converters="using:PixivFSUWP.Converters" - RequestedTheme="Light"> + xmlns:local="using:PixivFSUWP" + xmlns:viewmodels="using:PixivFSUWP.ViewModels"> - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - - - - - + + + + + + - - + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + diff --git a/PixivFSUWP/Assets/GH_64_L.png b/PixivFSUWP/Assets/GH_64_L.png new file mode 100644 index 0000000000000000000000000000000000000000..85c04b48f1bb804dcf4f491ff1244d7e063856ee GIT binary patch literal 1648 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 literal 0 HcmV?d00001 diff --git a/PixivFSUWP/Assets/PixivText_L.png b/PixivFSUWP/Assets/PixivText_L.png new file mode 100644 index 0000000000000000000000000000000000000000..7ea227bbc37e6cdc1ce68acd4d4c8c531b8b6081 GIT binary patch literal 6738 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 c((msDtJVfY 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 + Background="{StaticResource PageBackGround}" + SizeChanged="Page_SizeChanged" + mc:Ignorable="d"> - + - + - - - + + + - - - + + + - - - - - + + + + + - - + + - + - - - + + + - + - + - + diff --git a/PixivFSUWP/IllustDetailPage.xaml b/PixivFSUWP/IllustDetailPage.xaml index ab646b2..9a484e7 100644 --- a/PixivFSUWP/IllustDetailPage.xaml +++ b/PixivFSUWP/IllustDetailPage.xaml @@ -2,209 +2,431 @@ x:Class="PixivFSUWP.IllustDetailPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:local="using:PixivFSUWP" xmlns:controls="using:PixivFSUWP.Controls" - xmlns:viewmodels="using:PixivFSUWP.ViewModels" xmlns:converters="using:PixivFSUWP.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="using:PixivFSUWP" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - mc:Ignorable="d" SizeChanged="Page_SizeChanged" - Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> + xmlns:viewmodels="using:PixivFSUWP.ViewModels" + Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" + SizeChanged="Page_SizeChanged" + mc:Ignorable="d"> - + - + - - - - - - + + + + + + - - - + + + - + - + - + - + - - - - - - + - - + + - + - - + + - + - - + + - - - + + + - *请带着鼓励和建设性的态度发表评论 + + *请带着鼓励和建设性的态度发表评论 + - + - + - + - - - - + + + + - - + + - - + + - + - + - - + + - - - + + + - - - + + + - - + + - - + + - + - + - - + + - - + + diff --git a/PixivFSUWP/LoginPage.xaml b/PixivFSUWP/LoginPage.xaml index 7137717..67fc72e 100644 --- a/PixivFSUWP/LoginPage.xaml +++ b/PixivFSUWP/LoginPage.xaml @@ -79,7 +79,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -114,7 +114,7 @@ @@ -143,10 +246,13 @@ - + - + @@ -155,10 +261,22 @@ - - + + diff --git a/PixivFSUWP/Themes/Dark.xaml b/PixivFSUWP/Themes/Dark.xaml new file mode 100644 index 0000000..f2dc7c5 --- /dev/null +++ b/PixivFSUWP/Themes/Dark.xaml @@ -0,0 +1,8 @@ + + /Assets/PixivHeader_L.png + /Assets/PixivText_L.png + + diff --git a/PixivFSUWP/Themes/Light.xaml b/PixivFSUWP/Themes/Light.xaml new file mode 100644 index 0000000..b029ac6 --- /dev/null +++ b/PixivFSUWP/Themes/Light.xaml @@ -0,0 +1,8 @@ + + /Assets/PixivHeader.png + /Assets/PixivText.png + + diff --git a/PixivFSUWP/UserDetailPage.xaml b/PixivFSUWP/UserDetailPage.xaml index 6baf0ca..8db861d 100644 --- a/PixivFSUWP/UserDetailPage.xaml +++ b/PixivFSUWP/UserDetailPage.xaml @@ -2,88 +2,83 @@ x:Class="PixivFSUWP.UserDetailPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:local="using:PixivFSUWP" xmlns:controls="using:PixivFSUWP.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="using:PixivFSUWP" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - mc:Ignorable="d" - Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> + Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" + mc:Ignorable="d"> - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + @@ -91,190 +86,500 @@ - + - + - - - + - + - - + + - - - + + - - + + - + - - + + - + - - - + + + - + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PixivFSUWP/WaterfallPage.xaml b/PixivFSUWP/WaterfallPage.xaml index 2499986..7a924ff 100644 --- a/PixivFSUWP/WaterfallPage.xaml +++ b/PixivFSUWP/WaterfallPage.xaml @@ -2,13 +2,63 @@ x:Class="PixivFSUWP.WaterfallPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:local="using:PixivFSUWP" - xmlns:viewmodels="using:PixivFSUWP.ViewModels" xmlns:controls="using:PixivFSUWP.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="using:PixivFSUWP" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - mc:Ignorable="d" Background="{StaticResource PageBackGround}"> + xmlns:viewmodels="using:PixivFSUWP.ViewModels" + Background="{StaticResource PageBackGround}" + mc:Ignorable="d"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16,7 +66,7 @@ - + @@ -24,7 +74,7 @@ - + @@ -32,7 +82,7 @@ - + @@ -40,42 +90,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 2da2b66e31274385325244188f4d92c872dbca39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=88=B0=E9=98=9F=E7=9A=84=E5=81=B6=E5=83=8F-=E5=B2=9B?= =?UTF-8?q?=E9=A3=8E=E9=85=B1=EF=BC=81?= Date: Mon, 20 Apr 2020 03:25:23 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=9C=E8=89=B2=E4=B8=BB=E9=A2=98=20?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=87=A0=E4=B8=AA=E4=BC=9A=E7=94=A8=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PixivFSUWP/App.xaml.cs | 9 +++++ .../MultilingualResources/PixivFSUWP.ja.xlf | 25 ++++++++++++++ .../PixivFSUWP.zh-Hans.xlf | 25 ++++++++++++++ .../PixivFSUWP.zh-Hant.xlf | 25 ++++++++++++++ PixivFSUWP/SettingsPage.xaml | 8 +++++ PixivFSUWP/SettingsPage.xaml.cs | 33 +++++++++++++++++++ PixivFSUWP/Strings/en/Resources.resw | 20 +++++++++++ 7 files changed, 145 insertions(+) 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/MultilingualResources/PixivFSUWP.ja.xlf b/PixivFSUWP/MultilingualResources/PixivFSUWP.ja.xlf index 5158eae..11af91c 100644 --- a/PixivFSUWP/MultilingualResources/PixivFSUWP.ja.xlf +++ b/PixivFSUWP/MultilingualResources/PixivFSUWP.ja.xlf @@ -693,6 +693,31 @@ Do you want to disable them? Do you want to disable them? PlainText + + Color Theme + 配色テーマ + TextBlock + + + Dark + 暗い + ComboBoxItem + + + Use System Default + システムの既定値を使用する + ComboBoxItem + + + Light + ライト + ComboBoxItem + + + Restart the application to take effect + Restart the application to take effect + PlainText + diff --git a/PixivFSUWP/MultilingualResources/PixivFSUWP.zh-Hans.xlf b/PixivFSUWP/MultilingualResources/PixivFSUWP.zh-Hans.xlf index 825fc87..60166ec 100644 --- a/PixivFSUWP/MultilingualResources/PixivFSUWP.zh-Hans.xlf +++ b/PixivFSUWP/MultilingualResources/PixivFSUWP.zh-Hans.xlf @@ -693,6 +693,31 @@ Do you want to disable them? 您想关闭它们吗？ PlainText + + Color Theme + 颜色主题 + TextBlock + + + Dark + 深色 + ComboBoxItem + + + Use System Default + 跟随系统 + ComboBoxItem + + + Light + 浅色 + ComboBoxItem + + + Restart the application to take effect + 重新启动以应用设置 + PlainText + diff --git a/PixivFSUWP/MultilingualResources/PixivFSUWP.zh-Hant.xlf b/PixivFSUWP/MultilingualResources/PixivFSUWP.zh-Hant.xlf index 7fe7ba3..2519a85 100644 --- a/PixivFSUWP/MultilingualResources/PixivFSUWP.zh-Hant.xlf +++ b/PixivFSUWP/MultilingualResources/PixivFSUWP.zh-Hant.xlf @@ -693,6 +693,31 @@ Do you want to disable them? Do you want to disable them? PlainText + + Color Theme + 色彩佈景主題 + TextBlock + + + Dark + 深色 + ComboBoxItem + + + Use System Default + 使用系統預設值 + ComboBoxItem + + + Light + 精簡 + ComboBoxItem + + + Restart the application to take effect + Restart the application to take effect + PlainText + diff --git a/PixivFSUWP/SettingsPage.xaml b/PixivFSUWP/SettingsPage.xaml index 06045e6..d93c04d 100644 --- a/PixivFSUWP/SettingsPage.xaml +++ b/PixivFSUWP/SettingsPage.xaml @@ -79,6 +79,14 @@ + + + + + + + + diff --git a/PixivFSUWP/SettingsPage.xaml.cs b/PixivFSUWP/SettingsPage.xaml.cs index 7cdf8a8..30eb0c9 100644 --- a/PixivFSUWP/SettingsPage.xaml.cs +++ b/PixivFSUWP/SettingsPage.xaml.cs @@ -97,6 +97,19 @@ async Task loadContentsAsync() //ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings; //tbSauceNAO.Text = localSettings.Values["SauceNAOAPI"] as string;//读取设置项 //tbImgur.Text = localSettings.Values["ImgurAPI"] as string; + switch (ApplicationData.Current.LocalSettings.Values["ColorTheme"]) + { + case false: + cboxColorTheme.SelectedIndex = 0; + break; + case true: + cboxColorTheme.SelectedIndex = 1; + break; + default: + cboxColorTheme.SelectedIndex = 2; + break; + } + _ = calculateCacheSize(); //等待头像加载完毕 imgAvatar.ImageSource = await imgTask; @@ -183,5 +196,25 @@ private async void btnQQGroup_Click(object sender, RoutedEventArgs e) await Launcher.LaunchUriAsync(new Uri(@"https://shang.qq.com/wpa/qunwpa?idkey=d6ba54103ced0e2d7c5bbf6422e4f9f6fa4849c91d4521fe9a1beec72626bbb6")); } + + private void ComboBox_DropDownClosed(object sender, object e) + { + if(sender is ComboBox cb) + { + switch (cb.SelectedIndex) + { + case 2: + ApplicationData.Current.LocalSettings.Values["ColorTheme"] = null; + break; + case 0: + ApplicationData.Current.LocalSettings.Values["ColorTheme"] = false; + break; + case 1: + ApplicationData.Current.LocalSettings.Values["ColorTheme"] = true; + break; + } + _ = ((Frame.Parent as Grid)?.Parent as MainPage)?.ShowTip(GetResourceString("RestartApplyColorTheme")); + } + } } } diff --git a/PixivFSUWP/Strings/en/Resources.resw b/PixivFSUWP/Strings/en/Resources.resw index 9cf1708..33611ea 100644 --- a/PixivFSUWP/Strings/en/Resources.resw +++ b/PixivFSUWP/Strings/en/Resources.resw @@ -181,6 +181,10 @@ Clear cache Button + + Color Theme + TextBlock + Comments PlainText @@ -197,6 +201,10 @@ Current User TextBlock + + Dark + ComboBoxItem + Date ascending ComboBoxItem @@ -205,6 +213,10 @@ Date descending ComboBoxItem + + Use System Default + ComboBoxItem + Unbookmark PlainText @@ -314,6 +326,10 @@ Do you want to disable them? Last week ComboBoxItem + + Light + ComboBoxItem + Link PlainText @@ -502,6 +518,10 @@ Do you want to disable them? Requesting PlainText + + Restart the application to take effect + PlainText + Retry PlainText From 824adef51aa5d5850c330ade4fb3637be3f3f0c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=88=B0=E9=98=9F=E7=9A=84=E5=81=B6=E5=83=8F-=E5=B2=9B?= =?UTF-8?q?=E9=A3=8E=E9=85=B1=EF=BC=81?= Date: Mon, 20 Apr 2020 03:26:17 +0800 Subject: [PATCH 03/16] =?UTF-8?q?Revert=20"=E7=AE=80=E5=8D=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0DarkMode"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit fb91f5c25c319ec22fa8b386219b3cee46d50aba. --- PixivFSUWP/App.xaml | 291 +++----- PixivFSUWP/Assets/GH_64_L.png | Bin 1648 -> 0 bytes PixivFSUWP/Assets/PixivHeader_L.png | Bin 7031 -> 0 bytes PixivFSUWP/Assets/PixivText_L.png | Bin 6738 -> 0 bytes PixivFSUWP/Assets/QQ_64_L.png | Bin 3538 -> 0 bytes PixivFSUWP/Assets/SauceNAO_L.png | Bin 996 -> 0 bytes .../Assets/SplashScreen.scale-200_L.png | Bin 7257 -> 0 bytes PixivFSUWP/BigImage.xaml | 124 +--- PixivFSUWP/IllustDetailPage.xaml | 446 +++--------- PixivFSUWP/LoginPage.xaml | 8 +- PixivFSUWP/MainPage.xaml | 138 ++-- PixivFSUWP/PixivFSUWP.csproj | 15 - PixivFSUWP/SearchPage.xaml | 320 +++------ PixivFSUWP/Themes/Dark.xaml | 8 - PixivFSUWP/Themes/Light.xaml | 8 - PixivFSUWP/UserDetailPage.xaml | 675 +++++------------- PixivFSUWP/WaterfallPage.xaml | 96 +-- 17 files changed, 637 insertions(+), 1492 deletions(-) delete mode 100644 PixivFSUWP/Assets/GH_64_L.png delete mode 100644 PixivFSUWP/Assets/PixivHeader_L.png delete mode 100644 PixivFSUWP/Assets/PixivText_L.png delete mode 100644 PixivFSUWP/Assets/QQ_64_L.png delete mode 100644 PixivFSUWP/Assets/SauceNAO_L.png delete mode 100644 PixivFSUWP/Assets/SplashScreen.scale-200_L.png delete mode 100644 PixivFSUWP/Themes/Dark.xaml delete mode 100644 PixivFSUWP/Themes/Light.xaml diff --git a/PixivFSUWP/App.xaml b/PixivFSUWP/App.xaml index ffe8342..94b2831 100644 --- a/PixivFSUWP/App.xaml +++ b/PixivFSUWP/App.xaml @@ -2,186 +2,131 @@ x:Class="PixivFSUWP.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:converters="using:PixivFSUWP.Converters" + xmlns:viewmodels="using:PixivFSUWP.ViewModels" xmlns:local="using:PixivFSUWP" - xmlns:viewmodels="using:PixivFSUWP.ViewModels"> + xmlns:converters="using:PixivFSUWP.Converters" + RequestedTheme="Light"> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - + + + + + + + + diff --git a/PixivFSUWP/Assets/GH_64_L.png b/PixivFSUWP/Assets/GH_64_L.png deleted file mode 100644 index 85c04b48f1bb804dcf4f491ff1244d7e063856ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1648 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 diff --git a/PixivFSUWP/Assets/PixivText_L.png b/PixivFSUWP/Assets/PixivText_L.png deleted file mode 100644 index 7ea227bbc37e6cdc1ce68acd4d4c8c531b8b6081..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6738 zcmeHMc{tSVyMJazGpMnr7-^6#BFhX)8rjO0Euo1iTg)iStJj(lNwT#lYedR2CQF1Y zgI<)aH#=otDuhHKb)M;WuIqRHIRBpOoO508^VfWz<-YIdbMMdGurN2ma*J{U0I(;H z>stZ9F#rH!o)ZmcfGZyb08x<>`nom&=?m{0Vx-M%F-tXjYrUmL>0_GJEAr&H33I*% z4By^%jE`*g;&`XX&X>C6$}g|o{~YY?eSXo^P2VNmZ{k}-)Vbu3bxA&ws-5+cmoBo2 z|1CYxrmIdLcSAIn4Xvuvy!VdFOJ#!(ZG`8f5y@>EiHOf-$H0M-|M% z);J!4E56^0)YNC8O+Fo24htTx_+@2W+;(zh`siV&{YSw3J_>5B)B#-Q9H7YO$kv2% zYHRrNq=pqo(6Iw^nA6-KU@S&`>q*$8(XPF9D`nefveq$R57z*oKWAzeY@|V1S~*$2 zHa&EHv>4o<)Y#SaCy;9kJUzyj5PdALOlCa+Rp-uKy1s1k!Jn|gJ2K91Nl`A`<{eGP z8mAp;STM1B->!AxX9EgJq$npuBf*)(mX|+OS?+Xuw=Ug!T@)QX5irIlJCMbYyR*3q zB4I-BLY&^Hh4Ac|ikagb+bKIhuT7_*fTZ+nSWbhx%5&2AklRlLOAAQ^_}fQED;A!{ za&Et2yZB3RObw6@UD4YnHo4XYFgX0D)G|>MlYq$;26**|2nAz%7 z@O=}Zg92b)lD%J`7y%Na=vWZ_fj1ULM0-vc3IWIp|2>r%_n%Yr=qs)^0JI)s(_=Hj zV-YyOm=pdk`)d zEuIK5NlJuowz+4pkS)It)aBAOsLM8~Y(P>E^U{Yb^u>6^COB|+g}l!H;`{Np)`wSI zM9y|Dr~p~0*9(zU#y*E{N@jpA2roo>6y@N@3t?lU$vrMw7-O|Lg9qts5s7gGQ;lFA z2h_iA6QEMo(Dx1n67RvQ1$Y_0ktRoUxpi#w;{&4qvKU$gVQr}>O^Xw(Llo#n%nQ|U zqVDgN$xnD*U@QosS`_J}Q|HfRTCTkOfueWnRAm7c#xZp{c=FoYo+h8#nNc?$Buf)Y zLwVZYu|DGFq{katlVJj7;$Y+5`Q}*@nf)#(kV-_5p^vs+O6RI+^B<~HD7YaA4j(Ue7k8Ly*15>}S)$4Vi ziDU9#MRPbiDuQk{XaZoZ*?{&w&@oz`?it~)Z|782q-K9ILhG*zrA;}!A_B(>AV#Qg z4tu`XmP}2(0_X;T`a+Z)31Q7{G|w-2AF9(G&m>e;h&%H{%1}@rjPmX!EEgEHRy>Fq zcc>5*P(l`KL&*+Hm|ba39O>yMq?6C21y=AlV*?->WK;H4Q zs29-8Cd$nwT@Sm(k^yZ7G@|#QkUOzI0D9T7JBK_ zbkx}EsHNJl!q=-i?@r~6Kh>>lR_mJyN_RwA@fRaPZ1dOSt5rfat5lu*o(z7u!B@%! zIt3GFBzw>l7#J!3gE)G7N6S@zyB-kZ%Q%T0=#fZYz zfY)-99?X%_3{O8_$?I~fj~pKeGN)&SaG=fmDmG8aIj?zzDi~^-Vfwn^esPN%jbdj0 z6yX6wug$$&-NKCw&m5OZ+q(M)FrzKP)_1Ar%|18D6SLL&!<9H_Bm?_K>_dk%MO|D8 z*I>ZQp&k8Y!pMBC0lF~@d8ygrQJOx$S=Iv=#e0h%q&OIf^FJEJn7@0s&Ec!>a|`zFh1mveqM^(PyB;93+-}eyhqgM_ezEE9I@TG z2=$t;7-8?S&Lm9S2+FpwZZIn7kG?O;cqLDCQ(Fv|fY(72|N4q|ndHO{*fkPZNBHDm zPSL*y2~}Ol(`wAgcDC#HiHWnHN72v0-8RIASOG7;qCRKA($(o)G;3xAV*{hHWa-EA z>Jm63&OuLp=3iq%xYKIi!XLr|`^34XjgJvaUpY$E{fQlTw@5F5vqHo(?RXdGr*h@D z%MBx`+7s}A%CGQoxWqxMZg=VKaP*uOqiQcT27$ZKQr*5Bmka4ikM8(ZvS%_E9r9A1 zXsGrp+=O$0Zcn4#c$t$eCgCz{RN3sh4uKcU>452GouRq1V zs0hJw<)E>8X>K&meXwGMidS_6kDwPa_Z`HeByho8gW`hBTQ~eGl;(i9 zJObyvO<4^Tyk&*9Ih@?Sk}ordEapJq4yKyz6w&&tnIEckR*iN{)V#Pee)2^>-4)7p z%k83_7vn;1l;*Kk;fTPrOcf5iG(7XVebjC!-8yb8vevCPX7Q}l;W=6uG(QvQI8p-^ zme*1zqE9&m;mJ7~lU(e?m!&Z-8aw`n0Z(C(!Kd5CJ$^^mB3QlNC$(HFR-S%5IjTIYN_Og-6(cp zaKUF6vtc@&*_!jogg26EA?^1ei1^-6j-mGu^)YS~DzeT>#p*fim-QMsEEdl-yEuTZ2h5ksyzNs~IP z-t_asT^|XQKxoFOG+D{~jlWi7@0VW=Srp~ZLyTAnvV%DOP?~JkZJI=ycULtkJj|&>R<^UQYUY3KJ{3$K^9y_;kF`nD&RQHa|4uKE}3MyV8 z1ktmcr?u8>A!)q}L_!Pg++AB$9*DLb+c&lO4invcqG&PDPmZMkIf|yql=8*D(R+62 zOD)wU%dpRNJ{;x?mOW7ugmO~reJ@F<*1!4wx*P=PLFdRWLE5@*ML4^4h%~&_?mK~3 zN8sLM&lMhJJCZT zuYb*SqThfRyU2K_5c=%C8L)0FT^KSw5k zp9lH7Dg+-)EXp(agyeK#DN9m5woOuCY~J}NQXK*Wri6>+`yMs9&os6~W|Bl8kn|e$ zrQ!tqtQM7vBn3-elKCy%`Hn*&Zb~&LKXBb;qtz;_*R5oS7Y*-pp4m^rz(c_B@5+e4 zrRZWoIU~p=(WJudY$a*m)r?CinIMB*>V0{$L(hEX^XX&eS^FT>o`)X!2mB(G$an$j zwEK)S$%xJR`+oJt)IeKz9!`z$M)qyU1}u_LA?C=8B*~q)A3`2X zhLtovDhWsFI9jIV(VI!-R%ACE>mKL72p+6LGd{*tYdi-^P&Xi1!FUBHk++lM;2kI1 zuageQHfTjGt*c=F-#ePLr50sBp8~t!6lfQGxL#YklIhORdGJngRR)z)@dTt<<>B%r zMwoeIbCD_I;!Ke89MMKrCPM!4-Ot|a55jT{+NC&=(`SbeZS0nYtk7nHjih-OJy^Z? z8IVmOg+MKNmc1wDftpdgUk5!GTI|^FC&&x@tHJ$2KQ0-m%-Wqu2-0u|GSCo6=H}c} zcMg!L>%YFr9HgM<=C3e!vdb+n|K!yyW4>Id zOyy9#1bYS6#ap7m9j4+*jRb#8zgF30&MbrsTehA)wcRUuatZ=U^5h|f4ZLsK z9<07hMe#vz1|v^A#`BU!c7GDW6)u~^KP7LcYd~EmMz}@QG8sE1aIxPQ&AmrSd{El~ zrrnK}z4d<{cw4`IZ~gVDAEiwM5CCg8FnY6(L3NurLm=N=x>V0sYB`v*VY>pt+1fuN zDjaX6R(vlh?Bn<@9k9qoik6x(U>lUL8`XuMe^lDPTGWTQ%2w@ZajbOCaeqk{=bZ}7 zuFogHNj3#FGcBW{pS9FQ{?d{dk@732M}Z2|1m3M|;t`3~SUwv`v$z>7z`{Vm8RnJE zFlCHgtAZ^&Bw4H~OV%{*n1^**4_=>R06H+MAe%TMDxz~c-!PKKU{zxw4s>a*e$A$w zhqIi6c;#=>^b9sB!^&on#_}JLv{;ubNJZ!?EaOOOx&)c}q*-F`iZDAifkN+~Yid1a zN5yyM9tsy?u|1A~_q8sPn3PKL)Ne&=RcavEO?Fo43-36zIChU-tD$S3KivRcAa8#V zs)*~RS*2}eB38U?4X^`JRw^vTh#e*YjpfVji2c^1U^~>m#fd0EdC{i>>7Lc`Mg|h% z-{k0bAgiqlJu|PoJ-xasBX{LS*%k;&;7-{uB7~)2>91h&#@gWVT+!h9gq?Fx5|zr6 z2zI=RmAHUY?q2PE_Hs73pFX16;W5Wc$~mcoXIVT=yPVd4SwzodQasb!tL_ZlrxJ$& zV~VhcX8QeEy6`Nvf8nwHN!?1}>qZ9oa!o%f(1<_AIB+bnOKF;E!!4!67tLyzbH>`{ zr3fGoD__2dZZ9X-dSOw&cnjrGzuR%1l3jjOK9Ve~s9&z+l@!(?m~Y!XZN4mBkOSa7 zRJL!PaP_IfdnDyv8B_{qLM}4L%<6ON5QiWLQ>(NbagT2DmZbvLSgEmGI}-NtqOe0t zjVIg9o4gMhwNV;}_9UU-yx zWL>6n&e6*`DQrc~=SaM2`^KE!HNK(saXY9nfo9#MRemqcyNCy(+RkvD<7eT2dqMHN zOz$Fb2^`?N4Lzt%+OANS)9QX=9JgCfNidE@8j<7%nI767%*+r#5w;e7jm!%563CO~nza>5PX;=z%T!{;FwQ%?`Qh4(Z*`G! zoW4?0v&lk-f7ulzP=gH5^H=VX>e(%8O;OqOD`?v7)<1vtz#EGGR)G4@^&^!#YvfZ2uZ3Jt>gv)VGZR|}a;HK4uL0ZB^eXs9+!6Nmo zPxdppZF+pgYd>91_}l;Q!n)o|;zo1*14vU?H&e<~+@JLO3zU33yt2ObGjxjZsbr&Y zZju&SIQecQc>R{oHcmsRrgZ+=s_u|4rfVA(qjRcjKzEBm0dS15V=o-PvoruC)c^A5 z_o)fQw)e7I$CZD5HnW7!Ukq5D*{CSk1W&EH^H;zLA=reM-V|aSnXrM9lYHtTu&s(g zm1_=zAD_k8mm-qH+(AWVw~S$kkxZgOh-6kwF*D7KH8evKDK}fTl&HRLix4W@ zCPLYDTc$|URiRW`Y(>6Ti*xUH?)TmE-S?d5eV+Gue$Vf}|Ic|-H+!sCQ`S=kfk0{$ zS7%RPUOPV&<$?Dv?A-&vq{MUGCIEp{wB`pGR8XV~0>O0H-hM(q_l-mbHylM{a_KBo zbT|({gFto;(L5Ss7fT4IvqIP$65?&$bp)KvBq4k)-7)SwGAoqr8p~&S#d>%%Vs|lY zmoh zbZ&%@ga9=CWd_jajxGoYfK1k^N|w}wX~^I0?@m+#HxhW!ZC<{v7?BJNcf?8mRSlpkWK*}&_LfYSgnG9kummf|8 z3}%PZLRe@XCjYL!t*|y$R!AHQ z`&C_ccOr!&5Yjjd7R8x_0GxwjvzbJKB@Jgyz~GU1EDMLU##j)L1RD$viDxhXjhR@y zHQw^aeP=EsVm<|a+-Lru_c!s`Knc>q{xQ#dVb13c(UmO#q8jtPbi7!*zpujB@UQ7Y zq%r2pfP`So$DhSSeBWmOV-I|zjS6J}r2iu?zQF|CU||%E&vFa_y!E$vhX#~K&ll`B zJJA1W;@7i36!#A}&@twh3#|(HSZH=E4$$HFKr0K;pAH3q6zLRaNAKvO$A$4>L0gx# zI=tSHQX@nQFZYeQ4DGl{by=DASf045qf?dVE6Fpsm+frIFlZC)3$at%A3)dm1KZx~^XD@x;z=x71Jds z-UEywo9+uoZW2o6^I&lpGl3{y5=J$H%XE8G^g$C4(w31!FI&|j2Aylc!yq4MyC_+5 zd9B`h5lV)Z4E8<|zxT7an_UliBrb;p$?4=!bhTP^WCmdo*@=~M80eK{Q!6nIs)_3Q z@>Wm>u)2@CyJz)tPfB1x^heiEPT+*r?47IT$dsl*l9$3j)<+{swHYDhWWWjeD_U1d zUYhu+zkys-aB;G|ucJTa<8kaZG)&G)d&G|k+padF7XY&#R`>$801w4ZOxyC7*xDCD zqx(e1G`}eJ;}05-!$y1em~gTcF*$CSx1VmYk~eaJL|FywZ18{D`G4tN3+Oy zBo!1~;}U;Ih|0G3xi?|+owoD|%gh?N^g8k#_OBn57fUR`8}*M~$hGr#=o}W*md4kW z8G#3bUfH6b+_p9yJ^v)vaga{2-cW!Vv7@|Q`AEaf|6=b2oNeh`5_s_XN_Ihaf7~YV zxMT)&@BPr-56Kckku7G;MHT7Me>o_QLi|N5B<+&PH9bNaYAoXTetQUE#gvakhKb~Z zd_m*AbH|(On+BZY4POlR%hxN#EuTX1f=_l1tTnKrd*o}`L;RHD2)r?i%EKMcrfpR( zLyotGrKgA}YXh_yT?#&1cRn)`p|y46d|pmZN{zwA@)L}AB3=BY+Ht&W`apTS#5UDx z-M%gPlgbFjpOEG%ZaD2daIyi_l#gc6`tomCSF3c;19D-5QX>J5F0 z8LOLl-8W2DP&Afi$EJ7ck$zisyXMA@^`B=mQCZ$g$Ma1Cmfe$4Y+elW_rDZ-$jC4g z!$Gx~aDzm^XPx0cG z%sc{U25&}^Vx=1T884S(9b2D%NS3y_8J=0!Bf5I`1|$zs7nQxA)i%p|$K7F^L zsKkYG45rZ5Br5yNd=$M?$7oAFVnj0^l#$cX^yYj;mH7=rkb}D4juL6gw!Cs&tfvJi zgdsj^Gf0@YAVJw#&d- zu3vGc!tU2!TJV1GaZ*OjD@s9&Qu3uPul$(+ow~i(%iJ>u%(iVymW5Ml+m}RLDC2Y| z_^xSMGNG1Wub~R&(keb{OBluR?Ki#h9>(KOZ(J`rRvcfRHkS(PNprucQ0Ligi_HjE zTd5fIszPzUcolXpRXdlEbJML@h(c6)Gr(~L6-O7Lo|&vB?N=&+wm*63Zez-6EIMv0 zIwieX`@Cnuy|^H88nvpZq#CTc_5G`$^fsh~-l6(h(inipYFTy5WeDUosE|0FDXp59 zII_RE-lRfDx_v2jiRSEh;O|LNx#B~`uPRi2&K-WcERXD!G?E4G0Nd)$s=aezOcg<} zMA1luG@u}`WVdEklAm7lqDVt&z*(BMVk)&7_H>u#KDNR5uZtH9G--sW28YR72cyoHnFkdTmr7ZC-x37Y_!Qce~AO72L zmN08HGBUaBi1%y`UjgsovaJxCLC}j!GKV4$&E0kNSJ<8sBW|r=yh53`sp$AVIlOHX z*5FJL&o@6>@rwDodM&rk)Qs1WGJo?L>AvLGZ#*{iWcv2whmc$6gvibz89uEW;GGGC@=iY zo+pNh9P|D;rybDa8K=7%v%8O)t{Qo&I3}m_@O2}kIk`w8eIgE%NUN4w?A z==7^>^p_1vkry|qauijBU({5NaiKff*?l^_K}oCw)v~2Y`YkBC;|GTwl8x3Fr=B$Q zu%Z@3EY5xKV1GmNh;*NAMQxwj=nY88dc5iLQYDr9T?a$alA34CjeCWRtbwG*%STJr c((msDtJVfY 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 + mc:Ignorable="d" SizeChanged="Page_SizeChanged" Background="{StaticResource PageBackGround}"> - + - + - - - + + + - - - + + + - - - - - + + + + + - - + + - + - - - + + + - + - + - + diff --git a/PixivFSUWP/IllustDetailPage.xaml b/PixivFSUWP/IllustDetailPage.xaml index 9a484e7..ab646b2 100644 --- a/PixivFSUWP/IllustDetailPage.xaml +++ b/PixivFSUWP/IllustDetailPage.xaml @@ -2,431 +2,209 @@ x:Class="PixivFSUWP.IllustDetailPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="using:PixivFSUWP" xmlns:controls="using:PixivFSUWP.Controls" + xmlns:viewmodels="using:PixivFSUWP.ViewModels" xmlns:converters="using:PixivFSUWP.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="using:PixivFSUWP" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:viewmodels="using:PixivFSUWP.ViewModels" - Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" - SizeChanged="Page_SizeChanged" - mc:Ignorable="d"> + mc:Ignorable="d" SizeChanged="Page_SizeChanged" + Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> - + - + - - - - - - + + + + + + - - - + + + - + - + - + - + - - - - - - + - - + + - + - - + + - + - - + + - - - + + + - - *请带着鼓励和建设性的态度发表评论 - + *请带着鼓励和建设性的态度发表评论 - + - + - + - - - - + + + + - - + + - - + + - + - + - - + + - - - + + + - - - + + + - - + + - - + + - + - + - - + + - - + + diff --git a/PixivFSUWP/LoginPage.xaml b/PixivFSUWP/LoginPage.xaml index 67fc72e..7137717 100644 --- a/PixivFSUWP/LoginPage.xaml +++ b/PixivFSUWP/LoginPage.xaml @@ -79,7 +79,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -114,7 +114,7 @@ @@ -246,13 +143,10 @@ - + - + @@ -261,22 +155,10 @@ - - + + diff --git a/PixivFSUWP/Themes/Dark.xaml b/PixivFSUWP/Themes/Dark.xaml deleted file mode 100644 index f2dc7c5..0000000 --- a/PixivFSUWP/Themes/Dark.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - /Assets/PixivHeader_L.png - /Assets/PixivText_L.png - - diff --git a/PixivFSUWP/Themes/Light.xaml b/PixivFSUWP/Themes/Light.xaml deleted file mode 100644 index b029ac6..0000000 --- a/PixivFSUWP/Themes/Light.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - /Assets/PixivHeader.png - /Assets/PixivText.png - - diff --git a/PixivFSUWP/UserDetailPage.xaml b/PixivFSUWP/UserDetailPage.xaml index 8db861d..6baf0ca 100644 --- a/PixivFSUWP/UserDetailPage.xaml +++ b/PixivFSUWP/UserDetailPage.xaml @@ -2,83 +2,88 @@ x:Class="PixivFSUWP.UserDetailPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="using:PixivFSUWP" xmlns:controls="using:PixivFSUWP.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="using:PixivFSUWP" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" - mc:Ignorable="d"> + mc:Ignorable="d" + Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> - - - + + + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + @@ -86,500 +91,190 @@ - + - + - - - + - + - - + + - - - + + - - + + - + - - + + - + - - - + + + - + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PixivFSUWP/WaterfallPage.xaml b/PixivFSUWP/WaterfallPage.xaml index 7a924ff..2499986 100644 --- a/PixivFSUWP/WaterfallPage.xaml +++ b/PixivFSUWP/WaterfallPage.xaml @@ -2,63 +2,13 @@ x:Class="PixivFSUWP.WaterfallPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="using:PixivFSUWP" + xmlns:viewmodels="using:PixivFSUWP.ViewModels" xmlns:controls="using:PixivFSUWP.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="using:PixivFSUWP" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:viewmodels="using:PixivFSUWP.ViewModels" - Background="{StaticResource PageBackGround}" - mc:Ignorable="d"> + mc:Ignorable="d" Background="{StaticResource PageBackGround}"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -66,7 +16,7 @@ - + @@ -74,7 +24,7 @@ - + @@ -82,7 +32,7 @@ - + @@ -90,10 +40,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 9f829736e898bd8ef89c66c083b8597fbc64cd60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=88=B0=E9=98=9F=E7=9A=84=E5=81=B6=E5=83=8F-=E5=B2=9B?= =?UTF-8?q?=E9=A3=8E=E9=85=B1=EF=BC=81?= Date: Mon, 20 Apr 2020 03:34:30 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E7=AE=80=E5=8D=95=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PixivFSUWP/App.xaml | 8 +++++++- PixivFSUWP/BigImage.xaml | 2 +- PixivFSUWP/LoginPage.xaml | 6 +++--- PixivFSUWP/MainPage.xaml | 2 +- PixivFSUWP/SearchPage.xaml | 2 +- PixivFSUWP/UserDetailPage.xaml | 4 ++-- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/PixivFSUWP/App.xaml b/PixivFSUWP/App.xaml index 94b2831..f735380 100644 --- a/PixivFSUWP/App.xaml +++ b/PixivFSUWP/App.xaml @@ -7,9 +7,14 @@ xmlns:converters="using:PixivFSUWP.Converters" RequestedTheme="Light"> + + - + @@ -128,5 +133,6 @@ + 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/LoginPage.xaml b/PixivFSUWP/LoginPage.xaml index 7137717..c785ded 100644 --- a/PixivFSUWP/LoginPage.xaml +++ b/PixivFSUWP/LoginPage.xaml @@ -79,7 +79,7 @@ - + @@ -114,7 +114,7 @@ + Margin="5,0,0,0" Background="{ThemeResource SystemChromeLowColor}" BorderThickness="1.5" x:Name="btnNewComment" IsChecked="False"/> @@ -144,7 +144,7 @@ ScrollViewer.VerticalScrollMode="Disabled" ScrollViewer.HorizontalScrollMode="Disabled"> - + diff --git a/PixivFSUWP/ReportIssuePage.xaml b/PixivFSUWP/ReportIssuePage.xaml index 4b2c498..814993a 100644 --- a/PixivFSUWP/ReportIssuePage.xaml +++ b/PixivFSUWP/ReportIssuePage.xaml @@ -20,7 +20,7 @@ You are going to report an issue. We've collected some details. 您正准备汇报一个问题，我们收集了一些细节。 - diff --git a/PixivFSUWP/Themes/Dark.xaml b/PixivFSUWP/Themes/Dark.xaml index 6695147..8715f36 100644 --- a/PixivFSUWP/Themes/Dark.xaml +++ b/PixivFSUWP/Themes/Dark.xaml @@ -4,5 +4,4 @@ xmlns:local="using:PixivFSUWP.Themes"> /Assets/PixivHeader_L.png /Assets/PixivText_L.png - diff --git a/PixivFSUWP/Themes/Light.xaml b/PixivFSUWP/Themes/Light.xaml index 49ff47a..8b173e4 100644 --- a/PixivFSUWP/Themes/Light.xaml +++ b/PixivFSUWP/Themes/Light.xaml @@ -4,5 +4,4 @@ xmlns:local="using:PixivFSUWP.Themes"> /Assets/PixivHeader.png /Assets/PixivText.png - diff --git a/PixivFSUWP/UserDetailPage.xaml b/PixivFSUWP/UserDetailPage.xaml index e4696ac..3000b01 100644 --- a/PixivFSUWP/UserDetailPage.xaml +++ b/PixivFSUWP/UserDetailPage.xaml @@ -231,7 +231,7 @@ Date: Tue, 28 Apr 2020 19:29:13 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=81=B0=E8=89=B2?= =?UTF-8?q?=E5=AD=97=E5=89=8D=E6=99=AF=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PixivFSUWP/IllustDetailPage.xaml | 12 ++++++------ PixivFSUWP/SearchPage.xaml | 2 +- PixivFSUWP/SettingsPage.xaml | 6 +++--- PixivFSUWP/UserDetailPage.xaml | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/PixivFSUWP/IllustDetailPage.xaml b/PixivFSUWP/IllustDetailPage.xaml index b8d6c3e..d9c92cd 100644 --- a/PixivFSUWP/IllustDetailPage.xaml +++ b/PixivFSUWP/IllustDetailPage.xaml @@ -71,7 +71,7 @@ - + - *请带着鼓励和建设性的态度发表评论 + *请带着鼓励和建设性的态度发表评论 - + - + @@ -201,10 +201,10 @@ - + - + diff --git a/PixivFSUWP/SearchPage.xaml b/PixivFSUWP/SearchPage.xaml index 93038df..d1ce433 100644 --- a/PixivFSUWP/SearchPage.xaml +++ b/PixivFSUWP/SearchPage.xaml @@ -125,7 +125,7 @@ - + diff --git a/PixivFSUWP/SettingsPage.xaml b/PixivFSUWP/SettingsPage.xaml index 5abfbb2..b454bc0 100644 --- a/PixivFSUWP/SettingsPage.xaml +++ b/PixivFSUWP/SettingsPage.xaml @@ -28,7 +28,7 @@ - + @@ -59,12 +59,12 @@ - + @@ -152,7 +152,7 @@ - From f4b1577b566cd6f9d9bc838bd3334f8b5b885bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=88=B0=E9=98=9F=E7=9A=84=E5=81=B6=E5=83=8F-=E5=B2=9B?= =?UTF-8?q?=E9=A3=8E=E9=85=B1=EF=BC=81?= Date: Tue, 28 Apr 2020 19:52:12 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=9A=E5=85=8B?= =?UTF-8?q?=E5=8A=9B=E9=80=8F=E6=98=8E=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PixivFSUWP/App.xaml | 2 +- PixivFSUWP/Themes/Dark.xaml | 1 + PixivFSUWP/Themes/Light.xaml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/PixivFSUWP/App.xaml b/PixivFSUWP/App.xaml index 584b1dd..d6b650d 100644 --- a/PixivFSUWP/App.xaml +++ b/PixivFSUWP/App.xaml @@ -14,7 +14,7 @@ - + diff --git a/PixivFSUWP/Themes/Dark.xaml b/PixivFSUWP/Themes/Dark.xaml index 8715f36..0c199ab 100644 --- a/PixivFSUWP/Themes/Dark.xaml +++ b/PixivFSUWP/Themes/Dark.xaml @@ -4,4 +4,5 @@ xmlns:local="using:PixivFSUWP.Themes"> /Assets/PixivHeader_L.png /Assets/PixivText_L.png + 0.5 diff --git a/PixivFSUWP/Themes/Light.xaml b/PixivFSUWP/Themes/Light.xaml index 8b173e4..e3518b8 100644 --- a/PixivFSUWP/Themes/Light.xaml +++ b/PixivFSUWP/Themes/Light.xaml @@ -4,4 +4,5 @@ xmlns:local="using:PixivFSUWP.Themes"> /Assets/PixivHeader.png /Assets/PixivText.png + 0.7 From e8607fd4dbd28e2ae10889ecf6d7b09119f24295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=88=B0=E9=98=9F=E7=9A=84=E5=81=B6=E5=83=8F-=E5=B2=9B?= =?UTF-8?q?=E9=A3=8E=E9=85=B1=EF=BC=81?= Date: Tue, 28 Apr 2020 19:52:31 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=BD=BF=E7=94=A8Windo?= =?UTF-8?q?ws=E4=B8=BB=E9=A2=98=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PixivFSUWP/LoginPage.xaml | 7 ++++--- PixivFSUWP/ReportIssuePage.xaml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/PixivFSUWP/LoginPage.xaml b/PixivFSUWP/LoginPage.xaml index 67fc72e..372652f 100644 --- a/PixivFSUWP/LoginPage.xaml +++ b/PixivFSUWP/LoginPage.xaml @@ -26,7 +26,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -96,7 +96,8 @@ - + From 3b2867085a545311f7c9172e6c36e755070fc2e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=88=B0=E9=98=9F=E7=9A=84=E5=81=B6=E5=83=8F-=E5=B2=9B?= =?UTF-8?q?=E9=A3=8E=E9=85=B1=EF=BC=81?= Date: Tue, 28 Apr 2020 19:55:23 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E5=86=99=E5=8F=8D=E5=95=A6!!!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PixivFSUWP/Themes/Dark.xaml | 2 +- PixivFSUWP/Themes/Light.xaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PixivFSUWP/Themes/Dark.xaml b/PixivFSUWP/Themes/Dark.xaml index 0c199ab..e3309c7 100644 --- a/PixivFSUWP/Themes/Dark.xaml +++ b/PixivFSUWP/Themes/Dark.xaml @@ -4,5 +4,5 @@ xmlns:local="using:PixivFSUWP.Themes"> /Assets/PixivHeader_L.png /Assets/PixivText_L.png - 0.5 + 0.7 diff --git a/PixivFSUWP/Themes/Light.xaml b/PixivFSUWP/Themes/Light.xaml index e3518b8..dcfca24 100644 --- a/PixivFSUWP/Themes/Light.xaml +++ b/PixivFSUWP/Themes/Light.xaml @@ -4,5 +4,5 @@ xmlns:local="using:PixivFSUWP.Themes"> /Assets/PixivHeader.png /Assets/PixivText.png - 0.7 + 0.5 From 53329d7e3f10e98cc472fcaeaa4eb9b7a8b69942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=88=B0=E9=98=9F=E7=9A=84=E5=81=B6=E5=83=8F-=E5=B2=9B?= =?UTF-8?q?=E9=A3=8E=E9=85=B1=EF=BC=81?= Date: Tue, 28 Apr 2020 20:08:02 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=86=E7=81=B0?= =?UTF-8?q?=E5=AD=97=E4=BD=BF=E7=94=A8=E7=9A=84=E9=A2=9C=E8=89=B2=E8=B5=84?= =?UTF-8?q?=E6=BA=90=20=E4=BD=BF=E7=81=B0=E5=AD=97=E6=9B=B4=E6=B8=85?= =?UTF-8?q?=E6=99=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PixivFSUWP/IllustDetailPage.xaml | 12 ++++++------ PixivFSUWP/SearchPage.xaml | 2 +- PixivFSUWP/SettingsPage.xaml | 6 +++--- PixivFSUWP/Strings/zh-Hans/Resources.resw | 20 ++++++++++++++++++++ PixivFSUWP/UserDetailPage.xaml | 4 ++-- 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/PixivFSUWP/IllustDetailPage.xaml b/PixivFSUWP/IllustDetailPage.xaml index d9c92cd..714be5d 100644 --- a/PixivFSUWP/IllustDetailPage.xaml +++ b/PixivFSUWP/IllustDetailPage.xaml @@ -71,7 +71,7 @@ - + - *请带着鼓励和建设性的态度发表评论 + *请带着鼓励和建设性的态度发表评论 - + - + @@ -201,10 +201,10 @@ - + - + diff --git a/PixivFSUWP/SearchPage.xaml b/PixivFSUWP/SearchPage.xaml index d1ce433..51baad8 100644 --- a/PixivFSUWP/SearchPage.xaml +++ b/PixivFSUWP/SearchPage.xaml @@ -125,7 +125,7 @@ - + diff --git a/PixivFSUWP/SettingsPage.xaml b/PixivFSUWP/SettingsPage.xaml index b454bc0..ff7d6d2 100644 --- a/PixivFSUWP/SettingsPage.xaml +++ b/PixivFSUWP/SettingsPage.xaml @@ -28,7 +28,7 @@ - + @@ -59,12 +59,12 @@ - + @@ -152,7 +152,7 @@ - From 07c1d9c8f844c4669f41b2a1af3a4bd622216a34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=88=B0=E9=98=9F=E7=9A=84=E5=81=B6=E5=83=8F-=E5=B2=9B?= =?UTF-8?q?=E9=A3=8E=E9=85=B1=EF=BC=81?= Date: Mon, 4 May 2020 10:49:45 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9F=A2=E9=87=8F?= =?UTF-8?q?=E5=8C=96=E7=9A=84=E8=B5=84=E6=BA=90=20=E9=85=B1=E7=B4=AB?= =?UTF-8?q?=E7=9A=84=E8=AF=9D=E5=91=A2=20=E5=B0=B1=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=B6=88=E6=8E=89=E9=94=AF=E9=BD=BF=E4=BA=86=20=E6=88=91?= =?UTF-8?q?=E7=9C=9F=E6=98=AF=E5=A4=A9=E6=89=8D!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PixivFSUWP/Assets/Pixiv_Logo.svg | 5 +++++ PixivFSUWP/Controls/Pixiv_Logo.xaml | 13 +++++++++++++ PixivFSUWP/Controls/Pixiv_Logo.xaml.cs | 27 ++++++++++++++++++++++++++ PixivFSUWP/LoginPage.xaml | 6 +++++- PixivFSUWP/MainPage.xaml | 5 ++++- PixivFSUWP/PixivFSUWP.csproj | 7 +++++++ 6 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 PixivFSUWP/Assets/Pixiv_Logo.svg create mode 100644 PixivFSUWP/Controls/Pixiv_Logo.xaml create mode 100644 PixivFSUWP/Controls/Pixiv_Logo.xaml.cs 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/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/LoginPage.xaml b/PixivFSUWP/LoginPage.xaml index 372652f..52c2a57 100644 --- a/PixivFSUWP/LoginPage.xaml +++ b/PixivFSUWP/LoginPage.xaml @@ -87,7 +87,11 @@ - + + + + + diff --git a/PixivFSUWP/MainPage.xaml b/PixivFSUWP/MainPage.xaml index 84b5aab..03ebe50 100644 --- a/PixivFSUWP/MainPage.xaml +++ b/PixivFSUWP/MainPage.xaml @@ -30,7 +30,10 @@ SelectionChanged="NavControl_SelectionChanged" IsSettingsVisible="False" BackRequested="NavControl_BackRequested"> - + + + + diff --git a/PixivFSUWP/PixivFSUWP.csproj b/PixivFSUWP/PixivFSUWP.csproj index e058668..18c43af 100644 --- a/PixivFSUWP/PixivFSUWP.csproj +++ b/PixivFSUWP/PixivFSUWP.csproj @@ -135,6 +135,9 @@ App.xaml + + Pixiv_Logo.xaml + BigImage.xaml @@ -237,6 +240,10 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + Designer MSBuild:Compile