Update WiFi view.

Change-Id: Ic62dd575a9dabce4e9089a06bb598bd6dbf2dd47

diff --git a/Oobe/Oobe.Common/Views/BasePage.xaml.cs b/Oobe/Oobe.Common/Views/BasePage.xaml.cs
index c459c48..1c328d7 100644 (file)
--- a/Oobe/Oobe.Common/Views/BasePage.xaml.cs
+++ b/Oobe/Oobe.Common/Views/BasePage.xaml.cs
@@ -41,6 +41,9 @@ namespace Oobe.Common.Views
 
             Buttons.Relayout += (s, e) =>
             {
+                float titleExtraSizeHeight = ScreenSizeUtils.GetExtraSizeHeight(Title);
+                titleTopMargin += (int)titleExtraSizeHeight;
+
                 Title.Margin = new Extents(0, 0, (ushort)(titleTopMargin - (ScreenSizeUtils.GetExtraSizeHeight(Title) > 0 ? Title.SizeHeight / 2 : 0)), 0);
             };
         }

diff --git a/Oobe/Oobe.Common/res/layout/WifiView.xaml b/Oobe/Oobe.Common/res/layout/WifiView.xaml
index 947ce88..ffefe5a 100644 (file)
--- a/Oobe/Oobe.Common/res/layout/WifiView.xaml
+++ b/Oobe/Oobe.Common/res/layout/WifiView.xaml
@@ -7,8 +7,8 @@
       xmlns:ctrl="clr-namespace:Oobe.Common.Controls"
       BackgroundImage="*Resource*/wifi/Rectangle_918.png"
       FlexLayout.FlexAlignmentSelf="Center"
-      Margin="{ext:Extents Bottom=95, Top=20}"
-      Size="{ext:ComponentSize Width=1080, Height=568, WidthPortrait=824, HeightPortrait=880, ChangeOnPortraitMode=true}"
+      Margin="{ext:Extents Bottom=41, Top=20}"
+      Size="{ext:ComponentSize Width=1080, Height=568, WidthPortrait=824, HeightPortrait=1472, ChangeOnPortraitMode=true}"
       Padding="{ext:Extents Top=5, Bottom=5}">
 
     <View.Layout>

diff --git a/Oobe/Oobe.Wifi/WifiStep.cs b/Oobe/Oobe.Wifi/WifiStep.cs
index c2b6198..cb05156 100644 (file)
--- a/Oobe/Oobe.Wifi/WifiStep.cs
+++ b/Oobe/Oobe.Wifi/WifiStep.cs
@@ -46,7 +46,7 @@ namespace Oobe.Wifi
                 CommandBack = new Command(nav.Previous),
                 NextButtonStyle = "SkipButton",
             };
-            var titleTopMargin = (ushort)((ScreenSizeUtils.IsPortrait ? 330 : (int)(0.035f * Window.Instance.Size.Height)) * ScreenSizeUtils.YRatio);
+            var titleTopMargin = (ushort)((ScreenSizeUtils.IsPortrait ? 32 : (int)(0.035f * Window.Instance.Size.Height)) * ScreenSizeUtils.YRatio);
             var container = new BasePage(titleTopMargin, false) { BindingContext = vm };
 
             wifiView = new WifiView(State.IsTurnedOn);