From: Jiyun Yang <ji.yang@samsung.com>
Date: Mon, 16 Mar 2020 10:19:55 +0000 (+0900)
Subject: [NUI] Remove Window.Instance from the sample code (#1468)
X-Git-Tag: accepted/tizen/unified/20210219.040944~827
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=899cc959ea212bad2b9a40082f2a032f603b218c;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

[NUI] Remove Window.Instance from the sample code (#1468)

Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
---

diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/AnimatedImageViewTest.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/AnimatedImageViewTest.cs
index 911af22..b35b7ef 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/AnimatedImageViewTest.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/AnimatedImageViewTest.cs
@@ -138,12 +138,12 @@ namespace Tizen.NUI.Samples
             resPath = Tizen.Applications.Application.Current.DirectoryInfo.Resource;
             root = new View();
             root.BackgroundColor = Color.Green;
-            root.Size2D = new Size2D(Window.Instance.Size.Width, Window.Instance.Size.Height);
+            root.Size2D = new Size2D(NUIApplication.GetDefaultWindow().Size.Width, NUIApplication.GetDefaultWindow().Size.Height);
             var layer = new LinearLayout();
             layer.LinearAlignment = LinearLayout.Alignment.CenterHorizontal;
             layer.LinearOrientation = LinearLayout.Orientation.Vertical;
             root.Layout = layer;
-            Window.Instance.GetDefaultLayer().Add(root);
+            NUIApplication.GetDefaultWindow().GetDefaultLayer().Add(root);
 
             box = new Box(new Size2D(root.Size2D.Width, GetRatio(40, root.Size2D.Height)), "AGIF Test", resPath + "images/AGIF/dali-logo-anim.gif");
             root.Add(box);
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/AnimatedVectorImageViewTest.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/AnimatedVectorImageViewTest.cs
index 1a8d30d..a0d7807 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/AnimatedVectorImageViewTest.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/AnimatedVectorImageViewTest.cs
@@ -11,7 +11,7 @@ namespace Tizen.NUI.Samples
         public void Activate()
         {
             Tizen.Log.Fatal("NUITEST", $"###Activate()");
-            win = Window.Instance;
+            win = NUIApplication.GetDefaultWindow();
             win.BackgroundColor = Color.Green;
             win.KeyEvent += Win_KeyEvent;
 
@@ -21,7 +21,7 @@ namespace Tizen.NUI.Samples
             avi.BackgroundColor = Color.White;
             avi.Position2D = new Position2D(50, 10);
             avi.Size2D = new Size2D(500, 500);
-            Window.Instance.GetDefaultLayer().Add(avi);
+            win.GetDefaultLayer().Add(avi);
             avi.Play();
 
             avi2 = new AnimatedVectorImageView();
@@ -31,7 +31,7 @@ namespace Tizen.NUI.Samples
             avi2.Position2D = new Position2D(600, 10);
             avi2.Size2D = new Size2D(500, 500);
             avi2.SetMinMaxFrameByMarker("first");
-            Window.Instance.GetDefaultLayer().Add(avi2);
+            win.GetDefaultLayer().Add(avi2);
             avi2.Play();
 
             avi3 = new AnimatedVectorImageView();
@@ -41,7 +41,7 @@ namespace Tizen.NUI.Samples
             avi3.Position2D = new Position2D(1150, 10);
             avi3.Size2D = new Size2D(500, 500);
             avi3.SetMinMaxFrameByMarker("second", "third");
-            Window.Instance.GetDefaultLayer().Add(avi3);
+            win.GetDefaultLayer().Add(avi3);
             avi3.Play();
 
             avi4 = new AnimatedVectorImageView();
@@ -51,7 +51,7 @@ namespace Tizen.NUI.Samples
             avi4.Position2D = new Position2D(50, 550);
             avi4.Size2D = new Size2D(500, 500);
             avi4.SetMinMaxFrameByMarker("second");
-            Window.Instance.GetDefaultLayer().Add(avi4);
+            win.GetDefaultLayer().Add(avi4);
             avi4.Play();
 
             avi5 = new AnimatedVectorImageView();
@@ -61,7 +61,7 @@ namespace Tizen.NUI.Samples
             avi5.Position2D = new Position2D(600, 550);
             avi5.Size2D = new Size2D(500, 500);
             avi5.SetMinMaxFrameByMarker("third");
-            Window.Instance.GetDefaultLayer().Add(avi5);
+            win.GetDefaultLayer().Add(avi5);
             avi5.Play();
 
             avi6 = new AnimatedVectorImageView();
@@ -71,7 +71,7 @@ namespace Tizen.NUI.Samples
             avi6.Position2D = new Position2D(1150, 550);
             avi6.Size2D = new Size2D(500, 500);
             avi6.SetMinMaxFrameByMarker("third", "first");
-            Window.Instance.GetDefaultLayer().Add(avi6);
+            win.GetDefaultLayer().Add(avi6);
             avi6.Play();
 
         }
@@ -79,12 +79,12 @@ namespace Tizen.NUI.Samples
         {
             win.KeyEvent -= Win_KeyEvent;
 
-            Window.Instance.GetDefaultLayer().Remove(avi);
-            Window.Instance.GetDefaultLayer().Remove(avi2);
-            Window.Instance.GetDefaultLayer().Remove(avi3);
-            Window.Instance.GetDefaultLayer().Remove(avi4);
-            Window.Instance.GetDefaultLayer().Remove(avi5);
-            Window.Instance.GetDefaultLayer().Remove(avi6);
+            win.GetDefaultLayer().Remove(avi);
+            win.GetDefaultLayer().Remove(avi2);
+            win.GetDefaultLayer().Remove(avi3);
+            win.GetDefaultLayer().Remove(avi4);
+            win.GetDefaultLayer().Remove(avi5);
+            win.GetDefaultLayer().Remove(avi6);
         }
 
         private void Win_KeyEvent(object sender, Window.KeyEventArgs e)
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ButtonSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ButtonSample.cs
index 1d2608e..23713af 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ButtonSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ButtonSample.cs
@@ -27,7 +27,7 @@ namespace Tizen.NUI.Samples
 
         public void Activate()
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
 
             //ImageView imageView1 = new ImageView();
             //imageView1.Size2D = new Size2D(48, 48);
@@ -404,7 +404,7 @@ namespace Tizen.NUI.Samples
         {
             if (root != null)
             {
-                Window.Instance.Remove(root);
+                NUIApplication.GetDefaultWindow().Remove(root);
                 root.Dispose();
             }
         }
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/CheckBoxSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/CheckBoxSample.cs
index 32306b2..ab766d4 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/CheckBoxSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/CheckBoxSample.cs
@@ -33,7 +33,7 @@ namespace Tizen.NUI.Samples
         };
         public void Activate()
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
             root = new View()
             {
                 Size2D = new Size2D(1920, 1080),
@@ -417,7 +417,7 @@ namespace Tizen.NUI.Samples
                 createText[1].Dispose();
                 createText[1] = null;
 
-                Window.Instance.Remove(root);
+                window.Remove(root);
                 root.Dispose();
             }
         }
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ContactCard/ContactCard.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ContactCard/ContactCard.cs
index c65b26e..35c39fb 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ContactCard/ContactCard.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ContactCard/ContactCard.cs
@@ -56,7 +56,7 @@ namespace Tizen.NUI.Samples
             mClippedImagePropertyIndex = -1;
             mFolded = true;
 
