From 3cc69a4507dc62e8f65c71d33bf828b87fac9ec3 Mon Sep 17 00:00:00 2001 From: Krzysztof Wieclaw Date: Wed, 8 Apr 2020 14:48:23 +0200 Subject: [PATCH] Adapt popups to popup stack --- Oobe/OobeWifi/Controls/Wifi/AddNewNetworkPupup.cs | 2 +- Oobe/OobeWifi/Controls/Wifi/WifiView.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Oobe/OobeWifi/Controls/Wifi/AddNewNetworkPupup.cs b/Oobe/OobeWifi/Controls/Wifi/AddNewNetworkPupup.cs index cc09175..7e88136 100644 --- 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 --- 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); -- 2.7.4