From: cheoleun moon Date: Thu, 13 Oct 2022 10:13:52 +0000 (+0900) Subject: Add basic InfoInputPage X-Git-Tag: accepted/tizen/unified/20221216.024031~15^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F37%2F282937%2F1;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-wifi.git Add basic InfoInputPage Change-Id: I82fc66f25aae4f3f09276ef918492c6578e1e84e --- diff --git a/.gitignore b/.gitignore index 7df1af8..2d8168b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ +.vs/ .vscode/* SettingWiFi/SettingView/bin/ SettingWiFi/SettingView/obj/ SettingWiFi/SettingWiFi/bin/ SettingWiFi/SettingWiFi/obj/ +tags +msbuild.log diff --git a/SettingWiFi/SettingWiFi/view/ApInfoSource.cs b/SettingWiFi/SettingWiFi/view/ApInfoSource.cs index 94dc7a5..ed88f78 100644 --- a/SettingWiFi/SettingWiFi/view/ApInfoSource.cs +++ b/SettingWiFi/SettingWiFi/view/ApInfoSource.cs @@ -44,7 +44,6 @@ namespace SettingWiFi private void OnPropertyChanged(string propertyName) { - Debug("OnPropertyChanged " + propertyName); PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); } diff --git a/SettingWiFi/SettingWiFi/view/InfoInputPage.cs b/SettingWiFi/SettingWiFi/view/InfoInputPage.cs new file mode 100644 index 0000000..2856136 --- /dev/null +++ b/SettingWiFi/SettingWiFi/view/InfoInputPage.cs @@ -0,0 +1,68 @@ +using System; +using SettingWiFi.res.locale; +using Tizen.NUI; +using Tizen.NUI.BaseComponents; +using Tizen.NUI.Components; +using static SettingWiFi.Logger; + + +namespace SettingWiFi +{ + internal class InfoInputPage : DialogPage + { + internal InfoInputPage() + { + Debug("InfoInputPage"); + } + + internal void CreateComponents(string title, string value) + { + var infoView = new RecyclerViewItem() + { + Layout = new LinearLayout() + { + LinearOrientation = LinearLayout.Orientation.Vertical, + }, + WidthSpecification = LayoutParamPolicies.MatchParent, + HeightSpecification = LayoutParamPolicies.WrapContent, + }; + + var valueField = new TextField() + { + WidthSpecification = 600, + PlaceholderText = value, + }; + infoView.Add(valueField); + + var cancelButton = new Button() + { + Text = Resources.IDS_WIFI_SK_CANCEL, + }; + cancelButton.Clicked += OnCancelClicked; + var okButton = new Button() + { + Text = "OK", + }; + okButton.Clicked += OnOkClicked; + + Content = new AlertDialog() + { + Title = title, + Content = infoView, + Actions = new View[] { cancelButton, okButton}, + }; + } + + private void OnOkClicked(object sender, ClickedEventArgs e) + { + Debug("OnOkClicked"); + Navigator.Pop(); + } + + private void OnCancelClicked(object sender, ClickedEventArgs e) + { + Debug("OnCancelClicked"); + Navigator.Pop(); + } + } +} \ No newline at end of file diff --git a/SettingWiFi/SettingWiFi/view/InfoPage.cs b/SettingWiFi/SettingWiFi/view/InfoPage.cs index 7f3905a..49d6e49 100644 --- a/SettingWiFi/SettingWiFi/view/InfoPage.cs +++ b/SettingWiFi/SettingWiFi/view/InfoPage.cs @@ -14,7 +14,6 @@ namespace SettingWiFi internal class InfoPage : ContentPage { private AP mAp; - private APSource mApSource; private WiFi mWifi; ApInfoSource mApInfoSource; @@ -62,8 +61,9 @@ namespace SettingWiFi ScrollingDirection = ScrollableBase.Direction.Vertical, WidthSpecification = LayoutParamPolicies.MatchParent, HeightSpecification = LayoutParamPolicies.MatchParent, - SelectionMode = ItemSelectionMode.None, + SelectionMode = ItemSelectionMode.Single, }; + apInfoListView.SelectionChanged += OnInfoListViewSelected; var header = GetHeader(); @@ -84,6 +84,25 @@ namespace SettingWiFi Content = infoView; } + private void OnInfoListViewSelected(object sender, SelectionChangedEventArgs e) + { + foreach (object item in e.CurrentSelection) + { + if (item is ApInfoText info) + { + Navigator.Push(CreateInfoInputPage(info.InfoTitle, info.InfoValue)); + break; + } + } + } + + private Page CreateInfoInputPage(string title, string value) + { + var page = new InfoInputPage(); + page.CreateComponents(title, value); + return page; + } + private DataTemplate CreateItemTemplate() { return new DataTemplate(() => diff --git a/SettingWiFi/SettingWiFi/view/MainPage.cs b/SettingWiFi/SettingWiFi/view/MainPage.cs index e4891c4..b9c3968 100644 --- a/SettingWiFi/SettingWiFi/view/MainPage.cs +++ b/SettingWiFi/SettingWiFi/view/MainPage.cs @@ -314,19 +314,6 @@ namespace SettingWiFi public async void OnScanListSelected(object sender, SelectionChangedEventArgs ev) { - //SingleSelection Only have 1 or nil object in the list. - /* - foreach (object item in ev.PreviousSelection) - { - if (item == null) break; - if (item is AP ap) - { - Debug("Disconnect " + ap.Essid); - await mWifi.Disconnect(ap.Essid); - //mApSource.UpdateState(ap); - } - } - */ foreach (object item in ev.CurrentSelection) { if (item == null) break;