Apply guideline changes

The changes cover:

* change titles font sizes & position
* change terms content size & position

Change-Id: Iced99e83c1efe5c2fb2f868c6fa801f15643a46d

diff --git a/Oobe/Oobe.Language/LanguageStep.cs b/Oobe/Oobe.Language/LanguageStep.cs
index 899b0b7..04fee52 100644 (file)
--- a/Oobe/Oobe.Language/LanguageStep.cs
+++ b/Oobe/Oobe.Language/LanguageStep.cs
@@ -48,12 +48,13 @@ namespace Oobe.Language
 
             TextLabel title = new TextLabel();
             title.TranslatableText = "CHOOSE_LANGUAGE";
-            title.Position2D = new Position2D(410, 160);
-            title.Size2D = new Size2D(364, 58);
+            title.Position2D = new Position2D(0, 104);
+            title.Size2D = new Size2D(0, 48);
+            title.WidthResizePolicy = ResizePolicyType.FillToParent;
             title.TextColor = new Color(0, 20.0f / 255.0f, 71.0f / 255.0f, 1.0f);
             title.HorizontalAlignment = HorizontalAlignment.Center;
             title.Ellipsis = false;
-            title.PixelSize = 48.0f;
+            title.PixelSize = 40.0f;
             title.FontFamily = "BreezeSans";
             title.FontStyle = new PropertyMap().AddLightFontStyle();
 

diff --git a/Oobe/Oobe.Region/RegionStep.cs b/Oobe/Oobe.Region/RegionStep.cs
index ed9bfd3..30acf93 100644 (file)
--- a/Oobe/Oobe.Region/RegionStep.cs
+++ b/Oobe/Oobe.Region/RegionStep.cs
@@ -43,12 +43,13 @@ namespace Oobe.Region
 
             TextLabel title = new TextLabel();
             title.TranslatableText = "CHOOSE_REGION";
-            title.Position2D = new Position2D(410, 160);
-            title.Size2D = new Size2D(364, 58);
+            title.Position2D = new Position2D(0, 104);
+            title.Size2D = new Size2D(0, 48);
+            title.WidthResizePolicy = ResizePolicyType.FillToParent;
             title.TextColor = new Color(0, 20.0f/255.0f, 71.0f/255.0f, 1.0f);
             title.HorizontalAlignment = HorizontalAlignment.Center;
             title.Ellipsis = false;
-            title.PixelSize = 48.0f;
+            title.PixelSize = 40.0f;
             title.FontFamily = "BreezeSans";
             title.FontStyle = new PropertyMap().AddLightFontStyle();
 

diff --git a/Oobe/Oobe.Terms/Views/TermsView.cs b/Oobe/Oobe.Terms/Views/TermsView.cs
index b6c8c71..87e163e 100644 (file)
--- a/Oobe/Oobe.Terms/Views/TermsView.cs
+++ b/Oobe/Oobe.Terms/Views/TermsView.cs
@@ -44,28 +44,30 @@ namespace Oobe.Terms.Views
 
             TextLabel title = new TextLabel();
             title.TranslatableText = "TERMS_AND_CONDITIONS";
-            title.Position2D = new Position2D(163, 20);
+            title.Position2D = new Position2D(0, 40);
             title.HorizontalAlignment = HorizontalAlignment.Center;
-            title.Size2D = new Size2D(864, 58);
+            title.Size2D = new Size2D(0, 50);
+            title.WidthResizePolicy = ResizePolicyType.FillToParent;
             title.TextColor = new Color(0, 20.0f / 255.0f, 71.0f / 255.0f, 1.0f);
-            title.PixelSize = 48.0f;
+            title.PixelSize = 40.0f;
             title.FontFamily = "BreezeSans";
             title.FontStyle = new PropertyMap().AddLightFontStyle();
 
             View bounding = new View();
             bounding.BackgroundImage = NUIApplication.Current.DirectoryInfo.Resource + "Rectangle 861.svg";
-            bounding.Position2D = new Position2D(56 - 6, 95 - 6);
-            bounding.Size2D = new Size2D(1087, 347);
+            // subtract 6 pixels due to top/left offset in resource file
+            bounding.Position2D = new Position2D(56 - 6, 112 - 6);
+            bounding.Size2D = new Size2D(1086, 331);
 
             ScrollableBase scroller = new ScrollableBase();
-            scroller.Position2D = new Position2D(56 - 6 + 64, 95 - 6 + 24);
-            scroller.Size2D = new Size2D(1087 - 128, 347 - 48);
+            scroller.Position2D = new Position2D(120, 136);
+            scroller.Size2D = new Size2D(944, 268);
 
             // Do not use style on content as it seriously impacts scrolling
             // performance on ScrollableBase
             TextLabel content = new TextLabel();
             content.TextColor = new Color(0, 12.0f / 255.0f, 43.0f / 255.0f, 1.0f);
-            content.PointSize = 16.0f;
+            content.PixelSize = 18.0f;
             content.FontFamily = "BreezeSans";
             content.Text = terms.LoadTerms();
             content.LineWrapMode = LineWrapMode.Character;
@@ -103,12 +105,12 @@ namespace Oobe.Terms.Views
             prev.SetFontStyle(new PropertyMap().AddRegularFontStyle());
 
             TextLabel guide = new TextLabel(TextLabelStyles.GuideTextLabelStyle);
-            guide.Position2D = new Position2D(155, 442);
+            guide.Position2D = new Position2D(160, 440);
             guide.TranslatableText = "YOU_MUST_SCROLL_DOWN_AND_READ_THE_WHOLE_TEXT_ABOVE";
 
             agreeSwitch = new Switch(SwitchStyles.IHaveReadAndAgreeSwitchStyle);
             agreeSwitch.Size2D = new Size2D(24, 24);
