Correcting wifi list layout

Signed-off-by: k.stepaniuk <k.stepaniuk@samsung.com>

diff --git a/Oobe/Oobe/Managers/ProcessManager.cs b/Oobe/Oobe/Managers/ProcessManager.cs
index 9c6adc658ea57d5098e100f2d2fc9b0f0e6fd580..df93299276fdd611f34f9d9ab037ccf8bb99a9d4 100644 (file)
--- a/Oobe/Oobe/Managers/ProcessManager.cs
+++ b/Oobe/Oobe/Managers/ProcessManager.cs
@@ -11,9 +11,9 @@ using System.IO;
 using Oobe.Terms;
 
 namespace Oobe
- {
-     public class ProcessManager : IProcessNavigation
-     {
+{
+    public class ProcessManager : IProcessNavigation
+    {
         private MainView ui;
         private LinkedList<Lazy<ProcessStep>> steps;
         private LinkedListNode<Lazy<ProcessStep>> current;
@@ -59,7 +59,7 @@ namespace Oobe
         public ProcessManager()
         {
             //TODO consider loading this from xaml, xml or something...
-            steps = new LinkedList<Lazy<ProcessStep>>(new []{
+            steps = new LinkedList<Lazy<ProcessStep>>(new[]{
                 new Lazy<ProcessStep>(() => new LanguageStep()),
                 new Lazy<ProcessStep>(() => new RegionStep()),
                 new Lazy<ProcessStep>(() => new TermsStep()),

diff --git a/Oobe/OobeWifi/Controls/Wifi/ApView.cs b/Oobe/OobeWifi/Controls/Wifi/ApView.cs
index 5d132d8c58ba76d9cdeb345d9685e29da1e0da3a..adfeca612b9b979f3a6adfa72e3ca11b5b757000 100644 (file)
--- a/Oobe/OobeWifi/Controls/Wifi/ApView.cs
+++ b/Oobe/OobeWifi/Controls/Wifi/ApView.cs
@@ -26,14 +26,14 @@ namespace Oobe.Wifi.Controls.Wifi
             {
                 range = new View()
                 {
-                    Position = new Position(39, 32),
+                    Position = new Position(39, 21),
                     BackgroundImage = GetRangeImage(wifiAp),
                 };
                 this.Add(range);
 
                 this.Add(new TextLabel(wifiAp.NetworkInformation.Essid)
                 {
-                    Position = new Position(78, 28),
+                    Position = new Position(78, 17),
                     PixelSize = 20f,
                     TextColor = new Color(0, 0x0C / 255f, 0x2B / 255f, 1.0f),
                     FontFamily = "BreezeSans",
@@ -43,7 +43,7 @@ namespace Oobe.Wifi.Controls.Wifi
                 detail = new TextLabel(GetDetailInfo(wifiAp))
                 {
                     WidthSpecification = LayoutParamPolicies.WrapContent,
-                    Position = new Position(79, 56),
+                    Position = new Position(79, 45),
                     PixelSize = 14f,
                     TextColor = new Color(0, 0x0C / 255f, 0x2B / 255f, 1.0f),
                     FontFamily = "BreezeSans",

diff --git a/Oobe/OobeWifi/Controls/Wifi/WifiView.cs b/Oobe/OobeWifi/Controls/Wifi/WifiView.cs
index 05d1ea0e9f91b50dd47b543e96ba8686908ed507..c2e52f3b55b1525eaee4f874cd81f6b1c1d7a527 100644 (file)
--- a/Oobe/OobeWifi/Controls/Wifi/WifiView.cs
+++ b/Oobe/OobeWifi/Controls/Wifi/WifiView.cs
@@ -10,7 +10,7 @@ namespace Oobe.Wifi.Controls.Wifi
     {
         private View view = null;
         public const int ListItemWidth = 460;
-        public const int ListItemHeight = 89;
+        public const int ListItemHeight = 79;//89;
 
         private WifiState State { get; set; } = new WifiState();
         private ApManager ApManager { get; set; } = new ApManager(OnApTapped);
@@ -28,7 +28,9 @@ namespace Oobe.Wifi.Controls.Wifi
                             LinearOrientation = LinearLayout.Orientation.Vertical,
                         },
                         BackgroundImage = System.IO.Path.Combine(NUIApplication.Current.DirectoryInfo.Resource, "Rectangle_918.png"),
+                        //BackgroundColor = Color.Red,
                         //Size = new Size(480, 401),
+                        Size = new Size(480, 416),
                     };
                     view.Add(CreateHeader(480, 91));
 
@@ -158,7 +160,8 @@ namespace Oobe.Wifi.Controls.Wifi
         private View CreateListViewPlaceHolder()
         {
             var view = new View();
-            var listView = new ListView(480, 314)//480, 335
+            //var listView = new ListView(480, 324)//314)//480, 335
+            var listView = new ListView(480, 319)
             {
                 Footer = CreateManualWifiView(),
                 Items = ApManager.Views,
@@ -168,7 +171,7 @@ namespace Oobe.Wifi.Controls.Wifi
 
             var prompt = new TextLabel()
             {
-                Position = new Position(42, 32),
+                Position = new Position(40, 21),
                 PixelSize = 20,
                 TextColor = new Color(0, 0x14 / 255f, 0x47 / 255f, 1.0f),
                 FontFamily = "BreezeSans",
@@ -209,6 +212,7 @@ namespace Oobe.Wifi.Controls.Wifi
 
             var progress = new View()
             {
+                Size = new Size(22, 23),
                 Margin = new Extents(0, 0, 1, 0),
                 BackgroundImage = System.IO.Path.Combine(NUIApplication.Current.DirectoryInfo.Resource, "12_icon_scanning.png"),
             };
@@ -236,10 +240,13 @@ namespace Oobe.Wifi.Controls.Wifi
 
             view.Add(new TextLabel()
             {
+                Size = new Size(190, 25),
                 TranslatableText = "WIFI_SCANNING",
                 Margin = new Extents(17, 0, 0, 0),
-                PixelSize = 19f,
-                TextColor = new Color(0, 14.0f / 255.0f, 47.0f / 255.0f, 1.0f),
+                VerticalAlignment = VerticalAlignment.Center,
+                HorizontalAlignment = HorizontalAlignment.Begin,
+                PixelSize = 20f,
+                TextColor = new Color(0, 0x0C / 255f, 0x2B / 255f, 1.0f),
                 FontFamily = "BreezeSans",
                 FontStyle = new PropertyMap().AddRegularFontStyle(),
             });
@@ -256,8 +263,8 @@ namespace Oobe.Wifi.Controls.Wifi
             var wifi = new TextLabel("Wi-Fi")
             {
                 //Size = new Size(49, 24),
-                PixelSize = 19f,
-                TextColor = new Color(0, 14.0f / 255.0f, 47.0f / 255.0f, 1.0f),
+                PixelSize = 20f,
+                TextColor = new Color(0, 0x0C / 255f, 0x2B / 255f, 1.0f),
                 FontFamily = "BreezeSans",
                 FontStyle = new PropertyMap().AddRegularFontStyle(),
             };

diff --git a/Oobe/OobeWifi/res/Rectangle_918.png b/Oobe/OobeWifi/res/Rectangle_918.png
index 50b03e98255cba33ccd399e95fa40bba35e57770..a360a9ed8ca46b7fb27a0c90ce0a82763aab3901 100644 (file)
Binary files a/Oobe/OobeWifi/res/Rectangle_918.png and b/Oobe/OobeWifi/res/Rectangle_918.png differ

diff --git a/Oobe/OobeWifi/res/dRectangle_918.png b/Oobe/OobeWifi/res/dRectangle_918.png
new file mode 100644 (file)
index 0000000..782a8cd
Binary files /dev/null and b/Oobe/OobeWifi/res/dRectangle_918.png differ