-            //Window.Instance.KeyEvent += OnKeyEvent;
+            //NUIApplication.GetDefaultWindow().KeyEvent += OnKeyEvent;
 
             // Create a View which will be used for the background and to clip the contents
             mContactCard = new View();
@@ -69,7 +69,7 @@ namespace Tizen.NUI.Samples
             mContactCard.Size2D = new Size2D((int)mContactCardLayoutInfo.foldedSize.Width, (int)mContactCardLayoutInfo.foldedSize.Height);
             mContactCard.KeyEvent += OnKeyEvent;
 
-            Window.Instance.GetDefaultLayer().Add(mContactCard);
+            NUIApplication.GetDefaultWindow().GetDefaultLayer().Add(mContactCard);
             rootView.Add(mContactCard);
 
             // Create the header which will be shown only when the contact is unfolded
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ContactCard/ContactCardLayouter.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ContactCard/ContactCardLayouter.cs
index 464eb3e..0de4306 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ContactCard/ContactCardLayouter.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ContactCard/ContactCardLayouter.cs
@@ -52,12 +52,12 @@ namespace Tizen.NUI.Samples
 
             rootView = new View()
             {
-                Size2D = new Size2D(Window.Instance.WindowSize.Width, Window.Instance.WindowSize.Height),
+                Size2D = new Size2D(NUIApplication.GetDefaultWindow().WindowSize.Width, NUIApplication.GetDefaultWindow().WindowSize.Height),
                 BackgroundColor = ROOTVIEW_COLOR,
                 PositionUsesPivotPoint = false,
             };
 
-            Window.Instance.Add(rootView);
+            NUIApplication.GetDefaultWindow().Add(rootView);
 
         }
 
