From 45a042adf629d1c610486a7c0638bf8529f59b2c Mon Sep 17 00:00:00 2001
From: Tsanie Lily <tsorgy@gmail.com>
Date: Tue, 5 May 2020 12:29:17 +0800
Subject: [PATCH] fixed: status bar style issue.

---
 Pixiview/MainPage.xaml          |  4 +++-
 Pixiview/UI/Theme/DarkTheme.cs  |  4 +++-
 Pixiview/UI/Theme/LightTheme.cs | 10 ++++++----
 Pixiview/UI/Theme/ThemeBase.cs  |  1 +
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Pixiview/MainPage.xaml b/Pixiview/MainPage.xaml
index 58582d7..50cc0bf 100644
--- a/Pixiview/MainPage.xaml
+++ b/Pixiview/MainPage.xaml
@@ -4,10 +4,12 @@
                xmlns:d="http://xamarin.com/schemas/2014/forms/design"
                xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                xmlns:u="clr-namespace:Pixiview.UI"
+               xmlns:util="clr-namespace:Pixiview.Utils"
                mc:Ignorable="d"
                x:Class="Pixiview.MainPage"
                BackgroundColor="{DynamicResource WindowColor}"
-               OrientationChanged="Page_OrientationChanged">
+               OrientationChanged="Page_OrientationChanged"
+               util:StatusBar.StatusBarStyle="{DynamicResource StatusBarStyle}">
     <NavigationPage.TitleView>
         <u:NavigationTitle Title="Follow"
                            IsLeftButtonVisible="True"
diff --git a/Pixiview/UI/Theme/DarkTheme.cs b/Pixiview/UI/Theme/DarkTheme.cs
index e490126..d025e2e 100644
--- a/Pixiview/UI/Theme/DarkTheme.cs
+++ b/Pixiview/UI/Theme/DarkTheme.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Pixiview.Utils;
+using Xamarin.Forms;
 
 namespace Pixiview.UI.Theme
 {
@@ -26,6 +27,7 @@ namespace Pixiview.UI.Theme
 
         private void InitColors()
         {
+            Add(StatusBarStyle, StatusBarStyles.WhiteText);
             Add(WindowColor, Color.Black);
             Add(TextColor, Color.White);
             Add(SubTextColor, Color.LightGray);
diff --git a/Pixiview/UI/Theme/LightTheme.cs b/Pixiview/UI/Theme/LightTheme.cs
index 5bdd1d5..1174b60 100644
--- a/Pixiview/UI/Theme/LightTheme.cs
+++ b/Pixiview/UI/Theme/LightTheme.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using Pixiview.Utils;
+using Xamarin.Forms;
 
 namespace Pixiview.UI.Theme
 {
@@ -26,12 +27,13 @@ namespace Pixiview.UI.Theme
 
         private void InitColors()
         {
+            Add(StatusBarStyle, StatusBarStyles.DarkText);
             Add(WindowColor, Color.White);
             Add(TextColor, Color.Black);
             Add(SubTextColor, Color.DimGray);
-            Add(MainColor, Color.FromRgb(0x7f, 0x99, 0xc6));
-            Add(MainTextColor, Color.White);
-            Add(SubColor, Color.FromRgb(0xfa, 0xfa, 0xf0));
+            Add(MainColor, Color.FromRgb(0xf0, 0xf0, 0xf0));    // Color.FromRgb(0x7f, 0x99, 0xc6)
+            Add(MainTextColor, Color.Black);
+            Add(SubColor, Color.FromRgb(0xf0, 0xf0, 0xf0));     // Color.FromRgb(0xfa, 0xfa, 0xf0)
         }
     }
 }
diff --git a/Pixiview/UI/Theme/ThemeBase.cs b/Pixiview/UI/Theme/ThemeBase.cs
index 2395836..3947caa 100644
--- a/Pixiview/UI/Theme/ThemeBase.cs
+++ b/Pixiview/UI/Theme/ThemeBase.cs
@@ -7,6 +7,7 @@ namespace Pixiview.UI.Theme
         public const string TitleButton = nameof(TitleButton);
         public const string TitleLabel = nameof(TitleLabel);
 
+        public const string StatusBarStyle = nameof(StatusBarStyle);
         public const string WindowColor = nameof(WindowColor);
         public const string TextColor = nameof(TextColor);
         public const string SubTextColor = nameof(SubTextColor);