From 0929f794477b66c5ac933fac70b000ee518bdd45 Mon Sep 17 00:00:00 2001 From: Xianbing Teng Date: Tue, 12 May 2020 13:41:29 +0800 Subject: [PATCH] [NUI] Add layout xaml sample and update samples (#1593) --- .../LayoutSample/LayoutPage.xaml.cs | 28 +++++++++ .../NUIXAMLTestSample/LayoutSample/LayoutSample.cs | 22 +++++++ .../NUIXAMLTestSample/NUIXAMLTestSample.cs | 4 +- .../NUIXAMLTestSample/NUIXAMLTestSample.csproj | 72 +++++++++++++++++----- .../NUIXAMLTestSample/TempTest/TempPage.xaml.cs | 14 +---- .../NUIXAMLTestSample/TempTest/TempTest.cs | 5 -- .../TestAmbient/AmbientDuoPage.xaml.cs | 5 +- .../TestAmbient/AmbientMonoPage.xaml.cs | 4 +- .../TestAmbient/AmbientMultiPage.xaml.cs | 5 +- .../TestAmbient/AmbientMultiPage2.xaml.cs | 5 +- .../TestAmbient/AmbientMultiPage3.xaml.cs | 5 +- .../TestAmbient/BixbyFinancePage.xaml.cs | 5 +- .../TestAmbient/BixbyWidgetPage.xaml.cs | 3 +- .../TestAmbient/SearchPage.xaml.cs | 8 +-- .../NUIXAMLTestSample/TestAmbient/TestAmbient.cs | 7 --- .../TestAmbient/WeatherPage.xaml.cs | 4 +- .../TestDetailApps/AppDetailPage.xaml.cs | 7 ++- .../TestDetailApps/TestDetailApps.cs | 7 --- .../TestMyContents/MediaHubPage.xaml.cs | 7 ++- .../TestMyContents/TestMyContents.cs | 8 --- .../UTC/TestButton/ButtonTestPage.xaml.cs | 7 ++- .../NUIXAMLTestSample/UTC/TestButton/TestButton.cs | 2 +- .../TestFlexContainer/FlexContainerPage.xaml.cs | 6 +- .../UTC/TestImageView/ImageTestPage.xaml.cs | 5 +- .../UTC/TestScrollBar/ScrollBarTestPage.xaml.cs | 5 +- .../UTC/TestSlider/SliderTestPage.xaml.cs | 5 +- .../UTC/TestTableView/TableTestPage.xaml.cs | 6 +- .../UTC/TestTextEditor/TextEditorTestPage.xaml.cs | 6 +- .../UTC/TestTextField/TextFieldTestPage.xaml.cs | 4 +- .../UTC/TestTextLabel/TextLabelTestPage.xaml.cs | 6 +- .../VideoViewTest/VideoViewPage.xaml.cs | 19 ++++++ .../VideoViewTest/VideoViewTest.cs | 27 ++++++++ .../res/layout/1920x1080/AppDetailPage.xaml | 6 +- .../res/layout/1920x1080/LayoutPage.xaml | 13 ++++ .../res/layout/1920x1080/MediaHubPage.xaml | 4 +- .../res/layout/1920x1080/SearchPage.xaml | 4 +- .../NUIXAMLTestSample/res/layout/TempPage.xaml | 4 +- .../res/layout/VideoViewPage.xaml | 7 ++- 38 files changed, 234 insertions(+), 127 deletions(-) create mode 100755 test/NUITestSample/NUIXAMLTestSample/LayoutSample/LayoutPage.xaml.cs create mode 100755 test/NUITestSample/NUIXAMLTestSample/LayoutSample/LayoutSample.cs create mode 100755 test/NUITestSample/NUIXAMLTestSample/VideoViewTest/VideoViewPage.xaml.cs create mode 100755 test/NUITestSample/NUIXAMLTestSample/VideoViewTest/VideoViewTest.cs create mode 100755 test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/LayoutPage.xaml diff --git a/test/NUITestSample/NUIXAMLTestSample/LayoutSample/LayoutPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/LayoutSample/LayoutPage.xaml.cs new file mode 100755 index 0000000..39ba12c --- /dev/null +++ b/test/NUITestSample/NUIXAMLTestSample/LayoutSample/LayoutPage.xaml.cs @@ -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 index 0000000..4d711ab --- /dev/null +++ b/test/NUITestSample/NUIXAMLTestSample/LayoutSample/LayoutSample.cs @@ -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 !!!! =================="); + } + } +} diff --git a/test/NUITestSample/NUIXAMLTestSample/NUIXAMLTestSample.cs b/test/NUITestSample/NUIXAMLTestSample/NUIXAMLTestSample.cs index 8aa94ca..5cd226f 100755 --- a/test/NUITestSample/NUIXAMLTestSample/NUIXAMLTestSample.cs +++ b/test/NUITestSample/NUIXAMLTestSample/NUIXAMLTestSample.cs @@ -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); diff --git a/test/NUITestSample/NUIXAMLTestSample/NUIXAMLTestSample.csproj b/test/NUITestSample/NUIXAMLTestSample/NUIXAMLTestSample.csproj index 68f5d9a..c911c47 100755 --- a/test/NUITestSample/NUIXAMLTestSample/NUIXAMLTestSample.csproj +++ b/test/NUITestSample/NUIXAMLTestSample/NUIXAMLTestSample.csproj @@ -13,28 +13,66 @@ - - - - - + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/NUITestSample/NUIXAMLTestSample/TempTest/TempPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/TempTest/TempPage.xaml.cs index 074b6d9..a960a7c 100755 --- a/test/NUITestSample/NUIXAMLTestSample/TempTest/TempPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/TempTest/TempPage.xaml.cs @@ -16,15 +16,15 @@ */ 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(); } /// @@ -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; diff --git a/test/NUITestSample/NUIXAMLTestSample/TempTest/TempTest.cs b/test/NUITestSample/NUIXAMLTestSample/TempTest/TempTest.cs index 2e20f58..48ee0af 100755 --- a/test/NUITestSample/NUIXAMLTestSample/TempTest/TempTest.cs +++ b/test/NUITestSample/NUIXAMLTestSample/TempTest/TempTest.cs @@ -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 diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientDuoPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientDuoPage.xaml.cs index 6c246d2..43122e4 100755 --- a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientDuoPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientDuoPage.xaml.cs @@ -15,16 +15,15 @@ * */ 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; diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMonoPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMonoPage.xaml.cs index 7e51bf6..66128db 100755 --- a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMonoPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMonoPage.xaml.cs @@ -16,14 +16,14 @@ */ 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(); } /// diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage.xaml.cs index 7812769..7959145 100755 --- a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage.xaml.cs @@ -15,16 +15,15 @@ * */ 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; diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage2.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage2.xaml.cs index dd79060..722cea6 100755 --- a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage2.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage2.xaml.cs @@ -15,16 +15,15 @@ * */ 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; diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage3.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage3.xaml.cs index ba9cbd6..929e70b 100755 --- a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage3.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage3.xaml.cs @@ -15,16 +15,15 @@ * */ 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; } diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/BixbyFinancePage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/BixbyFinancePage.xaml.cs index 694d795..0695128 100755 --- a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/BixbyFinancePage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/BixbyFinancePage.xaml.cs @@ -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(); } /// diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/BixbyWidgetPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/BixbyWidgetPage.xaml.cs index 10ea7dc..0668756 100755 --- a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/BixbyWidgetPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/BixbyWidgetPage.xaml.cs @@ -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(); } /// diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/SearchPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/SearchPage.xaml.cs index effca33..13d74fe 100755 --- a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/SearchPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/SearchPage.xaml.cs @@ -16,11 +16,10 @@ */ 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)); ; diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/TestAmbient.cs b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/TestAmbient.cs index 9d7d214..70fd274 100755 --- a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/TestAmbient.cs +++ b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/TestAmbient.cs @@ -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 { diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/WeatherPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/WeatherPage.xaml.cs index 6fca69b..6a452fb 100755 --- a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/WeatherPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/WeatherPage.xaml.cs @@ -16,11 +16,10 @@ */ 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; } diff --git a/test/NUITestSample/NUIXAMLTestSample/TestDetailApps/AppDetailPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/TestDetailApps/AppDetailPage.xaml.cs index 2995a44..e159d84 100755 --- a/test/NUITestSample/NUIXAMLTestSample/TestDetailApps/AppDetailPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/TestDetailApps/AppDetailPage.xaml.cs @@ -16,11 +16,11 @@ */ 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; } diff --git a/test/NUITestSample/NUIXAMLTestSample/TestDetailApps/TestDetailApps.cs b/test/NUITestSample/NUIXAMLTestSample/TestDetailApps/TestDetailApps.cs index 5f9fe26..e823a21 100755 --- a/test/NUITestSample/NUIXAMLTestSample/TestDetailApps/TestDetailApps.cs +++ b/test/NUITestSample/NUIXAMLTestSample/TestDetailApps/TestDetailApps.cs @@ -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 { diff --git a/test/NUITestSample/NUIXAMLTestSample/TestMyContents/MediaHubPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/TestMyContents/MediaHubPage.xaml.cs index 9de1c4c..e5685f9 100755 --- a/test/NUITestSample/NUIXAMLTestSample/TestMyContents/MediaHubPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/TestMyContents/MediaHubPage.xaml.cs @@ -17,11 +17,11 @@ 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; } diff --git a/test/NUITestSample/NUIXAMLTestSample/TestMyContents/TestMyContents.cs b/test/NUITestSample/NUIXAMLTestSample/TestMyContents/TestMyContents.cs index d26a61e..289bba5 100755 --- a/test/NUITestSample/NUIXAMLTestSample/TestMyContents/TestMyContents.cs +++ b/test/NUITestSample/NUIXAMLTestSample/TestMyContents/TestMyContents.cs @@ -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(); diff --git a/test/NUITestSample/NUIXAMLTestSample/UTC/TestButton/ButtonTestPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/UTC/TestButton/ButtonTestPage.xaml.cs index e6b8dfc..01a8fbb 100755 --- a/test/NUITestSample/NUIXAMLTestSample/UTC/TestButton/ButtonTestPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/UTC/TestButton/ButtonTestPage.xaml.cs @@ -16,15 +16,16 @@ */ 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; } diff --git a/test/NUITestSample/NUIXAMLTestSample/UTC/TestButton/TestButton.cs b/test/NUITestSample/NUIXAMLTestSample/UTC/TestButton/TestButton.cs index f44e69f..7fb39da 100755 --- a/test/NUITestSample/NUIXAMLTestSample/UTC/TestButton/TestButton.cs +++ b/test/NUITestSample/NUIXAMLTestSample/UTC/TestButton/TestButton.cs @@ -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; diff --git a/test/NUITestSample/NUIXAMLTestSample/UTC/TestFlexContainer/FlexContainerPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/UTC/TestFlexContainer/FlexContainerPage.xaml.cs index 84589a7..141ce8c 100755 --- a/test/NUITestSample/NUIXAMLTestSample/UTC/TestFlexContainer/FlexContainerPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/UTC/TestFlexContainer/FlexContainerPage.xaml.cs @@ -14,17 +14,15 @@ * 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() diff --git a/test/NUITestSample/NUIXAMLTestSample/UTC/TestImageView/ImageTestPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/UTC/TestImageView/ImageTestPage.xaml.cs index 058d82a..9619f9b 100755 --- a/test/NUITestSample/NUIXAMLTestSample/UTC/TestImageView/ImageTestPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/UTC/TestImageView/ImageTestPage.xaml.cs @@ -14,17 +14,16 @@ * 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() diff --git a/test/NUITestSample/NUIXAMLTestSample/UTC/TestScrollBar/ScrollBarTestPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/UTC/TestScrollBar/ScrollBarTestPage.xaml.cs index dadb7e0..bb77335 100755 --- a/test/NUITestSample/NUIXAMLTestSample/UTC/TestScrollBar/ScrollBarTestPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/UTC/TestScrollBar/ScrollBarTestPage.xaml.cs @@ -16,15 +16,16 @@ */ 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() diff --git a/test/NUITestSample/NUIXAMLTestSample/UTC/TestSlider/SliderTestPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/UTC/TestSlider/SliderTestPage.xaml.cs index ab2336b..3c66bb2 100755 --- a/test/NUITestSample/NUIXAMLTestSample/UTC/TestSlider/SliderTestPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/UTC/TestSlider/SliderTestPage.xaml.cs @@ -16,15 +16,16 @@ */ 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() diff --git a/test/NUITestSample/NUIXAMLTestSample/UTC/TestTableView/TableTestPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/UTC/TestTableView/TableTestPage.xaml.cs index 2dd3add..2fc7ace 100755 --- a/test/NUITestSample/NUIXAMLTestSample/UTC/TestTableView/TableTestPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/UTC/TestTableView/TableTestPage.xaml.cs @@ -14,17 +14,15 @@ * 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() diff --git a/test/NUITestSample/NUIXAMLTestSample/UTC/TestTextEditor/TextEditorTestPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/UTC/TestTextEditor/TextEditorTestPage.xaml.cs index 32c0f60..388a379 100755 --- a/test/NUITestSample/NUIXAMLTestSample/UTC/TestTextEditor/TextEditorTestPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/UTC/TestTextEditor/TextEditorTestPage.xaml.cs @@ -14,17 +14,15 @@ * 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() diff --git a/test/NUITestSample/NUIXAMLTestSample/UTC/TestTextField/TextFieldTestPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/UTC/TestTextField/TextFieldTestPage.xaml.cs index 87cdb84..1d28a29 100755 --- a/test/NUITestSample/NUIXAMLTestSample/UTC/TestTextField/TextFieldTestPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/UTC/TestTextField/TextFieldTestPage.xaml.cs @@ -16,15 +16,15 @@ */ 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() diff --git a/test/NUITestSample/NUIXAMLTestSample/UTC/TestTextLabel/TextLabelTestPage.xaml.cs b/test/NUITestSample/NUIXAMLTestSample/UTC/TestTextLabel/TextLabelTestPage.xaml.cs index 6c2ebce..c6b4fb4 100755 --- a/test/NUITestSample/NUIXAMLTestSample/UTC/TestTextLabel/TextLabelTestPage.xaml.cs +++ b/test/NUITestSample/NUIXAMLTestSample/UTC/TestTextLabel/TextLabelTestPage.xaml.cs @@ -14,17 +14,15 @@ * 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 index 0000000..5a08fc8 --- /dev/null +++ b/test/NUITestSample/NUIXAMLTestSample/VideoViewTest/VideoViewPage.xaml.cs @@ -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 index 0000000..d317cb6 --- /dev/null +++ b/test/NUITestSample/NUIXAMLTestSample/VideoViewTest/VideoViewTest.cs @@ -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); + } + } +} diff --git a/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AppDetailPage.xaml b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AppDetailPage.xaml index d88eed3..6d2e363 100755 --- a/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AppDetailPage.xaml +++ b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AppDetailPage.xaml @@ -1,7 +1,7 @@ - @@ -37,4 +37,4 @@ - + diff --git a/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/LayoutPage.xaml b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/LayoutPage.xaml new file mode 100755 index 0000000..a1028bd --- /dev/null +++ b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/LayoutPage.xaml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/MediaHubPage.xaml b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/MediaHubPage.xaml index 244a292..1ec54bc 100755 --- a/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/MediaHubPage.xaml +++ b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/MediaHubPage.xaml @@ -1,5 +1,5 @@ - @@ -93,4 +93,4 @@ - + diff --git a/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/SearchPage.xaml b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/SearchPage.xaml index f6ef732..e9557b9 100755 --- a/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/SearchPage.xaml +++ b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/SearchPage.xaml @@ -1,5 +1,5 @@ - @@ -32,4 +32,4 @@ - + diff --git a/test/NUITestSample/NUIXAMLTestSample/res/layout/TempPage.xaml b/test/NUITestSample/NUIXAMLTestSample/res/layout/TempPage.xaml index 673c755..3e1444f 100755 --- a/test/NUITestSample/NUIXAMLTestSample/res/layout/TempPage.xaml +++ b/test/NUITestSample/NUIXAMLTestSample/res/layout/TempPage.xaml @@ -3,6 +3,6 @@ xmlns="http://tizen.org/Tizen.NUI/2018/XAML" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"> - - + + diff --git a/test/NUITestSample/NUIXAMLTestSample/res/layout/VideoViewPage.xaml b/test/NUITestSample/NUIXAMLTestSample/res/layout/VideoViewPage.xaml index b42c3d1..55c08a6 100755 --- a/test/NUITestSample/NUIXAMLTestSample/res/layout/VideoViewPage.xaml +++ b/test/NUITestSample/NUIXAMLTestSample/res/layout/VideoViewPage.xaml @@ -1,13 +1,14 @@ - - - + + + \ No newline at end of file -- 2.7.4