Adapt popups to popup stack

diff --git a/Oobe/OobeWifi/Controls/Wifi/AddNewNetworkPupup.cs b/Oobe/OobeWifi/Controls/Wifi/AddNewNetworkPupup.cs
index cc09175..7e88136 100644 (file)
--- a/Oobe/OobeWifi/Controls/Wifi/AddNewNetworkPupup.cs
+++ b/Oobe/OobeWifi/Controls/Wifi/AddNewNetworkPupup.cs
@@ -198,7 +198,7 @@ namespace Oobe.Wifi.Controls.Wifi
                     {
                         Tizen.Log.Error("oobe", "Failed to cast connection task");
                         await orginal_task;
-                        OobeCommon.Utils.Popup.Dismiss();
+                        OnDismiss?.Invoke();
                         continue;
                     }
                     try

diff --git a/Oobe/OobeWifi/Controls/Wifi/WifiView.cs b/Oobe/OobeWifi/Controls/Wifi/WifiView.cs
index fbde20b..d486947 100644 (file)
--- a/Oobe/OobeWifi/Controls/Wifi/WifiView.cs
+++ b/Oobe/OobeWifi/Controls/Wifi/WifiView.cs
@@ -66,7 +66,7 @@ namespace Oobe.Wifi.Controls.Wifi
                 Size = new Size(42, 42),
             };
 
-            addNewButton.ClickEvent += (s, e) => ShowAddNetworkPopup();
+            addNewButton.ClickEvent += (s, e) => ShowAddNetworkPopup(); 
             manualWifi.Add(addNewButton);
 
             manualWifi.Add(new TextLabel()
@@ -81,7 +81,7 @@ namespace Oobe.Wifi.Controls.Wifi
             return manualWifi;
         }
         
-        private static async void ShowAddNetworkPopup()
+        private static void ShowAddNetworkPopup()
         {
             var view = new AddNewNetworkPupup();
             var popup = new Common.Utils.Popup(view);
@@ -89,7 +89,7 @@ namespace Oobe.Wifi.Controls.Wifi
             popup.Show();
         }
 
-        private static async void ShowPasswordPopup(Tizen.Network.WiFi.WiFiAP wifiAp)
+        private static void ShowPasswordPopup(Tizen.Network.WiFi.WiFiAP wifiAp)
         {
             var view = new WifiPasswordPopup(wifiAp);
             var popup = new Common.Utils.Popup(view);