[NUI] Modify seamless bug & update sample (#2102)
authorhuiyueun <35286162+huiyueun@users.noreply.github.com>
Tue, 20 Oct 2020 06:10:49 +0000 (15:10 +0900)
committerGitHub <noreply@github.com>
Tue, 20 Oct 2020 06:10:49 +0000 (15:10 +0900)
- Set the default X value to be set even if it is not SlideIn.
- Set the parameter 'toProvider' value of 'SendLaunchRequest' to true.
  For FrameBroker, this value must be set to true.
- Update sample code : Add Event callback
- Need to check
 * This sample is currently not working normally in wearable.
 * Backward animation is not performed.

Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
src/Tizen.NUI/src/internal/FrameBroker/DefaultFrameBroker.cs
src/Tizen.NUI/src/public/TransitionAnimations/TransitionAnimations.cs
src/Tizen.NUI/src/public/TransitionOptions/TransitionOptions.cs
test/Tizen.NUI.Seamless/NUISimpleCallee/NUISimpleCallee.cs
test/Tizen.NUI.Seamless/NUISimpleCaller/NUISimpleCaller.cs

index ff76b85..3d65302 100755 (executable)
@@ -64,11 +64,7 @@ namespace Tizen.NUI
                 providerImage.Size = window.Size;
                 window.Add(providerImage);
 
-                if (animation is SlideIn)
-                {
-                    SlideIn slideIn = animation as SlideIn;
-                    providerImage.PositionX = slideIn.GetDefaultInitValue();
-                }
+                providerImage.PositionX = animation.GetDefaultInitValue();
 
                 animation.PlayAnimateTo(providerImage);
             }
index 678391b..7e9769c 100755 (executable)
@@ -20,6 +20,11 @@ namespace Tizen.NUI
         {
 
         }
+
+        internal virtual int GetDefaultInitValue()
+        {
+            return 0;
+        }
     }
 
     /// <summary>
@@ -50,7 +55,7 @@ namespace Tizen.NUI
             defaultInitValue = -Window.Instance.GetWindowSize().Width;
         }
 
-        internal int GetDefaultInitValue()
+        internal override int GetDefaultInitValue()
         {
             return defaultInitValue;
         }
@@ -86,7 +91,7 @@ namespace Tizen.NUI
             defaultInitValue = 0;
         }
 
-        internal int GetDefaultInitValue()
+        internal override int GetDefaultInitValue()
         {
             return defaultInitValue;
         }
index ee5786f..fb3f1ba 100755 (executable)
@@ -203,7 +203,7 @@ namespace Tizen.NUI
 
         internal void SendLaunchRequest(AppControl appControl)
         {
-            this.frameBroker.SendLaunchRequest(appControl, false);
+            this.frameBroker.SendLaunchRequest(appControl, true);
         }
     }
 }
index 4be6b64..81249a7 100755 (executable)
@@ -16,24 +16,39 @@ namespace NUISimpleCallee
         {
             Window.Instance.KeyEvent += OnKeyEvent;
             Window.Instance.TouchEvent += OnTouchEvent;
+            Window.Instance.BackgroundColor = Color.Yellow;
 
             TextLabel text = new TextLabel("Callee");
             text.HorizontalAlignment = HorizontalAlignment.Center;
             text.VerticalAlignment = VerticalAlignment.Center;
             text.TextColor = Color.Red;
-            text.PointSize = 12.0f;
+            text.PointSize = 25.0f;
             text.HeightResizePolicy = ResizePolicyType.FillToParent;
             text.WidthResizePolicy = ResizePolicyType.FillToParent;
             Window.Instance.GetDefaultLayer().Add(text);
 
             TransitionOptions = new TransitionOptions(GetDefaultWindow());
             TransitionOptions.EnableTransition = true;
+
+            TransitionOptions.CallerScreenShown += TransitionOptions_CallerScreenShown;
+            TransitionOptions.CallerScreenHidden += TransitionOptions_CallerScreenHidden;
+        }
+
+        private void TransitionOptions_CallerScreenShown(object sender, EventArgs e)
+        {
+            Tizen.Log.Error("MYLOG", "Shown");
+        }
+
+        private void TransitionOptions_CallerScreenHidden(object sender, EventArgs e)
+        {
+            Tizen.Log.Error("MYLOG", "Hidden");
         }
 
         private void OnTouchEvent(object sender, Window.TouchEventArgs e)
         {
             if (e.Touch.GetState(0) == PointStateType.Up)
             {
+                //Window.Instance.Hide();
                 Exit();
             }
         }
index da227da..b218af6 100755 (executable)
@@ -22,7 +22,7 @@ namespace NUISimpleCaller
             text.HorizontalAlignment = HorizontalAlignment.Center;
             text.VerticalAlignment = VerticalAlignment.Center;
             text.TextColor = Color.Blue;
-            text.PointSize = 12.0f;
+            text.PointSize = 25.0f;
             text.HeightResizePolicy = ResizePolicyType.FillToParent;
             text.WidthResizePolicy = ResizePolicyType.FillToParent;
             Window.Instance.GetDefaultLayer().Add(text);
@@ -30,21 +30,21 @@ namespace NUISimpleCaller
 
             TransitionOptions = new TransitionOptions(GetDefaultWindow());
             TransitionOptions.EnableTransition = true;
-            TransitionOptions.ForwardAnimation = new SlideIn(300);
-            TransitionOptions.BackwardAnimation = new SlideOut(300);
+            TransitionOptions.ForwardAnimation = new SlideIn(1300);
+            TransitionOptions.BackwardAnimation = new SlideOut(1300);
 
-            ////TransitionOptions.AnimationStart += TransitionOptions_AnimationStart;
-            ////TransitionOptions.AnimationFinished += TransitionOptions_AnimationFinished;
+            TransitionOptions.AnimationInitialized += TransitionOptions_AnimationInitialized;
+            TransitionOptions.AnimationFinished += TransitionOptions_AnimationFinished;
         }
 
-        private void TransitionOptions_AnimationFinished()
+        private void TransitionOptions_AnimationInitialized(object sender, EventArgs e)
         {
-            Tizen.Log.Error("MYLOG", "Finish Animation");
+            Tizen.Log.Error("MYLOG", "Animation Initialized");
         }
 
-        private void TransitionOptions_AnimationStart()
+        private void TransitionOptions_AnimationFinished(object sender, EventArgs e)
         {
-            Tizen.Log.Error("MYLOG", "Start Animation");
+            Tizen.Log.Error("MYLOG", "Animation Finished");
         }
 
         private void OnTouchEvent(object sender, Window.TouchEventArgs e)