From: Akash Kumar Date: Thu, 12 Dec 2024 06:53:16 +0000 (+0530) Subject: Add support to launch wifi-direct from more menu X-Git-Tag: accepted/tizen/unified/20250113.133505^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_unified;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-wifi.git Add support to launch wifi-direct from more menu https://jira.sec.samsung.net/browse/TNINE-3697 Related: The wifi-direct launch issue will be resolved after following settings changes are merged along with this patch's change https://review.tizen.org/gerrit/c/profile/iot/apps/dotnet/settings/+/316561 Change-Id: Ie3bb859c6b4a9bc1a7592d376ff77ea3aa314712 Signed-off-by: Akash Kumar --- diff --git a/SettingWiFi/SettingWiFi.sln b/SettingWiFi/SettingWiFi.sln index d29387f..a567506 100755 --- a/SettingWiFi/SettingWiFi.sln +++ b/SettingWiFi/SettingWiFi.sln @@ -1,13 +1,9 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31005.135 + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.12.35527.113 d17.12 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingWiFi", "SettingWiFi\SettingWiFi.csproj", "{22bd5f0a-cfa4-45da-ba89-25b1a6a1375e}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{036ff97d-c360-495f-acf0-98bfff29cfec}" - ProjectSection(SolutionItems) = preProject - tizen_workspace.yaml = tizen_workspace.yaml - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingWiFi", "SettingWiFi\SettingWiFi.csproj", "{22BD5F0A-CFA4-45DA-BA89-25B1A6A1375E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,11 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {22bd5f0a-cfa4-45da-ba89-25b1a6a1375e}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {22bd5f0a-cfa4-45da-ba89-25b1a6a1375e}.Debug|Any CPU.Build.0 = Debug|Any CPU - {22bd5f0a-cfa4-45da-ba89-25b1a6a1375e}.Release|Any CPU.ActiveCfg = Release|Any CPU - {22bd5f0a-cfa4-45da-ba89-25b1a6a1375e}.Release|Any CPU.Build.0 = Release|Any CPU - + {22BD5F0A-CFA4-45DA-BA89-25B1A6A1375E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {22BD5F0A-CFA4-45DA-BA89-25B1A6A1375E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {22BD5F0A-CFA4-45DA-BA89-25B1A6A1375E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {22BD5F0A-CFA4-45DA-BA89-25B1A6A1375E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SettingWiFi/SettingWiFi/tizen-manifest.xml b/SettingWiFi/SettingWiFi/tizen-manifest.xml index aeac274..5e9c0cf 100755 --- a/SettingWiFi/SettingWiFi/tizen-manifest.xml +++ b/SettingWiFi/SettingWiFi/tizen-manifest.xml @@ -1,6 +1,6 @@  diff --git a/SettingWiFi/SettingWiFi/view/MainPage.cs b/SettingWiFi/SettingWiFi/view/MainPage.cs index 00eea0c..8f093e3 100755 --- a/SettingWiFi/SettingWiFi/view/MainPage.cs +++ b/SettingWiFi/SettingWiFi/view/MainPage.cs @@ -98,7 +98,9 @@ namespace SettingWiFi mWifiDirectMenuItem = new MoreMenuItem { Text = ResourceManager.TextResourceManager.NUIGadgetResourceManager.GetString(nameof(Resources.IDS_WIFI_BODY_WI_FI_DIRECT_ABB)), - Action = () => { }, + Action = () => { + OnWiFiDirectClicked(); + }, }; mMenus.Add(mWifiDirectMenuItem); } @@ -391,11 +393,11 @@ namespace SettingWiFi return page; } - internal ContentPage CreateWiFiDirectPage() + internal void OnWiFiDirectClicked() { - var page = new WiFiDirectPage(mWifi); - page.CreateComponents(mApSource); - return page; + Debug("+"); + NavigateTo("WiFi-Direct"); + Debug("-"); } private ContentPage CreateEapPage(AP ap) diff --git a/SettingWiFi/SettingWiFi/view/WiFiDirectPage.cs b/SettingWiFi/SettingWiFi/view/WiFiDirectPage.cs deleted file mode 100755 index 54e4e0c..0000000 --- a/SettingWiFi/SettingWiFi/view/WiFiDirectPage.cs +++ /dev/null @@ -1,55 +0,0 @@ -using SettingWiFi.TextResources; -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 = ResourceManager.TextResourceManager.NUIGadgetResourceManager.GetString(nameof(Resources.IDS_WIFI_SK_CANCEL)), - WidthSpecification = 300, - HeightSpecification = 80, - }; - cancelButton.Clicked += (object source, ClickedEventArgs args) => - { - NUIApplication.GetDefaultWindow().GetDefaultNavigator().Pop(); - }; - - Content = new AlertDialog() - { - Title = ResourceManager.TextResourceManager.NUIGadgetResourceManager.GetString(nameof(Resources.IDS_WIFI_BODY_WI_FI_DIRECT_ABB)), - Content = findView, - Actions = new View[] { cancelButton, }, - }; - } - } -} diff --git a/packaging/org.tizen.cssetting-wifi-1.1.7.rpk b/packaging/org.tizen.cssetting-wifi-1.1.7.rpk deleted file mode 100644 index f27c920..0000000 Binary files a/packaging/org.tizen.cssetting-wifi-1.1.7.rpk and /dev/null differ diff --git a/packaging/org.tizen.cssetting-wifi-1.1.8.rpk b/packaging/org.tizen.cssetting-wifi-1.1.8.rpk new file mode 100644 index 0000000..09c32e1 Binary files /dev/null and b/packaging/org.tizen.cssetting-wifi-1.1.8.rpk differ diff --git a/packaging/org.tizen.setting-wifi.spec b/packaging/org.tizen.setting-wifi.spec index 3fd9af9..37bb6ff 100644 --- a/packaging/org.tizen.setting-wifi.spec +++ b/packaging/org.tizen.setting-wifi.spec @@ -1,6 +1,6 @@ Name: org.tizen.setting-wifi summary: NUI wifi setting application -Version: 1.1.7 +Version: 1.1.8 Release: 1 Provides: org.tizen.setting-wifi = %{version}-%{release} Group: Applications/Security