@@ -67,7 +67,7 @@ namespace Tizen.NUI.Samples
             {
                 // Set up the common layouting info shared between all contact cards when first called
                 mContactCardLayoutInfo.unfoldedPosition = mContactCardLayoutInfo.padding = new Vector2(DEFAULT_PADDING, DEFAULT_PADDING);
-                Vector2 windowSize = new Vector2(Window.Instance.Size.Width, Window.Instance.Size.Height);
+                Vector2 windowSize = new Vector2(NUIApplication.GetDefaultWindow().Size.Width, NUIApplication.GetDefaultWindow().Size.Height);
                 mContactCardLayoutInfo.unfoldedSize = windowSize - mContactCardLayoutInfo.padding * (MINIMUM_ITEMS_PER_ROW_OR_COLUMN - 1.0f);
 
                 // Calculate the size of the folded card (use the minimum of width/height as size)
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ContactCard/ContactCardsSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ContactCard/ContactCardsSample.cs
index b59acd8..872c35d 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ContactCard/ContactCardsSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ContactCard/ContactCardsSample.cs
@@ -19,8 +19,8 @@ namespace Tizen.NUI.Samples
 
         public void Activate()
         {
-            Window.Instance.BackgroundColor = WINDOW_COLOR;
-            //Window.Instance.KeyEvent += OnKeyEvent;
+            NUIApplication.GetDefaultWindow().BackgroundColor = WINDOW_COLOR;
+            //NUIApplication.GetDefaultWindow().KeyEvent += OnKeyEvent;
 
             mContactCardLayouter = new ContactCardLayouter();
 
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ControlSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ControlSample.cs
index 76c96c7..66cfca0 100644
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ControlSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ControlSample.cs
@@ -11,7 +11,7 @@ namespace Tizen.NUI.Samples
 
         public void Activate()
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
 
             root = new View()
             {
@@ -45,7 +45,7 @@ namespace Tizen.NUI.Samples
         {
             if (root != null)
             {
-                Window.Instance.Remove(root);
+                NUIApplication.GetDefaultWindow().Remove(root);
                 root.Dispose();
             }
         }
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/CubeTransitionEffectSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/CubeTransitionEffectSample.cs
index dab7bf4..e0a9458 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/CubeTransitionEffectSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/CubeTransitionEffectSample.cs
@@ -99,13 +99,13 @@ namespace Tizen.NUI.Samples
             // tool bar
             tool_bar = new View();
             tool_bar.BackgroundColor = Color.White;
-            tool_bar.Size2D = new Size2D(Window.Instance.WindowSize.Width, 100);
+            tool_bar.Size2D = new Size2D(NUIApplication.GetDefaultWindow().WindowSize.Width, 100);
             tool_bar.PositionUsesPivotPoint = true;
             tool_bar.ParentOrigin = ParentOrigin.TopLeft;
             tool_bar.PivotPoint = PivotPoint.TopLeft;
 
-            Window.Instance.GetDefaultLayer().Add(tool_bar);
-            Window.Instance.GetDefaultLayer().RaiseToTop();
+            NUIApplication.GetDefaultWindow().GetDefaultLayer().Add(tool_bar);
+            NUIApplication.GetDefaultWindow().GetDefaultLayer().RaiseToTop();
 
             // title of tool bar
             mTitle = new TextLabel();
@@ -162,7 +162,7 @@ namespace Tizen.NUI.Samples
             // content layer is 3D.
             content_layer = new Layer();
             content_layer.Behavior = Layer.LayerBehavior.Layer3D;
-            Window.Instance.AddLayer(content_layer);
+            NUIApplication.GetDefaultWindow().AddLayer(content_layer);
 
             //use small cubes
             mCubeWaveEffect = new CubeTransitionWaveEffect(NUM_ROWS_WAVE, NUM_COLUMNS_WAVE);
@@ -171,7 +171,7 @@ namespace Tizen.NUI.Samples
             mCubeWaveEffect.TransitionCompleted += OnCubeEffectCompleted;
 
             mCubeWaveEffect.Position2D = new Position2D(0, tool_bar.Size2D.Height);
-            mCubeWaveEffect.Size2D = new Size2D(Window.Instance.WindowSize.Width, Window.Instance.WindowSize.Height - tool_bar.Size2D.Height);
+            mCubeWaveEffect.Size2D = new Size2D(NUIApplication.GetDefaultWindow().WindowSize.Width, NUIApplication.GetDefaultWindow().WindowSize.Height - tool_bar.Size2D.Height);
             mCubeWaveEffect.PivotPoint = PivotPoint.TopLeft;
             mCubeWaveEffect.ParentOrigin = ParentOrigin.TopLeft;
             mCubeWaveEffect.SetCurrentTexture(mCurrentTexture);
@@ -183,7 +183,7 @@ namespace Tizen.NUI.Samples
             mCubeCrossEffect.TransitionCompleted += OnCubeEffectCompleted;
 
             mCubeCrossEffect.Position2D = new Position2D(0, tool_bar.Size2D.Height);
-            mCubeCrossEffect.Size2D = new Size2D(Window.Instance.WindowSize.Width, Window.Instance.WindowSize.Height - tool_bar.Size2D.Height);
+            mCubeCrossEffect.Size2D = new Size2D(NUIApplication.GetDefaultWindow().WindowSize.Width, NUIApplication.GetDefaultWindow().WindowSize.Height - tool_bar.Size2D.Height);
             mCubeCrossEffect.PivotPoint = PivotPoint.TopLeft;
             mCubeCrossEffect.ParentOrigin = ParentOrigin.TopLeft;
             mCubeCrossEffect.SetCurrentTexture(mCurrentTexture);
@@ -193,7 +193,7 @@ namespace Tizen.NUI.Samples
             mCubeFoldEffect.TransitionCompleted += OnCubeEffectCompleted;
 
             mCubeFoldEffect.Position2D = new Position2D(0, tool_bar.Size2D.Height);
-            mCubeFoldEffect.Size2D = new Size2D(Window.Instance.WindowSize.Width, Window.Instance.WindowSize.Height - tool_bar.Size2D.Height);
+            mCubeFoldEffect.Size2D = new Size2D(NUIApplication.GetDefaultWindow().WindowSize.Width, NUIApplication.GetDefaultWindow().WindowSize.Height - tool_bar.Size2D.Height);
             mCubeFoldEffect.PivotPoint = PivotPoint.TopLeft;
             mCubeFoldEffect.ParentOrigin = ParentOrigin.TopLeft;
             mCubeFoldEffect.SetCurrentTexture(mCurrentTexture);
@@ -205,7 +205,7 @@ namespace Tizen.NUI.Samples
             mCurrentEffect = mCubeWaveEffect;
 
             mContent = new View();
-            mContent.Size2D = new Size2D(Window.Instance.WindowSize.Width, Window.Instance.WindowSize.Height - tool_bar.Size2D.Height);
+            mContent.Size2D = new Size2D(NUIApplication.GetDefaultWindow().WindowSize.Width, NUIApplication.GetDefaultWindow().WindowSize.Height - tool_bar.Size2D.Height);
             mContent.ParentOrigin = ParentOrigin.TopLeft;
             mContent.PositionUsesPivotPoint = true;
             mContent.PivotPoint = PivotPoint.TopLeft;
@@ -246,7 +246,7 @@ namespace Tizen.NUI.Samples
 
             if (tool_bar)
             {
-                Window.Instance.GetDefaultLayer().Remove(tool_bar);
+                NUIApplication.GetDefaultWindow().GetDefaultLayer().Remove(tool_bar);
                 tool_bar.Dispose();
                 tool_bar = null;
             }
@@ -304,7 +304,7 @@ namespace Tizen.NUI.Samples
 
             if (content_layer)
             {
-                Window.Instance.RemoveLayer(content_layer);
+                NUIApplication.GetDefaultWindow().RemoveLayer(content_layer);
                 content_layer.Dispose();
                 content_layer = null;
             }
@@ -369,7 +369,7 @@ namespace Tizen.NUI.Samples
 
         private Texture LoadStageFillingTexture(string filepath)
         {
-            Size2D dimensions = new Size2D(Window.Instance.WindowSize.Width, Window.Instance.WindowSize.Height);
+            Size2D dimensions = new Size2D(NUIApplication.GetDefaultWindow().WindowSize.Width, NUIApplication.GetDefaultWindow().WindowSize.Height);
             PixelBuffer pb = ImageLoading.LoadImageFromFile(filepath, dimensions, FittingModeType.ScaleToFill);
             PixelData pd = PixelBuffer.Convert(pb);
 
@@ -422,7 +422,7 @@ namespace Tizen.NUI.Samples
                 selected_bg_map.Add(ImageVisualProperty.URL, new PropertyValue(SLIDE_SHOW_STOP_ICON_SELECTED));
                 mSlideshowButton.SelectedBackgroundVisual = selected_bg_map;
 
-                mPanPosition = new Vector2(Window.Instance.WindowSize.Width, Window.Instance.WindowSize.Width * 0.5f);
+                mPanPosition = new Vector2(NUIApplication.GetDefaultWindow().WindowSize.Width, NUIApplication.GetDefaultWindow().WindowSize.Width * 0.5f);
                 mPanDisplacement = new Vector2(-10.0f, 0.0f);
 
                 mViewTimer.Start();
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/DaliDemo/DaliDemo.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/DaliDemo/DaliDemo.cs
index 891d4eb..72f26fc 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/DaliDemo/DaliDemo.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/DaliDemo/DaliDemo.cs
@@ -25,7 +25,7 @@ namespace Tizen.NUI.Samples
 
         private void DeleteDaliDemo()
         {
-            Window.Instance.Remove(demo.mRootActor);
+            NUIApplication.GetDefaultWindow().Remove(demo.mRootActor);
             demo.mRootActor.Dispose();
             demo = null;
 
@@ -59,7 +59,7 @@ namespace Tizen.NUI.Samples
 
             demo.Initialize();
 
-            Window.Instance.GetDefaultLayer().Add(demo.mRootActor);
+            NUIApplication.GetDefaultWindow().GetDefaultLayer().Add(demo.mRootActor);
         }
 
         private void RunSample(string name)
@@ -94,8 +94,8 @@ namespace Tizen.NUI.Samples
             base.OnCreate();
             CreateDaliDemo();
 
-            Window.Instance.KeyEvent += Instance_KeyEvent;
-            Window.Instance.BackgroundColor = Color.White;
+            NUIApplication.GetDefaultWindow().KeyEvent += Instance_KeyEvent;
+            NUIApplication.GetDefaultWindow().BackgroundColor = Color.White;
         }
 
         private void Instance_KeyEvent(object sender, Window.KeyEventArgs e)
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/DaliDemo/DaliTableView.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/DaliDemo/DaliTableView.cs
index 74b696c..6bbdd14 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/DaliDemo/DaliTableView.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/DaliDemo/DaliTableView.cs
@@ -118,9 +118,9 @@ namespace Tizen.NUI.Samples
 
         public void Initialize()
         {
-            Window.Instance.KeyEvent += OnKeyEvent;
+            NUIApplication.GetDefaultWindow().KeyEvent += OnKeyEvent;
 
-            Size2D stageSize = Window.Instance.WindowSize;
+            Size2D stageSize = NUIApplication.GetDefaultWindow().WindowSize;
 
             // Background
             mRootActor = CreateBackground("LauncherBackground");
@@ -285,7 +285,7 @@ namespace Tizen.NUI.Samples
                     mVersionPopup.PivotPoint = PivotPoint.Center;
                     mVersionPopup.ParentOrigin = ParentOrigin.Center;
 
-                    Window.Instance.Add(mVersionPopup);
+                    NUIApplication.GetDefaultWindow().Add(mVersionPopup);
                 }
 
                 mVersionPopup.SetDisplayState(Popup.DisplayStateType.Shown);
@@ -305,7 +305,7 @@ namespace Tizen.NUI.Samples
         private View CreateBackground(string stylename)
         {
             View background = new View();
-            Window.Instance.Add(background);
+            NUIApplication.GetDefaultWindow().Add(background);
             background.SetStyleName(stylename);
             background.Name = "BACKGROUND";
             background.PositionUsesPivotPoint = true;
@@ -432,7 +432,7 @@ namespace Tizen.NUI.Samples
 
         private void Populate()
         {
-            Vector2 stageSize = Window.Instance.WindowSize;
+            Vector2 stageSize = NUIApplication.GetDefaultWindow().WindowSize;
 
             mTotalPages = (uint)((mExampleList.Count() + EXAMPLES_PER_PAGE - 1) / EXAMPLES_PER_PAGE);
 
@@ -715,7 +715,7 @@ namespace Tizen.NUI.Samples
 
         private void SetupInnerPageCubeEffect()
         {
-            Vector2 stageSize = Window.Instance.WindowSize;
+            Vector2 stageSize = NUIApplication.GetDefaultWindow().WindowSize;
 
             Path path = new Path();
             PropertyArray points = new PropertyArray();
@@ -751,7 +751,7 @@ namespace Tizen.NUI.Samples
         void Rotate(uint degrees)
         {
             // Resize the root actor
-            Vector2 stageSize = Window.Instance.WindowSize;
+            Vector2 stageSize = NUIApplication.GetDefaultWindow().WindowSize;
             Vector3 targetSize = new Vector3(stageSize.X, stageSize.Y, 1.0f);
 
             if (degrees == 90 || degrees == 270)
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/DropDownSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/DropDownSample.cs
index fead285..84bfa56 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/DropDownSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/DropDownSample.cs
@@ -31,7 +31,7 @@ namespace Tizen.NUI.Samples
         };
         public void Activate()
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
 
             root = new View()
             {
@@ -264,7 +264,7 @@ namespace Tizen.NUI.Samples
                     createText[1] = null;
                 }
 
-                Window.Instance.Remove(root);
+                NUIApplication.GetDefaultWindow().Remove(root);
                 root.Dispose();
                 root = null;
             }
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/FlexibleViewSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/FlexibleViewSample.cs
index b120888..a159724 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/FlexibleViewSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/FlexibleViewSample.cs
@@ -164,7 +164,7 @@ namespace Tizen.NUI.Samples
 
         public void Activate()
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
 
             flexibleView1 = new FlexibleView();
             flexibleView1.Name = "RecyclerView";
@@ -321,7 +321,7 @@ namespace Tizen.NUI.Samples
             flexibleView2.DetachScrollBar();
             scrollBar2.Dispose();
 
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
             window.Remove(flexibleView1);
             flexibleView1.Dispose();
             window.Remove(flexibleView2);
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ItemViewDemo/ItemViewSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ItemViewDemo/ItemViewSample.cs
index df3d620..4091762 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ItemViewDemo/ItemViewSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ItemViewDemo/ItemViewSample.cs
@@ -165,7 +165,7 @@ namespace Tizen.NUI.Samples
 
         public void Activate()
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
             window.GetDefaultLayer().Behavior = Layer.LayerBehavior.Layer3D;
             window.BackgroundColor = Color.Black;
             CreateContentView();
@@ -219,7 +219,7 @@ namespace Tizen.NUI.Samples
             {
                 case Gesture.StateType.Started:
                     {
-                        Size2D windowSize = Window.Instance.Size;
+                        Size2D windowSize = NUIApplication.GetDefaultWindow().Size;
                         ItemRange range = new ItemRange(0, 0);
                         mItemView.GetItemsRange(range);
 
@@ -244,23 +244,23 @@ namespace Tizen.NUI.Samples
 
         void SetLayout(int layoutId)
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
             switch (mCurrentLayout)
             {
                 case (int)AllImagesLayouts.SPIRAL_LAYOUT:
                 case (int)AllImagesLayouts.DEPTH_LAYOUT:
                     {
-                        Window.Instance.GetDefaultLayer().Behavior = Layer.LayerBehavior.Layer3D;
+                        window.GetDefaultLayer().Behavior = Layer.LayerBehavior.Layer3D;
                         break;
                     }
                 case (int)AllImagesLayouts.GRID_LAYOUT:
                     {
-                        Window.Instance.GetDefaultLayer().Behavior = Layer.LayerBehavior.LayerUI;
+                        window.GetDefaultLayer().Behavior = Layer.LayerBehavior.LayerUI;
                         break;
                     }
             }
 
-            Size2D windowSize = Window.Instance.Size;
+            Size2D windowSize = window.Size;
 
             if (layoutId == (int)AllImagesLayouts.DEPTH_LAYOUT)
             {
@@ -411,17 +411,17 @@ namespace Tizen.NUI.Samples
 
             if (mContentView != null)
             {
-                Window.Instance.Remove(mContentView);
+                NUIApplication.GetDefaultWindow().Remove(mContentView);
                 mContentView.Dispose();
             }
 
             if (mToolBarLayer != null)
             {
-                Window.Instance.RemoveLayer(mToolBarLayer);
+                NUIApplication.GetDefaultWindow().RemoveLayer(mToolBarLayer);
                 mToolBarLayer.Dispose();
             }
 
-            Window.Instance.GetDefaultLayer().Behavior = Layer.LayerBehavior.Layer2D;
+            NUIApplication.GetDefaultWindow().GetDefaultLayer().Behavior = Layer.LayerBehavior.Layer2D;
         }
 
         public void CreateContentView()
@@ -432,7 +432,7 @@ namespace Tizen.NUI.Samples
             mContentView.PositionUsesPivotPoint = true;
             mContentView.WidthResizePolicy = ResizePolicyType.FillToParent;
             mContentView.HeightResizePolicy = ResizePolicyType.FillToParent;
-            Window.Instance.Add(mContentView);
+            NUIApplication.GetDefaultWindow().Add(mContentView);
 
             mContentView.LowerToBottom();
         }
@@ -446,7 +446,7 @@ namespace Tizen.NUI.Samples
             mToolBarLayer.SetParentOrigin(ParentOrigin.TopCenter);
             mToolBarLayer.SetResizePolicy(ResizePolicyType.FillToParent, DimensionType.Width);
             mToolBarLayer.SetSize(0, 80);
-            Window.Instance.AddLayer(mToolBarLayer);
+            NUIApplication.GetDefaultWindow().AddLayer(mToolBarLayer);
 
             mToolBarLayer.RaiseToTop();
 
@@ -573,7 +573,7 @@ namespace Tizen.NUI.Samples
                 }
                 return true;
             };
-            Window.Instance.Add(mDeleteButton);
+            NUIApplication.GetDefaultWindow().Add(mDeleteButton);
         }
 
         private void CreateInsertButton()
@@ -612,7 +612,7 @@ namespace Tizen.NUI.Samples
                 }
                 return true;
             };
-            Window.Instance.Add(mInsertButton);
+            NUIApplication.GetDefaultWindow().Add(mInsertButton);
         }
 
         private void CreateReplaceButton()
