[NUI] Add layout xaml sample and update samples (#1593)
authorXianbing Teng <xb.teng@samsung.com>
Tue, 12 May 2020 05:41:29 +0000 (13:41 +0800)
committerGitHub <noreply@github.com>
Tue, 12 May 2020 05:41:29 +0000 (14:41 +0900)
38 files changed:
test/NUITestSample/NUIXAMLTestSample/LayoutSample/LayoutPage.xaml.cs [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/LayoutSample/LayoutSample.cs [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/NUIXAMLTestSample.cs
test/NUITestSample/NUIXAMLTestSample/NUIXAMLTestSample.csproj
test/NUITestSample/NUIXAMLTestSample/TempTest/TempPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TempTest/TempTest.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientDuoPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMonoPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage2.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage3.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/BixbyFinancePage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/BixbyWidgetPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/SearchPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/TestAmbient.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/WeatherPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestDetailApps/AppDetailPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestDetailApps/TestDetailApps.cs
test/NUITestSample/NUIXAMLTestSample/TestMyContents/MediaHubPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestMyContents/TestMyContents.cs
test/NUITestSample/NUIXAMLTestSample/UTC/TestButton/ButtonTestPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/UTC/TestButton/TestButton.cs
test/NUITestSample/NUIXAMLTestSample/UTC/TestFlexContainer/FlexContainerPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/UTC/TestImageView/ImageTestPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/UTC/TestScrollBar/ScrollBarTestPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/UTC/TestSlider/SliderTestPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/UTC/TestTableView/TableTestPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/UTC/TestTextEditor/TextEditorTestPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/UTC/TestTextField/TextFieldTestPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/UTC/TestTextLabel/TextLabelTestPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/VideoViewTest/VideoViewPage.xaml.cs [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/VideoViewTest/VideoViewTest.cs [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AppDetailPage.xaml
test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/LayoutPage.xaml [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/MediaHubPage.xaml
test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/SearchPage.xaml
test/NUITestSample/NUIXAMLTestSample/res/layout/TempPage.xaml
test/NUITestSample/NUIXAMLTestSample/res/layout/VideoViewPage.xaml

diff --git a/test/NUITestSample/NUIXAMLTestSample/LayoutSample/LayoutPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/LayoutSample/LayoutPage.xaml.cs
new file mode 100755 (executable)
index 0000000..39ba12c
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using Tizen.NUI.BaseComponents;
+
+namespace Tizen.NUI.Examples
+{
+    public partial class LayoutPage : View
+    {
+        public LayoutPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/NUITestSample/NUIXAMLTestSample/LayoutSample/LayoutSample.cs b/test/NUITestSample/NUIXAMLTestSample/LayoutSample/LayoutSample.cs
new file mode 100755 (executable)
index 0000000..4d711ab
--- /dev/null
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tizen.NUI.Examples
+{
+    public class LayoutSample : NUIApplication
+    {
+        protected override void OnCreate()
+        {
+            base.OnCreate();
+            Window window = Window.Instance;
+            window.BackgroundColor = Color.Green;
+
+            LayoutPage myPage = new LayoutPage();
+            window.Add(myPage);
+            Console.WriteLine("==================  Set BindingContext in Application !!!! ==================");
+        }
+    }
+}
index 8aa94ca..5cd226f 100755 (executable)
@@ -1,4 +1,5 @@
 using System;
+using Tizen.NUI.Examples;
 
 namespace NUIXAMLTestSample
 {
@@ -10,7 +11,8 @@ namespace NUIXAMLTestSample
         [STAThread]
         static void Main(string[] args)
         {
-             new TempTest().Run(args);
+            //new TempTest().Run(args);
+            new LayoutSample().Run(args);
 
             /* For Sample codes */
             // new TestAmbient().Run(args);
index 68f5d9a..c911c47 100755 (executable)
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="lib\" />
-    <Folder Include="res\" />
-  </ItemGroup>
-
-  <ItemGroup>
+    <PackageReference Include="Tizen.NET" Version="8.0.0.15214" />
     <PackageReference Include="Tizen.NET.Sdk" Version="1.0.0" />
+    <PackageReference Include="Tizen.NUI.XamlBuild" Version="1.0.11" />
   </ItemGroup>
     <ItemGroup>
-    <EmbeddedResource Include="TempTest/TempPage.xaml" />
     <EmbeddedResource Include="TestAmbient/*.xaml" />
-    <EmbeddedResource Include="TestMyContents/MediaHubPage.xaml" />
-    <EmbeddedResource Include="TestDetailApps/AppDetailPage.xaml" />
-    <EmbeddedResource Include="UTC/TestButton/ButtonTestPage.xaml" />
-    <EmbeddedResource Include="UTC/TestFlexContainer/FlexContainerPage.xaml" />
-    <EmbeddedResource Include="UTC/TestImageView/ImageTestPage.xaml" />
-    <EmbeddedResource Include="UTC/TestScrollBar/ScrollBarTestPage.xaml" />
-    <EmbeddedResource Include="UTC/TestSlider/SliderTestPage.xaml" />
-    <EmbeddedResource Include="UTC/TestTableView/TableTestPage.xaml" />
-    <EmbeddedResource Include="UTC/TestTextEditor/TextEditorTestPage.xaml" />
-    <EmbeddedResource Include="UTC/TestTextField/TextFieldTestPage.xaml" />
-    <EmbeddedResource Include="UTC/TestTextLabel/TextLabelTestPage.xaml" />
+    <Compile Remove="lib\**" />
+    <EmbeddedResource Remove="lib\**" />
+    <None Remove="lib\**" />
   </ItemGroup>
+    <ItemGroup>
+      <None Remove="res\layout\1920x1080\AmbientDuoPage.xaml" />
+      <None Remove="res\layout\1920x1080\AmbientMonoPage.xaml" />
+      <None Remove="res\layout\1920x1080\AmbientMultiPage.xaml" />
+      <None Remove="res\layout\1920x1080\AmbientMultiPage2.xaml" />
+      <None Remove="res\layout\1920x1080\AmbientMultiPage3.xaml" />
+      <None Remove="res\layout\1920x1080\AppDetailPage.xaml" />
+      <None Remove="res\layout\1920x1080\BixbyFinancePage.xaml" />
+      <None Remove="res\layout\1920x1080\BixbyWidgetPage.xaml" />
+      <None Remove="res\layout\1920x1080\LayoutPage.xaml" />
+      <None Remove="res\layout\1920x1080\MediaHubPage.xaml" />
+      <None Remove="res\layout\1920x1080\SearchPage.xaml" />
+      <None Remove="res\layout\1920x1080\WeatherPage.xaml" />
+      <None Remove="res\layout\ButtonTestPage.xaml" />
+      <None Remove="res\layout\FlexContainerPage.xaml" />
+      <None Remove="res\layout\ImageTestPage.xaml" />
+      <None Remove="res\layout\ScrollBarTestPage.xaml" />
+      <None Remove="res\layout\SliderTestPage.xaml" />
+      <None Remove="res\layout\TableTestPage.xaml" />
+      <None Remove="res\layout\TempPage.xaml" />
+      <None Remove="res\layout\TextEditorTestPage.xaml" />
+      <None Remove="res\layout\TextFieldTestPage.xaml" />
+      <None Remove="res\layout\TextLabelTestPage.xaml" />
+      <None Remove="res\layout\VideoViewPage.xaml" />
+    </ItemGroup>
+    <ItemGroup>
+      <EmbeddedResource Include="res\layout\1920x1080\AmbientDuoPage.xaml" />
+      <EmbeddedResource Include="res\layout\1920x1080\AmbientMonoPage.xaml" />
+      <EmbeddedResource Include="res\layout\1920x1080\AmbientMultiPage.xaml" />
+      <EmbeddedResource Include="res\layout\1920x1080\AmbientMultiPage2.xaml" />
+      <EmbeddedResource Include="res\layout\1920x1080\AmbientMultiPage3.xaml" />
+      <EmbeddedResource Include="res\layout\1920x1080\AppDetailPage.xaml" />
+      <EmbeddedResource Include="res\layout\1920x1080\BixbyFinancePage.xaml" />
+      <EmbeddedResource Include="res\layout\1920x1080\BixbyWidgetPage.xaml" />
+      <EmbeddedResource Include="res\layout\1920x1080\LayoutPage.xaml" />
+      <EmbeddedResource Include="res\layout\1920x1080\MediaHubPage.xaml" />
+      <EmbeddedResource Include="res\layout\1920x1080\SearchPage.xaml" />
+      <EmbeddedResource Include="res\layout\1920x1080\WeatherPage.xaml" />
+      <EmbeddedResource Include="res\layout\ButtonTestPage.xaml" />
+      <EmbeddedResource Include="res\layout\FlexContainerPage.xaml" />
+      <EmbeddedResource Include="res\layout\ImageTestPage.xaml" />
+      <EmbeddedResource Include="res\layout\ScrollBarTestPage.xaml" />
+      <EmbeddedResource Include="res\layout\SliderTestPage.xaml" />
+      <EmbeddedResource Include="res\layout\TableTestPage.xaml" />
+      <EmbeddedResource Include="res\layout\TempPage.xaml" />
+      <EmbeddedResource Include="res\layout\TextEditorTestPage.xaml" />
+      <EmbeddedResource Include="res\layout\TextFieldTestPage.xaml" />
+      <EmbeddedResource Include="res\layout\TextLabelTestPage.xaml" />
+      <EmbeddedResource Include="res\layout\VideoViewPage.xaml" />
+    </ItemGroup>
 
 </Project>
 
index 074b6d9..a960a7c 100755 (executable)
  */
 using System;
 using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
 
 namespace Tizen.NUI.Examples
 {
-    public class TempPage : ContentPage
+    public partial class TempPage : ContentPage
     {
 
         public TempPage(Window win) : base (win)
         {
+            InitializeComponent();
         }
 
         /// <summary>
@@ -53,16 +53,6 @@ namespace Tizen.NUI.Examples
             // FocusManager.Instance.SetCurrentFocusView(button1);
         }
 
-        private bool OnClicked(object sender, EventArgs e)
-        {
-            if (sender is Button)
-            {
-                Button button = sender as Button;
-                button.LabelText = "Click Me";
-            }
-            return true;
-        }
-
         private void OnFocusGained(object obj, EventArgs e)
         {
             View view = obj as View;
index 2e20f58..48ee0af 100755 (executable)
@@ -1,12 +1,7 @@
 using System;
-using System.IO;
-using System.Reflection;
 
 using Tizen.NUI.Binding;
 using Tizen.NUI.Xaml;
-using Tizen.NUI;
-using Tizen.NUI.UIComponents;
-using Tizen.NUI.BaseComponents;
 using System.ComponentModel;
 
 namespace Tizen.NUI.Examples
index 6c246d2..43122e4 100755 (executable)
  *
  */
 using System;
-using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
 
 namespace Tizen.NUI.Examples
 {
-    public class AmbientDuoPage : ContentPage
+    public partial class AmbientDuoPage : ContentPage
     {
 
         public AmbientDuoPage(Window win) : base (win)
         {
+            InitializeComponent();
             Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/photoduo_img_bg_01_no9patch.png";
             ClearEvent += OnClearEvent;
             Root.Opacity = 0.0f;
index 7e51bf6..66128db 100755 (executable)
  */
 using System;
 using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
 
 namespace Tizen.NUI.Examples
 {
-    public class AmbientMonoPage : ContentPage
+    public partial class AmbientMonoPage : ContentPage
     {
         public AmbientMonoPage(Window win) : base (win)
         {
+            InitializeComponent();
         }
 
         /// <summary>
index 7812769..7959145 100755 (executable)
  *
  */
 using System;
-using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
 
 namespace Tizen.NUI.Examples
 {
-    public class AmbientMultiPage : ContentPage
+    public partial class AmbientMultiPage : ContentPage
     {
 
         public AmbientMultiPage(Window win) : base (win)
         {
+            InitializeComponent();
             Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/photoboard_img_bg_01.png";
             ClearEvent += OnClearEvent;
             Root.Opacity = 0.0f;
index dd79060..722cea6 100755 (executable)
  *
  */
 using System;
-using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
 
 namespace Tizen.NUI.Examples
 {
-    public class AmbientMultiPage2 : ContentPage
+    public partial class AmbientMultiPage2 : ContentPage
     {
 
         public AmbientMultiPage2(Window win) : base (win)
         {
+            InitializeComponent();
             Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/photoboard_img_bg_02.png";
             ClearEvent += OnClearEvent;
             Root.Opacity = 0.0f;
index ba9cbd6..929e70b 100755 (executable)
  *
  */
 using System;
-using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
 
 namespace Tizen.NUI.Examples
 {
-    public class AmbientMultiPage3 : ContentPage
+    public partial class AmbientMultiPage3 : ContentPage
     {
 
         public AmbientMultiPage3(Window win) : base (win)
         {
+            InitializeComponent();
             Root.Opacity = 0.0f;
         }
 
index 694d795..0695128 100755 (executable)
@@ -7,7 +7,7 @@ using Tizen.NUI.BaseComponents;
 
 namespace Tizen.NUI.Examples
 {
-    class BixbyFinancePage : ContentPage
+    partial class BixbyFinancePage : ContentPage
     {
         private Vector2 bezierPointIn1 = new Vector2(0.21f, 2);
         private Vector2 bezierPointIn2 = new Vector2(0.14f, 1);
@@ -15,11 +15,12 @@ namespace Tizen.NUI.Examples
         private Vector2 bezierPointOut2 = new Vector2(0.22f, 1);
         private Animation scaleInAni = null;
         private Animation scaleOutAni = null;
-        private Animation selectedAni = null;
         private ImageView buttonClose = null;
         private ImageView buttonSend = null;
+
         public BixbyFinancePage(Window win) : base(win)
         {
+            InitializeComponent();
         }
 
         /// <summary>
index 10ea7dc..0668756 100755 (executable)
@@ -7,11 +7,12 @@ using Tizen.NUI.BaseComponents;
 
 namespace Tizen.NUI.Examples
 {
-    class BixbyWidgetPage : ContentPage
+    partial class BixbyWidgetPage : ContentPage
     {
         private ImageView widget = null;
         public BixbyWidgetPage(Window win) : base(win)
         {
+            InitializeComponent();
         }
 
         /// <summary>
index effca33..13d74fe 100755 (executable)
  */
 using System;
 using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
 
 namespace Tizen.NUI.Examples
 {
-    public class SearchPage : ContentPage
+    public partial class SearchPage : ContentPage
     {
         private Vector2 bezierPointIn1 = new Vector2(0.21f, 2);
         private Vector2 bezierPointIn2 = new Vector2(0.14f, 1);
@@ -34,6 +33,7 @@ namespace Tizen.NUI.Examples
 
         public SearchPage(Window win) : base (win)
         {
+            InitializeComponent();
             Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/store_default_bg_01.png";
         }
 
@@ -83,7 +83,7 @@ namespace Tizen.NUI.Examples
             {
                 if (e.Direction == View.FocusDirection.Down)
                 {
-                    View view = e.CurrentView.Parent as View;
+                    View view = e.CurrentView.GetParent() as View;
                     if (view.Name == "UpperListTable")
                     {
                         e.ProposedView = midListTable.GetChildAt(new TableView.CellPosition(0, 0)); ;
@@ -95,7 +95,7 @@ namespace Tizen.NUI.Examples
                 }
                 else if (e.Direction == View.FocusDirection.Up)
                 {
-                    View view = e.CurrentView.Parent as View;
+                    View view = e.CurrentView.GetParent() as View;
                     if (view.Name == "BottomListTable")
                     {
                         e.ProposedView = midListTable.GetChildAt(new TableView.CellPosition(0, 0)); ;
index 9d7d214..70fd274 100755 (executable)
@@ -1,12 +1,5 @@
 using System;
-using System.IO;
-using System.Reflection;
-
-using Tizen.NUI.Binding;
 using Tizen.NUI.Xaml;
-using Tizen.NUI;
-using Tizen.NUI.UIComponents;
-using Tizen.NUI.BaseComponents;
 
 namespace Tizen.NUI.Examples
 {
index 6fca69b..6a452fb 100755 (executable)
  */
 using System;
 using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
 
 namespace Tizen.NUI.Examples
 {
-    public class WeatherPage : ContentPage
+    public partial class WeatherPage : ContentPage
     {
         private Vector2 bezierPointIn1 = new Vector2(0.21f, 2);
         private Vector2 bezierPointIn2 = new Vector2(0.14f, 1);
@@ -32,6 +31,7 @@ namespace Tizen.NUI.Examples
 
         public WeatherPage(Window win) : base (win)
         {
+            InitializeComponent();
             Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/weather/bg.bmp";
             // Root.BackgroundColor = Color.Green;
         }
index 2995a44..e159d84 100755 (executable)
  */
 using System;
 using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
+using Tizen.NUI.Components;
 
 namespace Tizen.NUI.Examples
 {
-    public class AppDetailPage : ContentPage
+    public partial class AppDetailPage : ContentPage
     {
         private Vector2 bezierPointIn1 = new Vector2(0.21f, 2);
         private Vector2 bezierPointIn2 = new Vector2(0.14f, 1);
@@ -34,6 +34,7 @@ namespace Tizen.NUI.Examples
 
         public AppDetailPage(Window win) : base (win)
         {
+            InitializeComponent();
             Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/store_default_bg_01.png";
         }
 
@@ -140,7 +141,7 @@ namespace Tizen.NUI.Examples
             if (sender is Button)
             {
                 Button button = sender as Button;
-                button.LabelText = "Open";
+                button.Text = "Open";
             }
             return true;
         }
index 5f9fe26..e823a21 100755 (executable)
@@ -1,12 +1,5 @@
 using System;
-using System.IO;
-using System.Reflection;
-
-using Tizen.NUI.Binding;
 using Tizen.NUI.Xaml;
-using Tizen.NUI;
-using Tizen.NUI.UIComponents;
-using Tizen.NUI.BaseComponents;
 
 namespace Tizen.NUI.Examples
 {
index 9de1c4c..e5685f9 100755 (executable)
 using System;
 using Tizen.NUI;
 using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
+using Tizen.NUI.Components;
 
 namespace Tizen.NUI.Examples
 {
-    public class MediaHubPage : ContentPage
+    public partial class MediaHubPage : ContentPage
     {
         private Vector2 bezierPointIn1 = new Vector2(0.21f, 2);
         private Vector2 bezierPointIn2 = new Vector2(0.14f, 1);
@@ -34,6 +34,7 @@ namespace Tizen.NUI.Examples
 
         public MediaHubPage(Window win) : base (win)
         {
+            InitializeComponent();
             Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_bg.png";
             ClearEvent += OnClearEvent;
         }
@@ -104,7 +105,7 @@ namespace Tizen.NUI.Examples
             if (sender is Button)
             {
                 Button button = sender as Button;
-                button.LabelText = "Click Me";
+                button.Text = "Click Me";
             }
             return true;
         }
index d26a61e..289bba5 100755 (executable)
@@ -1,18 +1,10 @@
 using System;
-using System.IO;
-using System.Reflection;
-
-using Tizen.NUI.Binding;
 using Tizen.NUI.Xaml;
-using Tizen.NUI;
-using Tizen.NUI.UIComponents;
-using Tizen.NUI.BaseComponents;
 
 namespace Tizen.NUI.Examples
 {
     public class TestMyContents : NUIApplication
     {
-        private TableView contentTable;
         protected override void OnCreate() 
         {
             base.OnCreate();
index e6b8dfc..01a8fbb 100755 (executable)
  */
 using System;
 using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
+using Tizen.NUI.Components;
 
 namespace Tizen.NUI.Examples
 {
-    public class ButtonTestPage : ContentPage
+    public partial class ButtonTestPage : ContentPage
     {
 
         public ButtonTestPage(Window win) : base (win)
         {
+            InitializeComponent();
         }
 
         public override void SetFocus()
@@ -41,7 +42,7 @@ namespace Tizen.NUI.Examples
             if (sender is Button)
             {
                 Button button = sender as Button;
-                button.LabelText = "Click Me";
+                button.Text = "Click Me";
             }
             return true;
         }
index f44e69f..7fb39da 100755 (executable)
@@ -5,7 +5,7 @@ using System.Reflection;
 using Tizen.NUI.Binding;
 using Tizen.NUI.Xaml;
 using Tizen.NUI;
-using Tizen.NUI.UIComponents;
+using Tizen.NUI.Components;
 using Tizen.NUI.BaseComponents;
 //using System.ComponentModel;
 
index 84589a7..141ce8c 100755 (executable)
  * limitations under the License.
  *
  */
-using System;
-using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
 
 namespace Tizen.NUI.Examples
 {
-    public class FlexContainerPage : ContentPage
+    public partial class FlexContainerPage : ContentPage
     {
 
         public FlexContainerPage(Window win) : base (win)
         {
+            InitializeComponent();
         }
 
         public override void SetFocus()
index 058d82a..9619f9b 100755 (executable)
  * limitations under the License.
  *
  */
-using System;
 using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
 
 namespace Tizen.NUI.Examples
 {
-    public class ImageTestPage : ContentPage
+    public partial class ImageTestPage : ContentPage
     {
 
         public ImageTestPage(Window win) : base (win)
         {
+            InitializeComponent();
         }
 
         public override void SetFocus()
index dadb7e0..bb77335 100755 (executable)
  */
 using System;
 using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
+using Tizen.NUI.Components;
 
 namespace Tizen.NUI.Examples
 {
-    public class ScrollBarTestPage : ContentPage
+    public partial class ScrollBarTestPage : ContentPage
     {
 
         public ScrollBarTestPage(Window win) : base (win)
         {
+            InitializeComponent();
         }
 
         public override void SetFocus()
index ab2336b..3c66bb2 100755 (executable)
  */
 using System;
 using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
+using Tizen.NUI.Components;
 
 namespace Tizen.NUI.Examples
 {
-    public class SliderTestPage : ContentPage
+    public partial class SliderTestPage : ContentPage
     {
 
         public SliderTestPage(Window win) : base (win)
         {
+            InitializeComponent();
         }
 
         public override void SetFocus()
index 2dd3add..2fc7ace 100755 (executable)
  * limitations under the License.
  *
  */
-using System;
-using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
 
 namespace Tizen.NUI.Examples
 {
-    public class TableTestPage : ContentPage
+    public partial class TableTestPage : ContentPage
     {
 
         public TableTestPage(Window win) : base (win)
         {
+            InitializeComponent();
         }
 
         public override void SetFocus()
index 32c0f60..388a379 100755 (executable)
  * limitations under the License.
  *
  */
-using System;
-using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
 
 namespace Tizen.NUI.Examples
 {
-    public class TextEditorTestPage : ContentPage
+    public partial class TextEditorTestPage : ContentPage
     {
 
         public TextEditorTestPage(Window win) : base (win)
         {
+            InitializeComponent();
         }
 
         public override void SetFocus()
index 87cdb84..1d28a29 100755 (executable)
  */
 using System;
 using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
 
 namespace Tizen.NUI.Examples
 {
-    public class TextFieldTestPage : ContentPage
+    public partial class TextFieldTestPage : ContentPage
     {
 
         public TextFieldTestPage(Window win) : base (win)
         {
+            InitializeComponent();
         }
 
         public override void SetFocus()
index 6c2ebce..c6b4fb4 100755 (executable)
  * limitations under the License.
  *
  */
-using System;
-using Tizen.NUI.BaseComponents;
-using Tizen.NUI.UIComponents;
 
 namespace Tizen.NUI.Examples
 {
-    public class TextLabelTestPage : ContentPage
+    public partial class TextLabelTestPage : ContentPage
     {
 
         public TextLabelTestPage(Window win) : base (win)
         {
+            InitializeComponent();
         }
 
         public override void SetFocus()
diff --git a/test/NUITestSample/NUIXAMLTestSample/VideoViewTest/VideoViewPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/VideoViewTest/VideoViewPage.xaml.cs
new file mode 100755 (executable)
index 0000000..5a08fc8
--- /dev/null
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Tizen.NUI.Examples
+{
+    public partial class VideoViewPage : ContentPage
+    {
+
+        public VideoViewPage(Window win) : base(win)
+        {
+            InitializeComponent();
+        }
+
+        public override void SetFocus()
+        {
+        }
+    }
+}
diff --git a/test/NUITestSample/NUIXAMLTestSample/VideoViewTest/VideoViewTest.cs b/test/NUITestSample/NUIXAMLTestSample/VideoViewTest/VideoViewTest.cs
new file mode 100755 (executable)
index 0000000..d317cb6
--- /dev/null
@@ -0,0 +1,27 @@
+using System;
+using Tizen.NUI.Xaml;
+
+namespace Tizen.NUI.Examples
+{
+    class VideoViewTest : NUIApplication
+    {
+
+        protected override void OnCreate()
+        {
+            base.OnCreate();
+            Window window = Window.Instance;
+            window.BackgroundColor = Color.White;
+
+            TempPage myPage = new TempPage(window);
+            Extensions.LoadFromXaml(myPage, typeof(TempPage));
+            Console.WriteLine("==================  Set BindingContext in Application !!!! ==================");
+            myPage.SetFocus();
+        }
+
+        public static void _Main(string[] args)
+        {
+            TempTest p = new TempTest();
+            p.Run(args);
+        }
+    }
+}
index d88eed3..6d2e363 100755 (executable)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<AppDetailPage x:Class="Tizen.NUI.Examples.AppDetailPage"
+<ContentPage x:Class="Tizen.NUI.Examples.AppDetailPage"
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:l="clr-namespace:Tizen.UI_Xaml;assembly=Tizen.UI_Xaml"
+  xmlns:l="clr-namespace:Tizen.NUI.Examples;"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
     <View Name="UpperArea" SizeWidth="1920" SizeHeight="780" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true">
@@ -37,4 +37,4 @@
             <ImageView Name="listItem5" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/weather_ss1.png" CellIndex="0,4" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
         </TableView>
     </View>
-</AppDetailPage>
+</ContentPage>
diff --git a/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/LayoutPage.xaml b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/LayoutPage.xaml
new file mode 100755 (executable)
index 0000000..a1028bd
--- /dev/null
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<View x:Class="Tizen.NUI.Examples.LayoutPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:l="clr-namespace:Tizen.NUI.Examples;"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+      Size="400,600" BackgroundColor="Red" ParentOrigin="Center" PivotPoint="Center" PositionUsesPivotPoint="true">
+    <View.Layout>
+        <LinearLayout LinearOrientation="Vertical" CellPadding="50,50" LinearAlignment="Center"/>
+    </View.Layout>
+    <TextLabel Text="ABCDE" HorizontalAlignment="Center" VerticalAlignment="Center"  Size="300, 50" BackgroundColor="Cyan"/>
+    <TextLabel Text="HIJKL"  HorizontalAlignment="Center" VerticalAlignment="Center" Size="300, 50" BackgroundColor="Cyan"/>
+    <TextLabel Text="UVXYZ" HorizontalAlignment="Center" VerticalAlignment="Center" Size="300,50" BackgroundColor="Cyan"/>
+</View>
index 244a292..1ec54bc 100755 (executable)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<MediaHubPage x:Class="Tizen.NUI.Examples.MediaHubPage"
+<ContentPage x:Class="Tizen.NUI.Examples.MediaHubPage"
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
   xmlns:l="clr-namespace:Tizen.UI_Xaml;assembly=Tizen.UI_Xaml"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
@@ -93,4 +93,4 @@
         </TableView>
     </View>
 
-</MediaHubPage>
+</ContentPage>
index f6ef732..e9557b9 100755 (executable)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<AppDetailPage x:Class="Tizen.NUI.Examples.SearchPage"
+<ContentPage x:Class="Tizen.NUI.Examples.SearchPage"
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
     <View Name="UpperArea" BackgroundColor="Green" SizeWidth="1920" SizeHeight="332" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionY="30"  PositionUsesPivotPoint="true">
@@ -32,4 +32,4 @@
             <ImageView Name="listItem35" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/youtube/ytb015.png" CellIndex="0,4" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
         </TableView>
     </View>
-</AppDetailPage>
+</ContentPage>
index 673c755..3e1444f 100755 (executable)
@@ -3,6 +3,6 @@
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
-  <PushButton LabelText="Button1" Focusable="true" Position2D="50,50" Size2D="100,50" >
-  </PushButton>
+  <TextLabel Text="Text1" Focusable="true" Position2D="50,50" Size2D="100,50" >
+  </TextLabel>
 </ContentPage>
index b42c3d1..55c08a6 100755 (executable)
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ContentPage x:Class="Tizen.NUI.Examples.VideoViewPage"
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:c="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
   
        <VideoView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/videos/demoVideo.mp4"
          x:Name="VideoView" Name="videoview" ParentOrigin="Center" PivotPoint="Center" Position2D="0,0" Size2D="600, 400" PositionUsesPivotPoint="true" Looping="true" Muted="false" />
        <TableView x:Name="TableView" Rows="1" Columns="3" CellPadding="20,20" CellHorizontalAlignment="Center" CellVerticalAlignment="Center" Name="tableview" ParentOrigin="Center" PivotPoint="Center" Position2D="0,400" Size2D="600, 120" PositionUsesPivotPoint="true">
-               <PushButton BackgroundImage="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/Backward.png" x:Name="ButtonBackward" Name="buttonbackward" ParentOrigin="Center" PivotPoint="Center" Position2D="0,0" Size2D="100, 80" PositionUsesPivotPoint="true" CellIndex="0,0" Clicked="OnClicked" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost"/>
-               <PushButton BackgroundImage="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/icon-play.png" x:Name="ButtonPlay" Name="buttonplay" ParentOrigin="Center" PivotPoint="Center" Position2D="0,0" Size2D="100, 80" PositionUsesPivotPoint="true" CellIndex="0,1" Clicked="OnClicked" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost"/>
-               <PushButton BackgroundImage="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/Forward.png" x:Name="ButtonForward" Name="buttonforward" ParentOrigin="Center" PivotPoint="Center" Position2D="0,0" Size2D="100, 80" PositionUsesPivotPoint="true" CellIndex="0,2" Clicked="OnClicked" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost"/>
+               <c:Button BackgroundImage="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/Backward.png" x:Name="ButtonBackward" Name="buttonbackward" ParentOrigin="Center" PivotPoint="Center" Position2D="0,0" Size2D="100, 80" PositionUsesPivotPoint="true" CellIndex="0,0" Clicked="OnClicked" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost"/>
+               <c:Button BackgroundImage="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/icon-play.png" x:Name="ButtonPlay" Name="buttonplay" ParentOrigin="Center" PivotPoint="Center" Position2D="0,0" Size2D="100, 80" PositionUsesPivotPoint="true" CellIndex="0,1" Clicked="OnClicked" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost"/>
+               <c:Button BackgroundImage="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/Forward.png" x:Name="ButtonForward" Name="buttonforward" ParentOrigin="Center" PivotPoint="Center" Position2D="0,0" Size2D="100, 80" PositionUsesPivotPoint="true" CellIndex="0,2" Clicked="OnClicked" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost"/>
     </TableView>         
 </ContentPage>
\ No newline at end of file