diff options
-rwxr-xr-x | SettingPrivacy/SettingPrivacy/WidgetSettingPrivacy.cs | 55 | ||||
-rwxr-xr-x | packaging/org.tizen.cssetting-privacy-1.0.0.tpk | bin | 53657 -> 53647 bytes |
2 files changed, 33 insertions, 22 deletions
diff --git a/SettingPrivacy/SettingPrivacy/WidgetSettingPrivacy.cs b/SettingPrivacy/SettingPrivacy/WidgetSettingPrivacy.cs index 8d6b63a..08bcb00 100755 --- a/SettingPrivacy/SettingPrivacy/WidgetSettingPrivacy.cs +++ b/SettingPrivacy/SettingPrivacy/WidgetSettingPrivacy.cs @@ -14,6 +14,7 @@ namespace SettingPrivacy { private Navigator _navigator; private static uint s_uid; + private bool _privacySelected; public WidgetSettingPrivacy() : base() { @@ -24,14 +25,8 @@ namespace SettingPrivacy { Tizen.Log.Debug(Program.LogTag, "onCreate"); - window.GetDefaultLayer().Add( - new View() - { - BackgroundColor = Color.White, - Size2D = window.Size, - PivotPoint = PivotPoint.Center, - }); - + _privacySelected = false; + window.BackgroundColor = Color.Transparent; _navigator = window.GetDefaultNavigator(); _navigator.Push(CreateFirstPage()); } @@ -39,15 +34,11 @@ namespace SettingPrivacy private ContentPage CreateFirstPage() { ScrollableBase content = CreateScrollableBase(); - foreach (PrivacyItemContent item in GetPrivacyItemContents()) { content.Add(CreatePrivacyLinearItem(item)); } - ContentPage firstPage = CreateContentPage(Resources.IDS_ST_HEADER_PRIVACY_SETTINGS_ABB, content); - firstPage.AppBar.AutoNavigationContent = false; - var navigationContent = new Button(((AppBarStyle)ThemeManager.GetStyle("Tizen.NUI.Components.AppBar")).BackButton); navigationContent.Clicked += (o, e) => { @@ -55,9 +46,14 @@ namespace SettingPrivacy bundle.AddItem("WIDGET_ACTION", "POP"); SetContentInfo(bundle.Encode()); }; - firstPage.AppBar.NavigationContent = navigationContent; + var appBar = new AppBar() + { + Title = Resources.IDS_ST_HEADER_PRIVACY_SETTINGS_ABB, + AutoNavigationContent = false, + NavigationContent = navigationContent, + }; - return firstPage; + return CreateContentPage(appBar, content); } private List<PrivacyItemContent> GetPrivacyItemContents() @@ -81,7 +77,11 @@ namespace SettingPrivacy item.Clicked += (o, e) => { Tizen.Log.Debug(Program.LogTag, "selected o: " + o.ToString() + ", content.Label: " + content.Label + ", content.Privacy: " + content.Privacy); - _navigator.Push(CreateSecondPage(content.Label, content.Privacy)); + if (!_privacySelected) + { + _privacySelected = true; + _navigator.Push(CreateSecondPage(content.Label, content.Privacy)); + } }; return item; @@ -130,7 +130,21 @@ namespace SettingPrivacy } } - return CreateContentPage(title, content); + var navigationContent = new Button(((AppBarStyle)ThemeManager.GetStyle("Tizen.NUI.Components.AppBar")).BackButton); + navigationContent.Clicked += (o, e) => + { + _privacySelected = false; + _navigator.Pop(); + }; + + var appBar = new AppBar() + { + Title = title, + AutoNavigationContent = false, + NavigationContent = navigationContent, + }; + + return CreateContentPage(appBar, content); } private static List<PrivacyPackageItemContent> GetPrivacyPackageItemContents(string privacy) @@ -175,15 +189,12 @@ namespace SettingPrivacy } - private ContentPage CreateContentPage(string title, ScrollableBase content) + private ContentPage CreateContentPage(AppBar appBar, ScrollableBase content) { - Tizen.Log.Debug(Program.LogTag, "CreateContentPage with title: " + title); + Tizen.Log.Debug(Program.LogTag, "CreateContentPage with title: " + appBar.Title); return new ContentPage() { - AppBar = new AppBar() - { - Title = title, - }, + AppBar = appBar, Content = content, }; } diff --git a/packaging/org.tizen.cssetting-privacy-1.0.0.tpk b/packaging/org.tizen.cssetting-privacy-1.0.0.tpk Binary files differindex d16758f..e621777 100755 --- a/packaging/org.tizen.cssetting-privacy-1.0.0.tpk +++ b/packaging/org.tizen.cssetting-privacy-1.0.0.tpk |