From 69b6272e8b6d3148a55d3b6669c2fe23dad26a95 Mon Sep 17 00:00:00 2001 From: Akash Date: Thu, 10 Nov 2022 16:13:39 +0530 Subject: [PATCH] Fix MoreButton options. - Fixed not showing of MoreButton on Mainpage. - Added AdvancedPage.cs and WiFiDirectPage.cs files. Change-Id: I04a050fc4a8978e83bafabe63fdfa87cca2aca9e Signed-off-by: Akash --- SettingWiFi/SettingWiFi/view/AdvancedPage.cs | 54 +++++++++++++++++++ SettingWiFi/SettingWiFi/view/MainPage.cs | 42 ++++++++++++--- .../SettingWiFi/view/WiFiDirectPage.cs | 54 +++++++++++++++++++ .../SettingWiFi/view/WidgetSettingWiFi.cs | 4 +- 4 files changed, 147 insertions(+), 7 deletions(-) create mode 100644 SettingWiFi/SettingWiFi/view/AdvancedPage.cs create mode 100644 SettingWiFi/SettingWiFi/view/WiFiDirectPage.cs mode change 100755 => 100644 SettingWiFi/SettingWiFi/view/WidgetSettingWiFi.cs diff --git a/SettingWiFi/SettingWiFi/view/AdvancedPage.cs b/SettingWiFi/SettingWiFi/view/AdvancedPage.cs new file mode 100644 index 0000000..b5c7fbb --- /dev/null +++ b/SettingWiFi/SettingWiFi/view/AdvancedPage.cs @@ -0,0 +1,54 @@ +using System.Collections.Generic; +using Tizen.NUI; +using Tizen.NUI.BaseComponents; +using Tizen.NUI.Components; +using SettingWiFi.res.locale; +using static SettingWiFi.Logger; + +namespace SettingWiFi +{ + //This class still need to be completed + internal class AdvancedPage : ContentPage + { + private WiFi mWifi; + private APSource mApSource; + + internal AdvancedPage(WiFi wifi) + { + mWifi = wifi; + } + + internal void CreateComponents(APSource apSource) + { + mApSource = apSource; + + var findView = new View() + { + Layout = new LinearLayout() + { + LinearOrientation = LinearLayout.Orientation.Vertical, + }, + WidthSpecification = 200, + HeightSpecification = 100, + }; + + var cancelButton = new Button() + { + Text = Resources.IDS_WIFI_SK_CANCEL, + WidthSpecification = 300, + HeightSpecification = 80, + }; + cancelButton.Clicked += (object source, ClickedEventArgs args) => + { + Navigator.Pop(); + }; + + Content = new AlertDialog() + { + Title = Resources.IDS_ST_BODY_ADVANCED, + Content = findView, + Actions = new View[] { cancelButton, }, + }; + } + } +} diff --git a/SettingWiFi/SettingWiFi/view/MainPage.cs b/SettingWiFi/SettingWiFi/view/MainPage.cs index cedcb62..c4f6241 100644 --- a/SettingWiFi/SettingWiFi/view/MainPage.cs +++ b/SettingWiFi/SettingWiFi/view/MainPage.cs @@ -27,6 +27,8 @@ namespace SettingWiFi WiFi mWifi; APSource mApSource; + Button moreButton; + private static readonly string mImagePath = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "/images/"; private static readonly int itemCount = 3; private MenuItem[] menuItems = new MenuItem[itemCount]; @@ -36,6 +38,10 @@ namespace SettingWiFi mWifi = wifi; } + internal Button MoreButton() + { + return moreButton; + } internal Loading CreateLoadingIcon() { var path = Tizen.Applications.Application.Current.DirectoryInfo.Resource; @@ -64,7 +70,7 @@ namespace SettingWiFi { mApSource = new APSource(); - var moreButton = new Button(); + moreButton = new Button(); moreButton.Icon.ResourceUrl = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "/images/menu.png"; @@ -153,12 +159,10 @@ namespace SettingWiFi Navigator.Push(CreateHiddenConnectPage()); break; case MoreMenu.AdvancedPage: - // Advanced page need to be added instead of HiddenConnect page - Navigator.Push(CreateHiddenConnectPage()); + Navigator.Push(CreateAdvancedPage()); break; case MoreMenu.WiFiDirectPage: - // WiFiDirect page need to be added instead of HiddenConnect page - Navigator.Push(CreateHiddenConnectPage()); + Navigator.Push(CreateWiFiDirectPage()); break; } }; @@ -233,7 +237,9 @@ namespace SettingWiFi item.Icon = GetApIconImageView(); item.Extra = GetInfoButton(); - + item.IsSelectable = false; + //OnAppClicked not working as expected as of now. Need to popup contentpage when clicked + item.Clicked += OnAPClicked; return item; }); } @@ -291,6 +297,20 @@ namespace SettingWiFi return page; } + private ContentPage CreateAdvancedPage() + { + var page = new AdvancedPage(mWifi); + page.CreateComponents(mApSource); + return page; + } + + private ContentPage CreateWiFiDirectPage() + { + var page = new WiFiDirectPage(mWifi); + page.CreateComponents(mApSource); + return page; + } + private DialogPage CreateConnectPage(AP ap) { var page = new ConnectPage(mWifi); @@ -353,8 +373,18 @@ namespace SettingWiFi } } + private async void OnAPClicked(object sender, ClickedEventArgs ev) + { + Debug("OnAPClicked"); + + Button button = (Button)sender; + mConnectPage = CreateConnectPage(button.BindingContext as AP); + Navigator.Push(mConnectPage); + } + public async void OnScanListSelected(object sender, SelectionChangedEventArgs ev) { + Debug("OnScanListSelected"); foreach (object item in ev.CurrentSelection) { if (item == null) break; diff --git a/SettingWiFi/SettingWiFi/view/WiFiDirectPage.cs b/SettingWiFi/SettingWiFi/view/WiFiDirectPage.cs new file mode 100644 index 0000000..8ceca5c --- /dev/null +++ b/SettingWiFi/SettingWiFi/view/WiFiDirectPage.cs @@ -0,0 +1,54 @@ +using System.Collections.Generic; +using Tizen.NUI; +using Tizen.NUI.BaseComponents; +using Tizen.NUI.Components; +using SettingWiFi.res.locale; +using static SettingWiFi.Logger; + +namespace SettingWiFi +{ + // This class still need to be completed + internal class WiFiDirectPage : ContentPage + { + private WiFi mWifi; + private APSource mApSource; + + internal WiFiDirectPage(WiFi wifi) + { + mWifi = wifi; + } + + internal void CreateComponents(APSource apSource) + { + mApSource = apSource; + + var findView = new View() + { + Layout = new LinearLayout() + { + LinearOrientation = LinearLayout.Orientation.Vertical, + }, + WidthSpecification = 200, + HeightSpecification = 100, + }; + + var cancelButton = new Button() + { + Text = Resources.IDS_WIFI_SK_CANCEL, + WidthSpecification = 300, + HeightSpecification = 80, + }; + cancelButton.Clicked += (object source, ClickedEventArgs args) => + { + Navigator.Pop(); + }; + + Content = new AlertDialog() + { + Title = Resources.IDS_WIFI_BODY_WI_FI_DIRECT_ABB, + Content = findView, + Actions = new View[] { cancelButton, }, + }; + } + } +} diff --git a/SettingWiFi/SettingWiFi/view/WidgetSettingWiFi.cs b/SettingWiFi/SettingWiFi/view/WidgetSettingWiFi.cs old mode 100755 new mode 100644 index 787e458..e79d688 --- a/SettingWiFi/SettingWiFi/view/WidgetSettingWiFi.cs +++ b/SettingWiFi/SettingWiFi/view/WidgetSettingWiFi.cs @@ -20,10 +20,12 @@ namespace SettingWiFi WiFi mWifi; + Button moreButton; private ContentPage CreateMainPage() { var page = new MainPage(mWifi); page.CreateComponents(); + moreButton = page.MoreButton(); return page; } @@ -36,7 +38,7 @@ namespace SettingWiFi mMainPage = CreateMainPage(); AppBar appBar = CreateAppBar(Resources.IDS_WIFI_BODY_WI_FI); mMainPage.AppBar = appBar; - + appBar.Actions = new View[] { moreButton, }; navigator.Push(mMainPage); } -- 2.34.1