[NUI] match DevelNUI

Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>

diff --git a/src/Tizen.NUI.Components/Controls/Navigation/Page.cs b/src/Tizen.NUI.Components/Controls/Navigation/Page.cs
index 9be8a77..5601fad 100755 (executable)
--- a/src/Tizen.NUI.Components/Controls/Navigation/Page.cs
+++ b/src/Tizen.NUI.Components/Controls/Navigation/Page.cs
@@ -16,7 +16,6 @@
  */
 using System;
 using System.ComponentModel;
-using Tizen.NUI.BaseComponents;
 
 namespace Tizen.NUI.Components
 {
@@ -40,166 +39,37 @@ namespace Tizen.NUI.Components
     /// The Page class is a class which is an element of navigation.
     /// </summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public class Page : Control
+    public abstract class Page : Control
     {
-        private AppBar appBar = null;
-        private View content = null;
+        private Navigator navigator = null;
 
         /// <summary>
         /// Creates a new instance of a Page.
         /// </summary>
-        /// <param name="content">The content to set to Content of Page.</param>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public Page(View content = null) : this(null, content)
+        public Page() : base()
         {
         }
 
         /// <summary>
-        /// Creates a new instance of a Page.
-        /// </summary>
-        /// <param name="appBar">The content to set to AppBar of Page.</param>
-        /// <param name="content">The content to set to Content of Page.</param>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public Page(AppBar appBar, View content = null) : base()
-        {
-            //AppBar and Content are located vertically.
-            var linearLayout = new LinearLayout();
-            linearLayout.LinearOrientation = LinearLayout.Orientation.Vertical;
-            Layout = linearLayout;
-
-            //Page fills to parent by default.
-            WidthResizePolicy = ResizePolicyType.FillToParent;
-            HeightResizePolicy = ResizePolicyType.FillToParent;
-
-            if (appBar)
-            {
-                AppBar = appBar;
-            }
-
-            if (content)
-            {
-                Content = content;
-            }
-        }
-
-        /// <summary>
-        /// Dispose Page and all children on it.
-        /// </summary>
-        /// <param name="type">Dispose type.</param>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        protected override void Dispose(DisposeTypes type)
-        {
-            if (disposed)
-            {
-                return;
-            }
-
-            if (type == DisposeTypes.Explicit)
-            {
-                if (appBar != null)
-                {
-                    Utility.Dispose(appBar);
-                }
-
-                if (content != null)
-                {
-                    Utility.Dispose(content);
-                }
-            }
-
-            base.Dispose(type);
-        }
-
-        /// <summary>
-        /// AppBar of Page. AppBar is added to Children automatically.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public AppBar AppBar
-        {
-            get
-            {
-                return appBar;
-            }
-            set
-            {
-                if (appBar == value)
-                {
-                    return;
-                }
-
-                if (appBar != null)
-                {
-                    Remove(appBar);
-                }
-
-                appBar = value;
-                if (appBar == null)
-                {
-                    return;
-                }
-
-                appBar.Weight = 0.0f;
-
-                ResetContent();
-            }
-        }
-
-        /// <summary>
-        /// Content of Page. Content is added to Children automatically.
+        /// Navigator which has pushed the Page into its stack.
+        /// If this Page has not been pushed into any Navigator, then Navigator is null.
         /// </summary>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public View Content
+        public Navigator Navigator
         {
             get
             {
-                return content;
+                return navigator;
             }
-            set
+            internal set
             {
-                if (content == value)
-                {
-                    return;
-                }
-
-                if (content != null)
-                {
-                    Remove(content);
-                }
-
-                content = value;
-                if (content == null)
+                if (navigator == value)
                 {
                     return;
                 }
 
-                content.Weight = 1.0f;
-
-                ResetContent();
-            }
-        }
-
-        private void ResetContent()
-        {
-            //To keep the order of AppBar and Content, the existing contents are
-            //removed and added again.
-            if ((appBar != null) && Children.Contains(appBar))
-            {
-                Remove(appBar);
-            }
-
-            if ((content != null) && Children.Contains(content))
-            {
-                Remove(content);
-            }
-
-            if (appBar != null)
-            {
-                Add(appBar);
-            }
-
-            if (content != null)
-            {
-                Add(content);
+                navigator = value;
             }
         }