@@ -652,7 +652,7 @@ namespace Tizen.NUI.Samples
                 }
                 return true;
             };
-            Window.Instance.Add(mReplaceButton);
+            NUIApplication.GetDefaultWindow().Add(mReplaceButton);
         }
 
         void SwitchToNextMode()
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/LoadingSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/LoadingSample.cs
index 1346a98..c924917 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/LoadingSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/LoadingSample.cs
@@ -13,7 +13,7 @@ namespace Tizen.NUI.Samples
 
         public void Activate()
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
 
             root = new View()
             {
@@ -203,7 +203,7 @@ namespace Tizen.NUI.Samples
             }
             if (root != null)
             {
-                Window.Instance.Remove(root);
+                NUIApplication.GetDefaultWindow().Remove(root);
                 root.Dispose();
                 root = null;
             }
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/LottieAnimationTest.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/LottieAnimationTest.cs
index 649c7f0..84bb81e 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/LottieAnimationTest.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/LottieAnimationTest.cs
@@ -11,12 +11,12 @@ namespace Tizen.NUI.Samples
             lav.URL = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "a.json";
             lav.LoopCount = -1;
             lav.BackgroundColor = Color.White;
-            Window.Instance.GetDefaultLayer().Add(lav);
+            NUIApplication.GetDefaultWindow().GetDefaultLayer().Add(lav);
             lav.Play();
         }
         public void Deactivate()
         {
-            Window.Instance.GetDefaultLayer().Remove(lav);
+            NUIApplication.GetDefaultWindow().GetDefaultLayer().Remove(lav);
         }
     }
 }
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/PaginationSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/PaginationSample.cs
index f694368..51fc921 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/PaginationSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/PaginationSample.cs
@@ -12,7 +12,7 @@ namespace Tizen.NUI.Samples
 
         public void Activate()
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
 
             ///////////////////////////////////////////////Create by Properties//////////////////////////////////////////////////////////
             pagination1 = new Pagination();
