From: Manika Shrivastava Date: Thu, 14 Sep 2023 10:27:01 +0000 (+0530) Subject: Corrects the border and background properties of the connect and cancel buttons X-Git-Tag: accepted/tizen/unified/20230926.090232~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F70%2F298870%2F4;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-wifi.git Corrects the border and background properties of the connect and cancel buttons Change-Id: I74bbe4b96a5d6136b733ac0f1169e6e8162e892e Signed-off-by: Manika Shrivastava --- diff --git a/SettingWiFi/SettingWiFi/view/ConnectPage.cs b/SettingWiFi/SettingWiFi/view/ConnectPage.cs index 8ae231b..fba23f0 100755 --- 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 43c8745..159b938 100755 --- 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"; static public string IDS_WIFI_SK_FORGET = "Forget"; static public string IDS_WIFI_SK2_OK = "OK"; + static public string IDS_WIFI_SK_OK = "Ok"; static public string IDS_WIFI_SBODY_CONNECTED_M_STATUS = "Connected"; static public string IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION = "Automatically switch between Wi-Fi and mobile networks to maintain a stable Internet connection."; diff --git a/packaging/org.tizen.cssetting-wifi-1.1.4.rpk b/packaging/org.tizen.cssetting-wifi-1.1.4.rpk index 4a7dc8b..af529c6 100644 Binary files a/packaging/org.tizen.cssetting-wifi-1.1.4.rpk and b/packaging/org.tizen.cssetting-wifi-1.1.4.rpk differ