-            agreeSwitch.Position2D = new Position2D(115, 463);
+            agreeSwitch.Position2D = new Position2D(120, 463);
             agreeSwitch.IsSelected = false;
             agreeSwitch.IsEnabled = false;
             agreeSwitch.ClickEvent += (obj, args) =>
@@ -119,7 +121,7 @@ namespace Oobe.Terms.Views
             agreeLabel = new TextLabel(TextLabelStyles.IHaveReadAndAgreeTextStyleDisabled);
             agreeLabel.State = States.Disabled;
             agreeLabel.TranslatableText = "I_HAVE_READ_AND_AGREE_TO_TERMS_AND_CONDITIONS";
-            agreeLabel.Position2D = new Position2D(155, 463);
+            agreeLabel.Position2D = new Position2D(160, 462);
 
             this.Add(title);
             this.Add(prev);

diff --git a/Oobe/Oobe.Terms/res/Rectangle 861.svg b/Oobe/Oobe.Terms/res/Rectangle 861.svg
index c275304..417124b 100644 (file)
--- a/Oobe/Oobe.Terms/res/Rectangle 861.svg
+++ b/Oobe/Oobe.Terms/res/Rectangle 861.svg
@@ -1,6 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1087" height="347" viewBox="0 0 1087 347">\r
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1087" height="331" viewBox="0 0 1087 331">\r
   <defs>\r
-    <filter id="Rectangle_861" x="0" y="0" width="1087" height="347" filterUnits="userSpaceOnUse">\r
+    <filter id="Rectangle_861" x="0" y="0" width="1087" height="331" filterUnits="userSpaceOnUse">\r
       <feOffset dx="1" dy="1" input="SourceAlpha"/>\r
       <feGaussianBlur stdDeviation="2.5" result="blur"/>\r
       <feFlood flood-opacity="0.161"/>\r
@@ -9,6 +9,6 @@
     </filter>\r
   </defs>\r
   <g transform="matrix(1, 0, 0, 1, 0, 0)" filter="url(#Rectangle_861)">\r
-    <rect id="Rectangle_861-2" data-name="Rectangle 861" width="1072" height="332" rx="28" transform="translate(6.5 6.5)" fill="#fff"/>\r
+    <rect id="Rectangle_861-2" data-name="Rectangle 861" width="1072" height="316" rx="28" transform="translate(6.5 6.5)" fill="#fff"/>\r
   </g>\r
 </svg>\r

diff --git a/Oobe/Oobe.Welcome/WelcomeStep.cs b/Oobe/Oobe.Welcome/WelcomeStep.cs
index 60ac242..cbf5ac9 100644 (file)
--- a/Oobe/Oobe.Welcome/WelcomeStep.cs
+++ b/Oobe/Oobe.Welcome/WelcomeStep.cs
@@ -30,19 +30,20 @@ namespace Oobe.Welcome
 \r
             TextLabel title = new TextLabel();\r
             title.TranslatableText = "WELCOME_TITLE";\r
-            title.Position2D = new Position2D(163, 160);\r
-            title.Size2D = new Size2D(857, 63);\r
+            title.Position2D = new Position2D(0, 137);\r
+            title.Size2D = new Size2D(0, 50);\r
+            title.WidthResizePolicy = ResizePolicyType.FillToParent;
             title.TextColor = new Color(0, 20.0f/255.0f, 71.0f/255.0f, 1.0f);\r
-            title.PointSize = 48.0f;\r
+            title.PixelSize = 40.0f;\r
             title.HorizontalAlignment = HorizontalAlignment.Center;\r
             title.FontFamily = "BreezeSans";\r
             title.FontStyle = new PropertyMap().AddLightFontStyle();\r
 \r
             TextLabel content = new TextLabel();\r
-            content.Position2D = new Position2D(81, 247);\r
-            content.Size2D = new Size2D(1022, 166);\r
+            content.Position2D = new Position2D(80, 209);\r
+            content.Size2D = new Size2D(1026, 166);\r
             content.TextColor = new Color(0, 12.0f/255.0f, 43.0f/255.0f, 1.0f);\r
-            content.PointSize = 22.0f;\r
+            content.PixelSize = 22.0f;\r
             content.HorizontalAlignment = HorizontalAlignment.Center;\r
             content.FontFamily = "BreezeSansLight";\r
             content.MultiLine = true;\r

diff --git a/Oobe/Oobe.Wifi/WifiStep.cs b/Oobe/Oobe.Wifi/WifiStep.cs
index 1cf52f0..14c0d8d 100644 (file)
--- a/Oobe/Oobe.Wifi/WifiStep.cs
+++ b/Oobe/Oobe.Wifi/WifiStep.cs
@@ -46,10 +46,10 @@ namespace Oobe.Wifi
             view.Add(new TextLabel()
             {
                 TranslatableText = "CHOOSE_WIFI_NETWORK",
-                Size = new Size(0, 58),
+                Size = new Size(0, 50),
                 WidthResizePolicy = ResizePolicyType.FillToParent,
-                Margin = new Extents(0, 0, 20, 8),
-                PixelSize = 48.0f,
+                Margin = new Extents(0, 40, 24, 8),
+                PixelSize = 40.0f,
                 TextColor = new Color(0, 0x14 / 255.0f, 0x47 / 255.0f, 1.0f),
                 FontFamily = "BreezeSans",
                 FontStyle = new PropertyMap().AddLightFontStyle(),