From: vanngoc.tr Date: Fri, 22 Sep 2023 05:57:20 +0000 (+0700) Subject: [Non-ACR][Template] Update auto and manual template base on NUI X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62b92f11a6a752f7488b6f7219044f5c7bb22b6e;p=test%2Ftct%2Fcsharp%2Fapi.git [Non-ACR][Template] Update auto and manual template base on NUI Change-Id: Ifee695367ca4053fb2615b07464a510bb0cbb44e --- diff --git a/tct-suite-vs/NewTemplate/NewAutoTemplate/NewAutoTemplate.csproj b/tct-suite-vs/NewTemplate/NewAutoTemplate/NewAutoTemplate.csproj index 7f1dfdb..8a21727 100644 --- a/tct-suite-vs/NewTemplate/NewAutoTemplate/NewAutoTemplate.csproj +++ b/tct-suite-vs/NewTemplate/NewAutoTemplate/NewAutoTemplate.csproj @@ -12,8 +12,6 @@ - - diff --git a/tct-suite-vs/NewTemplate/NewManualTemplate/NewManualTemplate.cs b/tct-suite-vs/NewTemplate/NewManualTemplate/NewManualTemplate.cs index f961225..1c8f90d 100644 --- a/tct-suite-vs/NewTemplate/NewManualTemplate/NewManualTemplate.cs +++ b/tct-suite-vs/NewTemplate/NewManualTemplate/NewManualTemplate.cs @@ -189,7 +189,7 @@ namespace Tizen.Manual.NewTemplate _btnDetailRun.IsEnabled = true; } - void SetCommonButtonStyle(Button button, string text) + public void SetCommonButtonStyle(Button button, string text) { if (!button) return; button.Text = text; @@ -218,6 +218,7 @@ namespace Tizen.Manual.NewTemplate SetCommonButtonStyle(_btnDone, "Done"); _btnDone.Clicked += (obj, ee) => { + UnlockUIButton(); TSettings.GetInstance().SubmitManualResult(); }; @@ -225,6 +226,7 @@ namespace Tizen.Manual.NewTemplate SetCommonButtonStyle(_btnInitRun, "Run"); _btnInitRun.Clicked += (obj, ee) => { + UnlockUIButton(); _currentTCNum = 0; _viewInit.Hide(); _viewCase.Hide(); @@ -232,8 +234,8 @@ namespace Tizen.Manual.NewTemplate _viewDetail.Show(); //FocusManager.Instance.SetCurrentFocusView(_btnDetailRun); }; - //_btnDone.RightFocusableView = _btnInitRun; - //_btnInitRun.LeftFocusableView = _btnDone; + _btnDone.RightFocusableView = _btnInitRun; + _btnInitRun.LeftFocusableView = _btnDone; _flvInit = new FlexibleView { @@ -470,6 +472,7 @@ namespace Tizen.Manual.NewTemplate _btnPass.Clicked += (obj, ee) => { ClearView(); + UnlockUIButton(); if (!ManualTest.IsConfirmed()) { _tSettings.TCResult = StrResult.PASS; @@ -483,6 +486,7 @@ namespace Tizen.Manual.NewTemplate _btnFail.Clicked += (obj, ee) => { ClearView(); + UnlockUIButton(); if (!ManualTest.IsConfirmed()) { _tSettings.TCResult = StrResult.FAIL; @@ -496,6 +500,7 @@ namespace Tizen.Manual.NewTemplate _btnBlock.Clicked += (obj, ee) => { ClearView(); + UnlockUIButton(); if (!ManualTest.IsConfirmed()) { _tSettings.TCResult = StrResult.BLOCK; @@ -514,11 +519,13 @@ namespace Tizen.Manual.NewTemplate _tRunner.Execute(); }; + _btnHome = new Button(ButtonStyleStandard); SetCommonButtonStyle(_btnHome, "Home"); _btnHome.Clicked += (obj, ee) => { ClearView(); + UnlockUIButton(); if (!ManualTest.IsConfirmed()) { _tSettings.TCResult = StrResult.NOTRUN; @@ -537,6 +544,7 @@ namespace Tizen.Manual.NewTemplate _btnPrevious.Clicked += (obj, ee) => { ClearView(); + UnlockUIButton(); if (!ManualTest.IsConfirmed()) { _tSettings.TCResult = StrResult.NOTRUN; @@ -565,6 +573,7 @@ namespace Tizen.Manual.NewTemplate _btnNext.Clicked += (obj, ee) => { ClearView(); + UnlockUIButton(); if (!ManualTest.IsConfirmed()) { _tSettings.TCResult = StrResult.NOTRUN; @@ -683,8 +692,6 @@ namespace Tizen.Manual.NewTemplate _tableViewDetail.SetCellAlignment(new TableView.CellPosition((uint)index, 0), (HorizontalAlignmentType) HorizontalAlignment.Begin, (VerticalAlignmentType) VerticalAlignment.Center); _tableViewDetail.SetFixedHeight((uint)index, Window.Instance.Size.Height * 0.0462f); _tableViewDetail.ParentOrigin = new Position(0.02f, 0.01f); - - } } @@ -894,7 +901,7 @@ namespace Tizen.Manual.NewTemplate { PivotPoint = PivotPoint.TopLeft, ParentOrigin = Position.ParentOriginTopLeft, - Position = new Position(0, Window.Instance.Size.Height * 0.68f, 0), + Position = new Position(0, Window.Instance.Size.Height * 0.67f, 0), Size = new Size(Window.Instance.Size.Width, Window.Instance.Size.Height * 0.09f), Focusable = true }; @@ -911,14 +918,14 @@ namespace Tizen.Manual.NewTemplate FocusManager.Instance.SetCurrentFocusView(view); _viewDetail.Hide(); } - private ButtonStyle ButtonStyleStandard = new ButtonStyle + public ButtonStyle ButtonStyleStandard = new ButtonStyle { BackgroundColor = new ColorSelector { Normal = new Color("#02bcfa"), Pressed = new Color("#029dd1"), Selected = new Color("#029dd1"), - Disabled = new Color("#029dd1"), + Disabled = new Color("#C2C2C2"), }, Focusable = true, CornerRadius = 8,