@@ -83,7 +83,7 @@ namespace Tizen.NUI.Samples
 
         public void Deactivate()
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
             window.KeyEvent -= Window_KeyEvent;
             window.Remove(pagination1);
             window.Remove(pagination2);
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/PopupSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/PopupSample.cs
index 56106cc..8366791 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/PopupSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/PopupSample.cs
@@ -34,7 +34,7 @@ namespace Tizen.NUI.Samples
         };
         public void Activate()
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
 
             root = new View()
             {
@@ -319,7 +319,7 @@ namespace Tizen.NUI.Samples
                     button = null;
                 }
 
-                Window.Instance.Remove(root);
+                NUIApplication.GetDefaultWindow().Remove(root);
                 root.Dispose();
             }
         }
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ProgressSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ProgressSample.cs
index ea69eca..079d7e8 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ProgressSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ProgressSample.cs
@@ -14,7 +14,7 @@ namespace Tizen.NUI.Samples
 
         public void Activate()
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
             root = new View()
             {
                 Size2D = new Size2D(1920, 1080),
@@ -219,7 +219,7 @@ namespace Tizen.NUI.Samples
         {
             if (root != null)
             {
-                Window.Instance.Remove(root);
+                NUIApplication.GetDefaultWindow().Remove(root);
                 root.Dispose();
             }
         }
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/RadioButtonSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/RadioButtonSample.cs
index f6c9d1e..74a325b 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/RadioButtonSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/RadioButtonSample.cs
@@ -33,7 +33,7 @@ namespace Tizen.NUI.Samples
         };
         public void Activate()
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
 
             root = new View()
             {
@@ -380,7 +380,7 @@ namespace Tizen.NUI.Samples
                 createText[1].Dispose();
                 createText[1] = null;
 
-                Window.Instance.Remove(root);
+                NUIApplication.GetDefaultWindow().Remove(root);
                 root.Dispose();
             }
         }
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ScrollBarSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ScrollBarSample.cs
index f2d12b5..429b4f4 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ScrollBarSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ScrollBarSample.cs
@@ -13,7 +13,7 @@ namespace Tizen.NUI.Samples
 
         public void Activate()
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
 
             root = new View()
             {
@@ -235,7 +235,7 @@ namespace Tizen.NUI.Samples
         {
             if (root != null)
             {
-                Window.Instance.Remove(root);
+                NUIApplication.GetDefaultWindow().Remove(root);
                 root.Dispose();
             }
         }
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/SliderSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/SliderSample.cs
index 059bb75..1f94510 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/SliderSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/SliderSample.cs
@@ -16,7 +16,7 @@ namespace Tizen.NUI.Samples
 
         public void Activate()
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
 
             root = new View()
             {
@@ -147,7 +147,7 @@ namespace Tizen.NUI.Samples
                     }
                 }
                    
