diff --git a/apps/app/ui-tests-app/css/main-page.ts b/apps/app/ui-tests-app/css/main-page.ts index 24dc260e1..c91b4ae73 100644 --- a/apps/app/ui-tests-app/css/main-page.ts +++ b/apps/app/ui-tests-app/css/main-page.ts @@ -46,6 +46,7 @@ export function pageLoaded(args: EventData) { examples.set("textview-hint-color", "css/textview-hint-color"); examples.set("hint-text-color", "css/hint-text-color"); examples.set("combinators", "css/combinators"); + examples.set("styled-formatted-text", "css/styled-formatted-text"); let viewModel = new SubMainPageViewModel(wrapLayout, examples); page.bindingContext = viewModel; diff --git a/apps/app/ui-tests-app/css/styled-formatted-text.css b/apps/app/ui-tests-app/css/styled-formatted-text.css new file mode 100644 index 000000000..5e062988f --- /dev/null +++ b/apps/app/ui-tests-app/css/styled-formatted-text.css @@ -0,0 +1,15 @@ +.class-style { + font-size:55; + color: red; + +} + +#id-style { + background-color: blue; +} + +Label { + border-color:black; + border-radius: 25; + margin: 10px; +} \ No newline at end of file diff --git a/apps/app/ui-tests-app/css/styled-formatted-text.xml b/apps/app/ui-tests-app/css/styled-formatted-text.xml new file mode 100644 index 000000000..f615d8661 --- /dev/null +++ b/apps/app/ui-tests-app/css/styled-formatted-text.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/apps/app/ui-tests-app/mainPage.ts b/apps/app/ui-tests-app/mainPage.ts index 929e85c17..4ad37c37f 100644 --- a/apps/app/ui-tests-app/mainPage.ts +++ b/apps/app/ui-tests-app/mainPage.ts @@ -9,11 +9,9 @@ import * as observable from "tns-core-modules/data/observable"; import * as dialogs from "tns-core-modules/ui/dialogs"; import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout"; -var examples: Map = new Map(); -//should be removed -var oldExamples: Map = new Map(); - export function pageLoaded(args: EventData) { + let examples: Map = new Map(); + let page = args.object; let wrapLayout = page.getViewById("wrapLayoutWithExamples"); examples.set("action-bar", "action-bar/main-page"); @@ -41,8 +39,8 @@ export function pageLoaded(args: EventData) { examples.set("perf", "perf/main-page"); examples.set("list-picker", "list-picker/main-page"); - //examples.set("listview_binding", "pages/listview_binding"); - //examples.set("textfield", "text-field/text-field"); + examples.set("listview_binding", "pages/listview_binding"); + examples.set("textfield", "text-field/text-field"); let viewModel = new MainPageViewModel(wrapLayout, examples); page.bindingContext = viewModel; @@ -55,93 +53,6 @@ export function pageLoaded(args: EventData) { parent.android.setFocusable(true); searchBar.android.clearFocus(); } - - refresh(); -} - -// should be removes -export function refresh() { - oldExamples.set("actStyle", "action-bar/all"); - oldExamples.set("actIcons", "action-bar/system-icons"); - oldExamples.set("actView", "action-bar/action-view"); - - oldExamples.set("basics", "bindings/basics"); - oldExamples.set("xmlbasics", "bindings/xmlbasics"); - - oldExamples.set("background", "css/background"); - oldExamples.set("formatted", "css/decoration-transform-formattedtext"); - oldExamples.set("csslv", "css/listview"); - oldExamples.set("radius", "css/radius"); - oldExamples.set("styles", "css/styles"); - oldExamples.set("tabmore", "css/tab-view-more"); - oldExamples.set("spacing", "css/letter-spacing"); - oldExamples.set("decoration", "css/text-decoration"); - oldExamples.set("transform", "css/text-transform"); - oldExamples.set("whitespace", "css/white-space"); - oldExamples.set("switch", "css/views"); - oldExamples.set("zindex", "css/zindex"); - oldExamples.set("clipPath", "css/clip-path"); - oldExamples.set("dialogs", "dialogs/dialogs"); - - oldExamples.set("fontbtn", "font/button"); - oldExamples.set("fontlbl", "font/label"); - oldExamples.set("fontfield", "font/text-field"); - oldExamples.set("fontview", "font/text-view"); - - oldExamples.set("customfonts", "font/custom-fonts"); - oldExamples.set("material", "font/material-icons"); - oldExamples.set("tabfont", "font/tab-view"); - - oldExamples.set("htmlview", "html-view/html-view"); - - oldExamples.set("roundbtn", "image-view/rounded-buttons"); - oldExamples.set("roundimg", "image-view/rounded-images"); - - oldExamples.set("absolute", "layouts/absolute"); - oldExamples.set("dock", "layouts/dock"); - oldExamples.set("grid", "layouts/grid"); - oldExamples.set("myview", "layouts/myview"); - oldExamples.set("stack", "layouts/stack"); - oldExamples.set("wrap", "layouts/wrap"); - - oldExamples.set("pabsolute", "layouts-percent/absolute"); - oldExamples.set("pdock", "layouts-percent/dock"); - oldExamples.set("pgrid", "layouts-percent/grid"); - oldExamples.set("pmyview", "layouts-percent/myview"); - oldExamples.set("pstack", "layouts-percent/stack"); - oldExamples.set("pwrap", "layouts-percent/wrap"); - - oldExamples.set("modalview", "modal-view/modal-view"); - oldExamples.set("nordic", "nordic/nordic"); - - oldExamples.set("padding", "padding/padding"); - oldExamples.set("timePicker", "time-picker/time-picker"); - oldExamples.set("gestures", "pages/gestures"); - oldExamples.set("touch", "pages/touch-event"); - oldExamples.set("pan", "pages/pan-event"); - oldExamples.set("handlers", "pages/handlers"); - - oldExamples.set("animeBG", "animations/background"); - oldExamples.set("transitions", "transitions/page0"); - - //oldExamples.set("listview_binding", "pages/listview_binding"); - oldExamples.set("console", "pages/console"); - oldExamples.set("i61", "pages/i61"); - oldExamples.set("i73", "pages/i73"); - oldExamples.set("i86", "pages/i86"); - - oldExamples.set("segStyle", "segmented-bar/all"); - - oldExamples.set("tabColor", "tab-view/color"); - oldExamples.set("tabBG", "tab-view/background"); - oldExamples.set("tabTabsBG", "tab-view/tabsBackground"); - oldExamples.set("tabSelected", "tab-view/selected"); - oldExamples.set("tabStyle", "tab-view/all"); - - //oldExamples.set("textfield", "text-field/text-field"); - - oldExamples.set("webview", "web-view/web-view"); - oldExamples.set("webtest", "web-view/web-view-test"); } export class MainPageViewModel extends observable.Observable { @@ -158,6 +69,7 @@ export class MainPageViewModel extends observable.Observable { this.examples = _examples; if (this.shouldLoadBtns()) { + this.sortMap(this.examples); this.loadButtons(); } } @@ -173,17 +85,17 @@ export class MainPageViewModel extends observable.Observable { } } - public loadExample(exampleName: any) { + public loadExample(exampleName: string) { console.log("exampleName EXAMPLE: " + exampleName); this.selectExample(exampleName); } - public loadOldExmaples() { - if (oldExamples.has(this.exampleName)) { - frame.topmost().navigate("ui-tests-app/" + this.basePath + oldExamples.get(this.exampleName)); - } - else { - dialogs.alert("Cannot find example: " + this.exampleName); + public loadExmaple() { + let selectedExample = this.exampleName.toLocaleLowerCase().trim(); + if (selectedExample.indexOf("/") > 0) { + frame.topmost().navigate("ui-tests-app/" + selectedExample); + } else { + this.selectExample(this.exampleName.toLocaleLowerCase()); } } @@ -227,4 +139,29 @@ export class MainPageViewModel extends observable.Observable { this.panel.addChild(btn) }); } + + private sortMap(map: Map) { + let arrayOfKeys = new Array(); + map.forEach((value, key, map) => { + arrayOfKeys.push(key); + }) + + arrayOfKeys.sort((a, b) => { + if (a < b) { + return -1; + } + if (a > b) { + return 1; + } + return a.localeCompare(b); + }) + + let sortedExamples = new Map(); + arrayOfKeys.forEach((k) => { + sortedExamples.set(k, this.examples.get(k)); + }) + + this.examples.clear(); + this.examples = sortedExamples; + } } diff --git a/apps/app/ui-tests-app/mainPage.xml b/apps/app/ui-tests-app/mainPage.xml index 8bcae3158..add4260f2 100644 --- a/apps/app/ui-tests-app/mainPage.xml +++ b/apps/app/ui-tests-app/mainPage.xml @@ -1,15 +1,12 @@ - + -