From ebdc56cc92ec169647ff81ed76f897cf77e7c8aa Mon Sep 17 00:00:00 2001 From: Akash Date: Wed, 9 Nov 2022 18:13:34 +0530 Subject: [PATCH] Add options in MoreButton. Change-Id: I1a391e9e825eacf4a94d1de30304eb76b853dd23 Signed-off-by: Akash --- SettingWiFi/SettingWiFi/view/MainPage.cs | 47 ++++++++++++++++++++---- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/SettingWiFi/SettingWiFi/view/MainPage.cs b/SettingWiFi/SettingWiFi/view/MainPage.cs index 1074ba2..423e500 100644 --- a/SettingWiFi/SettingWiFi/view/MainPage.cs +++ b/SettingWiFi/SettingWiFi/view/MainPage.cs @@ -10,6 +10,13 @@ using System; namespace SettingWiFi { + public enum MoreMenu + { + HiddenPage, + AdvancedPage, + WiFiDirectPage, + } + internal class MainPage : ContentPage { CollectionView mScanList; @@ -21,7 +28,7 @@ namespace SettingWiFi APSource mApSource; private static readonly string mImagePath = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "/images/"; - private static readonly int itemCount = 1; + private static readonly int itemCount = 3; private MenuItem[] menuItems = new MenuItem[itemCount]; internal MainPage(WiFi wifi) @@ -61,13 +68,7 @@ namespace SettingWiFi moreButton.Icon.ResourceUrl = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "/images/menu.png"; - MenuItem[] menuItems = new MenuItem[itemCount]; - menuItems[0] = new MenuItem() { Text = Resources.IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK }; - menuItems[0].SelectedChanged += (object sender, SelectedChangedEventArgs args) => - { - Navigator.Push(CreateHiddenConnectPage()); - var menuItem = sender as MenuItem; - }; + CreateMoreMenuItems(); moreButton.Clicked += (object sender, ClickedEventArgs args) => { @@ -151,6 +152,36 @@ namespace SettingWiFi Content = mainView; } + private void CreateMoreMenuItems() + { + menuItems[0] = CreateMenuButton(Resources.IDS_WIFI_BUTTON_FIND_HIDDEN_NETWORK, MoreMenu.HiddenPage); + menuItems[1] = CreateMenuButton(Resources.IDS_ST_BODY_ADVANCED, MoreMenu.AdvancedPage); + menuItems[2] = CreateMenuButton(Resources.IDS_WIFI_BODY_WI_FI_DIRECT_ABB, MoreMenu.WiFiDirectPage); + } + + private MenuItem CreateMenuButton(string buttonName, MoreMenu pageId) + { + MenuItem menuItem = new MenuItem() { Text = buttonName }; + menuItem.Clicked += (object sender, ClickedEventArgs args) => + { + switch (pageId) + { + case MoreMenu.HiddenPage: + Navigator.Push(CreateHiddenConnectPage()); + break; + case MoreMenu.AdvancedPage: + // Advanced page need to be added instead of HiddenConnect page + Navigator.Push(CreateHiddenConnectPage()); + break; + case MoreMenu.WiFiDirectPage: + // WiFiDirect page need to be added instead of HiddenConnect page + Navigator.Push(CreateHiddenConnectPage()); + break; + } + }; + return menuItem; + } + private void OnWiFiStateChanged(object sender, WiFiStateChangedEventArgs e) { mApSource.UpdateApState(e.Bssid, e.State); -- 2.34.1