-                Window.Instance.Remove(root);
+                NUIApplication.GetDefaultWindow().Remove(root);
                 root.Dispose();
                 root = null;
             }
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/SwitchSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/SwitchSample.cs
index 621c6f2..3374af9 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/SwitchSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/SwitchSample.cs
@@ -31,7 +31,7 @@ namespace Tizen.NUI.Samples
         };
         public void Activate()
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
 
             root = new View()
             {
@@ -366,7 +366,7 @@ namespace Tizen.NUI.Samples
                 createText[1].Dispose();
                 createText[1] = null;
 
-                Window.Instance.Remove(root);
+                NUIApplication.GetDefaultWindow().Remove(root);
                 root.Dispose();
             }
         }
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/TabSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/TabSample.cs
index 1e094f2..ee7b2fd 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/TabSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/TabSample.cs
@@ -33,7 +33,7 @@ namespace Tizen.NUI.Samples
         };
         public void Activate()
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
 
             root = new View()
             {
@@ -196,7 +196,7 @@ namespace Tizen.NUI.Samples
                     createText[1] = null;
                 }
 
-                Window.Instance.Remove(root);
+                NUIApplication.GetDefaultWindow().Remove(root);
                 root.Dispose();
                 root = null;
             }
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ToastSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ToastSample.cs
index 56ae435..17ea88b 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ToastSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/ToastSample.cs
@@ -13,7 +13,7 @@ namespace Tizen.NUI.Samples
 
         public void Activate()
         {
-            Window window = Window.Instance;
+            Window window = NUIApplication.GetDefaultWindow();
 
             root = new View()
             {
@@ -138,7 +138,7 @@ namespace Tizen.NUI.Samples
         {
             if (root != null)
             {
-                Window.Instance.Remove(root);
+                NUIApplication.GetDefaultWindow().Remove(root);
                 root.Dispose();
             }
         }
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/VideoViewTest.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/VideoViewTest.cs
index bdbe973..a42d5ff 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/VideoViewTest.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/VideoViewTest.cs
@@ -113,7 +113,7 @@ namespace Tizen.NUI.Samples
             videoView.PivotPoint = PivotPoint.Center;
             win.Add(videoView);
 
-            var playerHandle = new SafeNativePlayerHandler(videoView);
+            var playerHandle = new SafeNativePlayerHandle(videoView);
             player = new myPlayer(playerHandle.DangerousGetHandle());
             if (player != null)
             {
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Tizen.NUI.Samples.csproj b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Tizen.NUI.Samples.csproj
index 55110f7..2127c6f 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Tizen.NUI.Samples.csproj
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Tizen.NUI.Samples.csproj
@@ -25,8 +25,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tizen.NET" Version="8.0.0.15045" />
     <PackageReference Include="Tizen.NET.Sdk" Version="1.0.9" />
+    <ProjectReference Include="../../../src/Tizen/Tizen.csproj" />
+    <ProjectReference Include="../../../src/Tizen.Applications.Common/Tizen.Applications.Common.csproj" />
+    <ProjectReference Include="../../../src/Tizen.Applications.ComponentBased/Tizen.Applications.ComponentBased.csproj" />
+    <ProjectReference Include="../../../src/Tizen.Log/Tizen.Log.csproj" />
+    <ProjectReference Include="../../../src/Tizen.Multimedia.MediaPlayer/Tizen.Multimedia.MediaPlayer.csproj" />
+    <ProjectReference Include="../../../src/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj" />
+    <ProjectReference Include="../../../src/Tizen.NUI/Tizen.NUI.csproj" />
+    <ProjectReference Include="../../../src/Tizen.NUI.Components/Tizen.NUI.Components.csproj" />
   </ItemGroup>
 
 </Project>