Corrects the border and background properties of the connect and cancel buttons

Change-Id: I74bbe4b96a5d6136b733ac0f1169e6e8162e892e
Signed-off-by: Manika Shrivastava <manika.sh@samsung.com>

diff --git a/SettingWiFi/SettingWiFi/view/ConnectPage.cs b/SettingWiFi/SettingWiFi/view/ConnectPage.cs
index 8ae231b7c5d7370a286ef86cc599eb82f2d8a4c2..fba23f06cfb41eba4716ae852b1e412dd15bc6a2 100755 (executable)
--- a/SettingWiFi/SettingWiFi/view/ConnectPage.cs
+++ b/SettingWiFi/SettingWiFi/view/ConnectPage.cs
@@ -97,6 +97,7 @@ namespace SettingWiFi
             connectView.Add(label);
 
             connectView.Add(CreatePasswordEntryItem());
+            connectView.Add(CreateUnderline());
 
             if(mAp.IsWps)
             {
@@ -108,12 +109,16 @@ namespace SettingWiFi
                 Text = Resources.IDS_WIFI_SK_CANCEL,
                 WidthSpecification = 252,
                 HeightSpecification = 48,
+                BackgroundColor = Color.White,
+                TextColor = new Color("#FF6200"),
+                BorderlineColor = new Color("#FF6200"),
+                BorderlineWidth = 2,
             };
             cancelButton.Clicked += OnCancelClicked;
 
             mConnectButton = new Button()
             {
-                Text = Resources.IDS_WIFI_BODY_CONNECT,
+                Text = Resources.IDS_WIFI_SK_OK,
                 WidthSpecification = 252,
                 HeightSpecification = 48,
             };
@@ -221,6 +226,18 @@ namespace SettingWiFi
             return passwordEntryView;
         }
 
+        private View CreateUnderline()
+        {
+            return new View()
+            {
+                BorderlineColor = new Color("#FF6200"),
+                BorderlineWidth = 1,
+                WidthSpecification = 530,
+                HeightSpecification = 1,
+                Padding = new Extents(5, 0, 0, 0),
+            };
+        }
+
         private void OnEyeButtonClicked(object sender, ClickedEventArgs e)
         {
             Debug("+");

diff --git a/SettingWiFi/SettingWiFi/view/Resources.cs b/SettingWiFi/SettingWiFi/view/Resources.cs
index 43c8745e43f5a33617b0eaaa71b896884f484da5..159b9389ad47084806fc3d383c612026aa4fef8a 100755 (executable)
--- a/SettingWiFi/SettingWiFi/view/Resources.cs
+++ b/SettingWiFi/SettingWiFi/view/Resources.cs
@@ -44,6 +44,7 @@
         static public string IDS_WIFI_SK_WPS_PIN = "WPS PIN";\r
         static public string IDS_WIFI_SK_FORGET = "Forget";\r
         static public string IDS_WIFI_SK2_OK = "OK";\r
+        static public string IDS_WIFI_SK_OK = "Ok";\r
         static public string IDS_WIFI_SBODY_CONNECTED_M_STATUS = "Connected";\r
         static public string IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION\r
             = "Automatically switch between Wi-Fi and mobile networks to maintain a stable Internet connection.";\r

diff --git a/packaging/org.tizen.cssetting-wifi-1.1.4.rpk b/packaging/org.tizen.cssetting-wifi-1.1.4.rpk
index 4a7dc8b2c216713fe62cb87cbdbb07473ed49b64..af529c6645ad0fe1d2d7572c473a312a180c8b0b 100644 (file)
Binary files a/packaging/org.tizen.cssetting-wifi-1.1.4.rpk and b/packaging/org.tizen.cssetting-wifi-1.1.4.rpk differ