From e934e622a1509e649ed4a6fe840b89f74d26b990 Mon Sep 17 00:00:00 2001
From: Seungho Baek <sbsh.baek@samsung.com>
Date: Mon, 15 Nov 2021 14:29:19 +0900
Subject: [PATCH] [NUI] Fix method to gether Views for transition

Signed-off-by: Seungho Baek <sbsh.baek@samsung.com>
---
 .../Controls/Navigation/Navigator.cs                 | 20 ++++++++------------
 .../Samples/PageTransitionSample.cs                  |  9 +++------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/Tizen.NUI.Components/Controls/Navigation/Navigator.cs b/src/Tizen.NUI.Components/Controls/Navigation/Navigator.cs
index dcf0662..1be9928 100755
--- a/src/Tizen.NUI.Components/Controls/Navigation/Navigator.cs
+++ b/src/Tizen.NUI.Components/Controls/Navigation/Navigator.cs
@@ -755,26 +755,22 @@ namespace Tizen.NUI.Components
         /// </summary>
         /// <param name="taggedViews">Returned tagged view list..</param>
         /// <param name="view">Root View to get tagged child View.</param>
-        /// <param name="isPage">Flag to check current View is page or not</param>
-        private void RetrieveTaggedViews(List<View> taggedViews, View view, bool isPage)
+        /// <param name="isRoot">Flag to check current View is page or not</param>
+        private void RetrieveTaggedViews(List<View> taggedViews, View view, bool isRoot)
         {
-            if (!isPage)
+            if (!isRoot && view.TransitionOptions != null)
             {
                 if (!string.IsNullOrEmpty(view.TransitionOptions?.TransitionTag))
                 {
                     taggedViews.Add((view as View));
+                    if (view.TransitionOptions.TransitionWithChild)
+                    {
+                        return;
+                    }
                 }
 
-                if (view.ChildCount == 0)
-                {
-                    return;
-                }
-
-                if (view.TransitionOptions?.TransitionWithChild ?? false)
-                {
-                    return;
-                }
             }
+
             foreach (View child in view.Children)
             {
                 RetrieveTaggedViews(taggedViews, child, false);
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/PageTransitionSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/PageTransitionSample.cs
index 54582d4..5288315 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/PageTransitionSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/PageTransitionSample.cs
@@ -85,15 +85,12 @@ namespace Tizen.NUI.Samples
 
             TransitionGroup transitionGroup = new TransitionGroup()
             {
-                UseGroupTimePeriod = true,
                 UseGroupAlphaFunction = true,
-                StepTransition = true,
-                TimePeriod = new TimePeriod(500, 3000),
                 AlphaFunction = new AlphaFunction(AlphaFunction.BuiltinFunctions.EaseInOut),
             };
             SlideTransition slide = new SlideTransition()
             {
-                TimePeriod = new TimePeriod(1000),
+                TimePeriod = new TimePeriod(400),
                 AlphaFunction = new AlphaFunction(AlphaFunction.BuiltinFunctions.Default),
                 Direction = SlideTransitionDirection.Top
             };
@@ -101,14 +98,14 @@ namespace Tizen.NUI.Samples
             FadeTransition fade = new FadeTransition()
             {
                 Opacity = 0.3f,
-                TimePeriod = new TimePeriod(1000),
+                TimePeriod = new TimePeriod(400),
                 AlphaFunction = new AlphaFunction(AlphaFunction.BuiltinFunctions.Default)
             };
             transitionGroup.AddTransition(fade);
             ScaleTransition scale = new ScaleTransition()
             {
                 ScaleFactor = new Vector2(0.3f, 0.3f),
-                TimePeriod = new TimePeriod(1000),
+                TimePeriod = new TimePeriod(400),
                 AlphaFunction = new AlphaFunction(AlphaFunction.BuiltinFunctions.Default)
             };
             transitionGroup.AddTransition(scale);
-- 
2.7.4