From: Akash Date: Wed, 9 Nov 2022 14:23:40 +0000 (+0530) Subject: Add support for 'POP' command. X-Git-Tag: accepted/tizen/unified/20221216.024031~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc02cfd5f4db18a4ee6adb87707b40e0705d9240;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-wifi.git Add support for 'POP' command. This patch will send "POP" command that asks for SettingView to close WidgetView. Change-Id: I1891e18372be94d663768c7a4be880c529a44d6a Signed-off-by: Akash --- diff --git a/SettingWiFi/SettingWiFi/view/MainPage.cs b/SettingWiFi/SettingWiFi/view/MainPage.cs index 423e500..cedcb62 100644 --- a/SettingWiFi/SettingWiFi/view/MainPage.cs +++ b/SettingWiFi/SettingWiFi/view/MainPage.cs @@ -82,22 +82,6 @@ namespace SettingWiFi menu.Post(); }; - var appBar = new AppBar() - { - Title = Resources.IDS_WIFI_BODY_WI_FI, - Actions = new View[] { moreButton, }, - }; - - AppBarStyle appBarStyle = (AppBarStyle)ThemeManager.GetStyle("Tizen.NUI.Components.AppBar"); - Button backButton = new Button(((AppBarStyle)appBarStyle).BackButton); - - backButton.Clicked += (object source, ClickedEventArgs args) => - { - Navigator.Pop(); - }; - - appBar.NavigationContent = backButton; - View mainView = new View() { Layout = new LinearLayout() @@ -148,7 +132,6 @@ namespace SettingWiFi mainView.Add(mScanList); mainView.Add(scanButton); - AppBar = appBar; Content = mainView; } diff --git a/SettingWiFi/SettingWiFi/view/WidgetSettingWiFi.cs b/SettingWiFi/SettingWiFi/view/WidgetSettingWiFi.cs index acc4a5f..787e458 100755 --- a/SettingWiFi/SettingWiFi/view/WidgetSettingWiFi.cs +++ b/SettingWiFi/SettingWiFi/view/WidgetSettingWiFi.cs @@ -7,7 +7,8 @@ using Tizen.NUI.Accessibility; using Tizen.NUI.BaseComponents; using Tizen.NUI.Binding; using Tizen.NUI.Components; - +using static SettingWiFi.Logger; +using SettingWiFi.res.locale; namespace SettingWiFi { @@ -30,9 +31,40 @@ namespace SettingWiFi { navigator = window.GetDefaultNavigator(); mWifi = new WiFi(); - + Bundle mBundle = Bundle.Decode(contentInfo); + window.BackgroundColor = Color.Transparent; mMainPage = CreateMainPage(); + AppBar appBar = CreateAppBar(Resources.IDS_WIFI_BODY_WI_FI); + mMainPage.AppBar = appBar; + navigator.Push(mMainPage); } + + protected virtual AppBar CreateAppBar(string title) + { + var appBar = new AppBar() + { + Title = title, + AutoNavigationContent = false, + }; + var appBarStyle = ThemeManager.GetStyle("Tizen.NUI.Components.AppBar"); + var navigationContent = new Button(((AppBarStyle)appBarStyle).BackButton); + navigationContent.Clicked += (o, e) => + { + RequestWidgetPop(); + }; + + appBar.NavigationContent = navigationContent; + return appBar; + } + + protected void RequestWidgetPop() + { + // Pop Widget Content by sending message + Bundle nextBundle = new Bundle(); + nextBundle.AddItem("WIDGET_ACTION", "POP"); + String encodedBundle = nextBundle.Encode(); + SetContentInfo(encodedBundle); + } } }