From c3ee179fd57c80606b0c89911b2478057197c97d Mon Sep 17 00:00:00 2001 From: Vasil Chimev Date: Fri, 15 Jan 2016 14:20:06 +0200 Subject: [PATCH] Update ui-tests-app --- CrossPlatformModules.csproj | 2 +- apps/ui-tests-app/css/text-transform.ts | 8 ++-- .../switchandprogress.xml => css/views.xml} | 0 apps/ui-tests-app/mainPage.ts | 39 +++++++++---------- apps/ui-tests-app/pages/gestures.ts | 2 +- 5 files changed, 24 insertions(+), 27 deletions(-) rename apps/ui-tests-app/{pages/switchandprogress.xml => css/views.xml} (100%) diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj index 9dd48b89d..ac544e11a 100644 --- a/CrossPlatformModules.csproj +++ b/CrossPlatformModules.csproj @@ -1163,7 +1163,7 @@ - + diff --git a/apps/ui-tests-app/css/text-transform.ts b/apps/ui-tests-app/css/text-transform.ts index ab88263d9..ab5c2c24d 100644 --- a/apps/ui-tests-app/css/text-transform.ts +++ b/apps/ui-tests-app/css/text-transform.ts @@ -43,9 +43,9 @@ export function butonTap(args) { textField.style.textTransform = "none"; textView.style.textTransform = "none"; - lbl.style.textDecoration = "none"; - btn.style.textDecoration = "none"; - textField.style.textDecoration = "none"; - textView.style.textDecoration = "none"; + //lbl.style.textDecoration = "none"; + //btn.style.textDecoration = "none"; + //textField.style.textDecoration = "none"; + //textView.style.textDecoration = "none"; } } \ No newline at end of file diff --git a/apps/ui-tests-app/pages/switchandprogress.xml b/apps/ui-tests-app/css/views.xml similarity index 100% rename from apps/ui-tests-app/pages/switchandprogress.xml rename to apps/ui-tests-app/css/views.xml diff --git a/apps/ui-tests-app/mainPage.ts b/apps/ui-tests-app/mainPage.ts index bb92b0205..43d742cf4 100644 --- a/apps/ui-tests-app/mainPage.ts +++ b/apps/ui-tests-app/mainPage.ts @@ -32,35 +32,22 @@ export function selectExample() { } } -examples.set("basics", "bindings/basics"); -examples.set("xmlbasics", "bindings/xmlbasics"); - -examples.set("console", "pages/console"); -examples.set("gestures", "pages/gestures"); -examples.set("handlers", "pages/handlers"); -examples.set("i61", "pages/i61"); -examples.set("i73", "pages/i73"); -examples.set("i86", "pages/i86"); -examples.set("listview_binding", "pages/listview_binding"); - -examples.set("switch", "pages/switchandprogress"); // TODO: Update this test page. - -examples.set("textfield", "text-field/text-field"); - -// --- - examples.set("actColor", "action-bar/color"); examples.set("actBG", "action-bar/background"); examples.set("actStyle", "action-bar/all"); examples.set("actIcons", "action-bar/system-icons"); +examples.set("basics", "bindings/basics"); +examples.set("xmlbasics", "bindings/xmlbasics"); + examples.set("background", "css/background"); -examples.set("radius", "css/radius"); -examples.set("styles", "css/styles"); examples.set("formatted", "css/decoration-transform-formattedtext"); examples.set("decoration", "css/text-decoration"); examples.set("transform", "css/text-transform"); examples.set("whitespace", "css/white-space"); +examples.set("radius", "css/radius"); +examples.set("styles", "css/styles"); +examples.set("switch", "css/views"); examples.set("dialogs", "dialogs/dialogs"); @@ -71,6 +58,9 @@ examples.set("fontview", "font/text-view"); examples.set("htmlview", "html-view/html-view"); +examples.set("roundbtn", "image-view/rounded-buttons"); +examples.set("roundimg", "image-view/rounded-images"); + examples.set("absolute", "layouts/absolute"); examples.set("dock", "layouts/dock"); examples.set("grid", "layouts/grid"); @@ -88,8 +78,13 @@ examples.set("pwrap", "layouts-percent/wrap"); examples.set("modalview", "modal-view/modal-view"); examples.set("nordic", "nordic/nordic"); -examples.set("roundbtn", "image-view/rounded-buttons"); -examples.set("roundimg", "image-view/rounded-images"); +examples.set("gestures", "pages/gestures"); +examples.set("handlers", "pages/handlers"); +//examples.set("listview_binding", "pages/listview_binding"); +examples.set("console", "pages/console"); +examples.set("i61", "pages/i61"); +examples.set("i73", "pages/i73"); +examples.set("i86", "pages/i86"); examples.set("segStyle", "segmented-bar/all"); @@ -99,5 +94,7 @@ examples.set("tabTabsBG", "tab-view/tabsBackground"); examples.set("tabSelected", "tab-view/selected"); examples.set("tabStyle", "tab-view/all"); +//examples.set("textfield", "text-field/text-field"); + examples.set("webview", "web-view/web-view"); examples.set("webtest", "web-view/web-view-test"); diff --git a/apps/ui-tests-app/pages/gestures.ts b/apps/ui-tests-app/pages/gestures.ts index 3c9f7ea50..d89288440 100644 --- a/apps/ui-tests-app/pages/gestures.ts +++ b/apps/ui-tests-app/pages/gestures.ts @@ -91,7 +91,7 @@ export function createPage() { var observer4 = swipeLabel.getGestureObservers(gestures.GestureTypes.swipe)[0]; panLabel.on(gestures.GestureTypes.pan, function (args: gestures.PanGestureEventData) { - panLabel.text = "Pan deltaX:" + Math.round(args.deltaX) + "; deltaY:" + Math.round(args.deltaX) + ";" + ", " + (args.object === panLabel) + getStateAsString(args.state); + panLabel.text = "Pan deltaX:" + Math.round(args.deltaX) + "; deltaY:" + Math.round(args.deltaY) + ";" + ", " + (args.object === panLabel) + getStateAsString(args.state); }); var observer5 = panLabel.getGestureObservers(gestures.GestureTypes.pan)[0];