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 <akash1.kumar@samsung.com>

diff --git a/SettingWiFi/SettingWiFi.sln b/SettingWiFi/SettingWiFi.sln
index d29387f02f04b5d3895dd6b26801ddf440ed3ac5..a567506ca04730b4b24b75708bdac7290479cb6d 100755 (executable)
--- a/SettingWiFi/SettingWiFi.sln
+++ b/SettingWiFi/SettingWiFi.sln
@@ -1,13 +1,9 @@
-Microsoft Visual Studio Solution File, Format Version 12.00\r
-# Visual Studio Version 16\r
-VisualStudioVersion = 16.0.31005.135\r
+\r
+Microsoft Visual Studio Solution File, Format Version 12.00\r
+# Visual Studio Version 17\r
+VisualStudioVersion = 17.12.35527.113 d17.12\r
 MinimumVisualStudioVersion = 10.0.40219.1\r
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingWiFi", "SettingWiFi\SettingWiFi.csproj", "{22bd5f0a-cfa4-45da-ba89-25b1a6a1375e}"\r
-EndProject\r
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{036ff97d-c360-495f-acf0-98bfff29cfec}"\r
-       ProjectSection(SolutionItems) = preProject\r
-               tizen_workspace.yaml = tizen_workspace.yaml\r
-       EndProjectSection\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingWiFi", "SettingWiFi\SettingWiFi.csproj", "{22BD5F0A-CFA4-45DA-BA89-25B1A6A1375E}"\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
@@ -15,11 +11,10 @@ Global
                Release|Any CPU = Release|Any CPU\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {22bd5f0a-cfa4-45da-ba89-25b1a6a1375e}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {22bd5f0a-cfa4-45da-ba89-25b1a6a1375e}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {22bd5f0a-cfa4-45da-ba89-25b1a6a1375e}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {22bd5f0a-cfa4-45da-ba89-25b1a6a1375e}.Release|Any CPU.Build.0 = Release|Any CPU\r
-\r
+               {22BD5F0A-CFA4-45DA-BA89-25B1A6A1375E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {22BD5F0A-CFA4-45DA-BA89-25B1A6A1375E}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {22BD5F0A-CFA4-45DA-BA89-25B1A6A1375E}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {22BD5F0A-CFA4-45DA-BA89-25B1A6A1375E}.Release|Any CPU.Build.0 = Release|Any CPU\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/SettingWiFi/SettingWiFi/tizen-manifest.xml b/SettingWiFi/SettingWiFi/tizen-manifest.xml
index aeac274a0a1b1bc90976080578765fb7282a33ac..5e9c0cfdd429f2d2d7232dd028a4ab6190bd4cd7 100755 (executable)
--- a/SettingWiFi/SettingWiFi/tizen-manifest.xml
+++ b/SettingWiFi/SettingWiFi/tizen-manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="6.5"
-  package="org.tizen.cssetting-wifi" version="1.1.7"
+  package="org.tizen.cssetting-wifi" version="1.1.8"
   res-type="org.tizen.appfw.gadget.setting-wifi" res-version="1.5.0">
        <allowed-package id="org.tizen.*">
                <required-privileges>

diff --git a/SettingWiFi/SettingWiFi/view/MainPage.cs b/SettingWiFi/SettingWiFi/view/MainPage.cs
index 00eea0c2d875190a10c08c9ade2573375bf63f89..8f093e370704c0f9e45e1bced415bc3613c8fcad 100755 (executable)
--- 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 (executable)
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 (file)
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 (file)
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 3fd9af9dd417d89c219b01d80c191db4365685dd..37bb6fff5963d2b02d83ae871105cb51a889018c 100644 (file)
--- 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