[NUI] Make build correctly
authorJaehyun Cho <jae_hyun.cho@samsung.com>
Wed, 14 Apr 2021 07:57:41 +0000 (16:57 +0900)
committerbshsqa <32317749+bshsqa@users.noreply.github.com>
Wed, 14 Apr 2021 11:53:58 +0000 (20:53 +0900)
src/Tizen.NUI.Components/Controls/Navigation/Navigator.cs
test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/PageTransitionSample.cs

index 97a4bb1..11b723b 100755 (executable)
@@ -18,6 +18,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using Tizen.NUI.BaseComponents;
 
 namespace Tizen.NUI.Components
 {
@@ -540,9 +541,9 @@ namespace Tizen.NUI.Components
             newTopPage.SetVisible(true);
 
             List<View> taggedViewsInNewTopPage = new List<View>();
-            RetrieveTaggedViews(taggedViewsInNewTopPage, newTopPage.Content);
+            RetrieveTaggedViews(taggedViewsInNewTopPage, newTopPage);
             List<View> taggedViewsInCurrentTopPage = new List<View>();
-            RetrieveTaggedViews(taggedViewsInCurrentTopPage, currentTopPage.Content);
+            RetrieveTaggedViews(taggedViewsInCurrentTopPage, currentTopPage);
 
             List<KeyValuePair<View, View>> sameTaggedViewPair = new List<KeyValuePair<View, View>>();
             foreach(View currentTopPageView in taggedViewsInCurrentTopPage)
index 726abfe..3375fc7 100755 (executable)
@@ -15,8 +15,8 @@ namespace Tizen.NUI.Samples
         private readonly string totalGreyTag = "totalGrey";
 
         private Navigator navigator;
-        private Page mainPage;
-        private Page redPage, greenPage, bluePage, totalPage;
+        private ContentPage mainPage;
+        private ContentPage redPage, greenPage, bluePage, totalPage;
 
         private readonly Vector4 ColorGrey = new Vector4(0.82f, 0.80f, 0.78f, 1.0f);
         private readonly Vector4 ColorBackground = new Vector4(0.99f, 0.94f, 0.83f, 1.0f);
@@ -82,7 +82,10 @@ namespace Tizen.NUI.Samples
             layoutView.Add(greenButton);
             layoutView.Add(blueButton);
 
-            mainPage = new Page(mainRoot);
+            mainPage = new ContentPage()
+            {
+                Content = mainRoot,
+            };
             navigator.Push(mainPage);
 
             View totalGreyView = new View()
@@ -174,7 +177,10 @@ namespace Tizen.NUI.Samples
                 return true;
             };
 
-            totalPage = new Page(totalPageRoot);
+            totalPage = new ContentPage()
+            {
+                Content = totalPageRoot,
+            };
         }
 
         private View CreateButton(Color color, string colorTag, string greyTag, Page secondPage)
@@ -298,7 +304,10 @@ namespace Tizen.NUI.Samples
             };
             pageRoot.Add(pageBackground);
 
-            Page page = new Page(pageRoot);
+            Page page = new ContentPage()
+            {
+                Content = pageRoot,
+            };
             return page;
         }