From: Seonah Moon Date: Thu, 13 Oct 2022 08:31:37 +0000 (+0900) Subject: ConnectPage: update wps button X-Git-Tag: accepted/tizen/unified/20221216.024031~18^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19c9502c1d15799ccddcc1a1c64cabe83608df4e;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-wifi.git ConnectPage: update wps button Change-Id: I9c581676d1c8dab9535a74de89cfcbcbca27d2a4 --- diff --git a/SettingWiFi/SettingWiFi/res/images/wifi_icon_wps.png b/SettingWiFi/SettingWiFi/res/images/wifi_icon_wps.png new file mode 100644 index 0000000..c77f56a Binary files /dev/null and b/SettingWiFi/SettingWiFi/res/images/wifi_icon_wps.png differ diff --git a/SettingWiFi/SettingWiFi/view/ConnectPage.cs b/SettingWiFi/SettingWiFi/view/ConnectPage.cs index 86564c9..19ca8e0 100644 --- a/SettingWiFi/SettingWiFi/view/ConnectPage.cs +++ b/SettingWiFi/SettingWiFi/view/ConnectPage.cs @@ -18,20 +18,9 @@ namespace SettingWiFi Debug("ConnectPage"); mWifi = wifi; } - internal void CreateComponents(AP ap) - { - mAp = ap; - - var connectView = new RecyclerViewItem() - { - Layout = new LinearLayout() - { - LinearOrientation = LinearLayout.Orientation.Vertical, - }, - WidthSpecification = LayoutParamPolicies.MatchParent, - HeightSpecification = LayoutParamPolicies.WrapContent, - }; + internal TextField CreatePasswordField() + { var passwordItem = new DefaultLinearItem() { WidthSpecification = LayoutParamPolicies.MatchParent, @@ -52,19 +41,59 @@ namespace SettingWiFi hiddenInput.SubstituteCount = 0; hiddenInput.ShowLastCharacterDuration = 1000; passwordField.SetHiddenInput(hiddenInput); - passwordItem.Add(passwordField); - var wpsButton = new Button() + return passwordField; + } + + internal DefaultLinearItem CreateWpsItem() + { + ImageViewStyle iconStyle = new ImageViewStyle() + { + Color = new Selector() + { + Normal = new Color("#17234D"), + Focused = new Color("#17234D"), + Pressed = new Color("#FF6200"), + Disabled = new Color("#CACACA"), + }, + ResourceUrl = new Selector() + { + Normal = new String(Tizen.Applications.Application.Current.DirectoryInfo.Resource + + "/images/wifi_icon_wps.png"), + }, + }; + + var wpsItem = new DefaultLinearItem() { + WidthSpecification = LayoutParamPolicies.MatchParent, + IsSelectable = true, + Icon = new ImageView(iconStyle), Text = Resources.IDS_WIFI_OPT_WPS, - WidthSpecification = 100, - HeightSpecification = 50, }; - wpsButton.Clicked += OnWpsClicked; - connectView.Add(passwordField); - connectView.Add(wpsButton); + wpsItem.Icon.HeightSpecification = 20; + wpsItem.Clicked += OnWpsClicked; + wpsItem.Label.HorizontalAlignment = HorizontalAlignment.Begin; + return wpsItem; + } + + internal void CreateComponents(AP ap) + { + mAp = ap; + + var connectView = new RecyclerViewItem() + { + Layout = new LinearLayout() + { + LinearOrientation = LinearLayout.Orientation.Vertical, + }, + WidthSpecification = LayoutParamPolicies.MatchParent, + HeightSpecification = LayoutParamPolicies.WrapContent, + }; + + connectView.Add(CreatePasswordField()); + connectView.Add(CreateWpsItem()); var cancelButton = new Button() { @@ -82,7 +111,7 @@ namespace SettingWiFi { Title = mAp.Essid, Content = connectView, - Actions = new View[] { cancelButton, connectButton, wpsButton }, + Actions = new View[] { cancelButton, connectButton}, }; }