Tsenov/searchbar (#4328)

* Searchbar tests

* Update search bar test page

* Fix path to events test pages

* Update text-view test pages

apps/app/ui-tests-app/action-bar/main-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
@@ -23,10 +23,4 @@ export function loadExamples() {
     examples.set("modalShownActBar", "action-bar/modal-test-with-action-bar");
 
     return examples;
-}
-
-export class SubMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
-}
+}

apps/app/ui-tests-app/bindings/main-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
@@ -15,10 +15,4 @@ export function loadExamples() {
     examples.set("xmlbasics", "bindings/xmlbasics");
 
     return examples;
-}
-
-export class SubMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
-}
+}

apps/app/ui-tests-app/button/main-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
@@ -15,10 +15,4 @@ export function loadExamples() {
     examples.set("button-border", "button/button-border");
     examples.set("styles", "button/styles");
     return examples;
-}
-
-export class SubMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
-}
+}

apps/app/ui-tests-app/css/main-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
@@ -37,16 +37,9 @@ export function loadExamples() {
     examples.set("margins-paddings-with-percentage", "css/margins-paddings-with-percentage");
     examples.set("padding-and-border", "css/padding-and-border");
     examples.set("border-playground", "css/border-playground");
-    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");
     
     return examples;
-}
-
-export class SubMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
-}
+}

apps/app/ui-tests-app/events/main-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
@@ -11,20 +11,14 @@ export function pageLoaded(args: EventData) {
 
 export function loadExamples() {
     const examples = new Map<string, string>();
-    examples.set("gestures", "gestures");
-    examples.set("touch", "touch-event");
-    examples.set("pan", "pan-event");
-    examples.set("handlers", "handlers");
-    examples.set("console", "console");
-    examples.set("i61", "i61");
-    examples.set("i73", "i73");
-    examples.set("i86", "i86");
+    examples.set("gestures", "events/gestures");
+    examples.set("touch", "events/touch-event");
+    examples.set("pan", "events/pan-event");
+    examples.set("handlers", "events/handlers");
+    examples.set("console", "events/console");
+    examples.set("i61", "events/i61");
+    examples.set("i73", "events/i73");
+    examples.set("i86", "events/i86");
 
     return examples;
 }
-
-export class SubMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
-}

apps/app/ui-tests-app/flexbox/flexbox-main-page.ts

@@ -1,12 +1,12 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
 export function pageLoaded(args: EventData) {
     const page = <Page>args.object;
-    const wrapLayout = <WrapLayout>page.getViewById("wrapLayoutWithExamples");
-    page.bindingContext = new FlexboxMainPageViewModel(wrapLayout, loadExamples());
+    const wrapLayout = <WrapLayout>page.getViewById("wrapLayout");
+    page.bindingContext = new SubMainPageViewModel(wrapLayout, loadExamples());
 }
 
 export function loadExamples() {
@@ -19,10 +19,4 @@ export function loadExamples() {
     examples.set("flexbox-4143", "flexbox/flexbox-4143");
 
     return examples;
-}
-
-export class FlexboxMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
 }

apps/app/ui-tests-app/font/main-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
@@ -21,10 +21,4 @@ export function loadExamples() {
     examples.set("awesome-3654", "font/font-awesome/issue-3654");
 
     return examples;
-}
-
-export class SubMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
-}
+}

apps/app/ui-tests-app/image-view/main-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
@@ -15,10 +15,4 @@ export function loadExamples() {
     examples.set("roundimg", "image-view/rounded-images");
 
     return examples;
-}
-
-export class SubMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
-}
+}

apps/app/ui-tests-app/issues/main-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
@@ -26,10 +26,4 @@ export function loadExamples() {
     examples.set("3354-ios", "issues/issue-3354");
 
     return examples;
-}
-
-export class SubMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
-}
+}

apps/app/ui-tests-app/layouts/main-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
@@ -23,10 +23,4 @@ export function loadExamples() {
     examples.set("pwrap", "layouts-percent/wrap");
 
     return examples;
-}
-
-export class SubMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
-}
+}

apps/app/ui-tests-app/list-picker/main-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
@@ -14,10 +14,4 @@ export function loadExamples() {
     examples.set("issue_2895", "list-picker/issue_2895");
     examples.set("list-picker", "list-picker/list-picker");
     return examples;
-}
-
-export class SubMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
-}
+}

apps/app/ui-tests-app/list-view/main-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
@@ -19,9 +19,3 @@ export function loadExamples() {
 
     return examples;
 }
-
-export class SubMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
-}

apps/app/ui-tests-app/mainPage.ts

@@ -25,9 +25,11 @@ export function pageLoaded(args: EventData) {
     examples.set("page", "page/main-page");
     examples.set("perf", "perf/main-page");
     examples.set("segStyle", "segmented-bar/all");
+    examples.set("search-bar", "search-bar/main-page");
     examples.set("tab-view", "tab-view/main-page");
     examples.set("timePicker", "time-picker/time-picker");
     examples.set("text-field", "text-field/main-page");
+    examples.set("text-view", "text-view/main-page");
     examples.set("webview", "web-view/main-page");
     page.bindingContext = new MainPageViewModel(wrapLayout, examples);
 

apps/app/ui-tests-app/page/main-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
@@ -13,10 +13,4 @@ export function loadExamples() {
     const examples = new Map<string, string>();    
     examples.set("statusBar", "page/page-status-bar-css");
     return examples;
-}
-
-export class SubMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
-}  
+}

apps/app/ui-tests-app/perf/main-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
@@ -15,9 +15,3 @@ export function loadExamples() {
     examples.set("memory-leaks", "perf/memory-leaks/main-page");
     return examples;
 }
-
-export class SubMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
-}

apps/app/ui-tests-app/search-bar/issue-4147.css

@@ -0,0 +1,13 @@
+#bg-color{
+    background-color: red;
+}
+
+.color{
+    color: blue;
+}
+
+#border{
+    border-color: yellow;
+    border-width: 5;
+    border-style: solid;
+}

apps/app/ui-tests-app/search-bar/issue-4147.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Page >
+    <StackLayout>
+        <SearchBar id="bg-color" hint="bg-color" text="" textFieldHintColor="green" />
+        <SearchBar class="color" hint="color" text="color" />
+        <SearchBar hint="Hint Text" id="searchBar" textFieldHintColor="#FFFFFF" 
+        style="color:#FFFFFF;background-color: #795548;height:60" />
+    </StackLayout>
+</Page>

apps/app/ui-tests-app/search-bar/main-page.ts

@@ -0,0 +1,16 @@
+import { EventData } from "tns-core-modules/data/observable";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
+import { Page } from "tns-core-modules/ui/page";
+
+export function pageLoaded(args: EventData) {
+    const page = <Page>args.object;
+    const wrapLayout = <WrapLayout>page.getViewById("wrapLayoutWithExamples");
+    page.bindingContext = new SubMainPageViewModel(wrapLayout, loadExamples());
+}
+
+export function loadExamples() {
+    const examples = new Map<string, string>();
+     examples.set("issue-4147", "search-bar/issue-4147");
+    return examples;
+}

apps/app/ui-tests-app/search-bar/main-page.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Page loaded="pageLoaded">
+    <ScrollView orientation="vertical" row="1">
+        <WrapLayout id="wrapLayoutWithExamples"/>
+    </ScrollView>
+</Page>

apps/app/ui-tests-app/sub-main-page-view-model.ts

@@ -0,0 +1,8 @@
+import { TestPageMainViewModel } from "./test-page-main-view-model";
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
+
+export class SubMainPageViewModel extends TestPageMainViewModel {
+    constructor(container: WrapLayout, examples: Map<string, string>) {
+        super(container, examples);
+    }
+}

apps/app/ui-tests-app/tab-view/main-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
@@ -22,9 +22,3 @@ export function loadExamples() {
     examples.set("text-transform", "tab-view/text-transform");
     return examples;
 }
-
-export class SubMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
-}

apps/app/ui-tests-app/text-field/main-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
@@ -16,9 +16,3 @@ export function loadExamples() {
     examples.set("text-field-border", "text-field/text-field-border");
     return examples;
 }
-
-export class SubMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
-}

apps/app/ui-tests-app/text-field/max-length.xml

@@ -7,7 +7,7 @@
         <TextField id="maxLenghtFromCodeBehind" hint="set only max length from code behind" />
         <TextField id="inXml" text="in xml" hint="in xml" maxLength="3" />
         <TextField id="useInput" hint="user input" maxLength="3" />
-        <TextField id="useInput" hint="user input" maxLength="3" secure="true" />        
+        <TextField id="useInput" hint="secured" maxLength="3" secure="true" />        
         <Button tap="setText" text="Revert to initial state" />
     </StackLayout>
 </Page>

apps/app/ui-tests-app/text-view/main-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
@@ -11,14 +11,7 @@ export function pageLoaded(args: EventData) {
 
 export function loadExamples() {
     const examples = new Map<string, string>();
-    examples.set("secured-text-field", "text-field/secured-text-field-4135");
-    examples.set("max-length", "text-field/max-length");
-    examples.set("text-field-border", "text-field/text-field-border");
+    examples.set("text-view-border", "text-view/text-view-border");
+    examples.set("text-view-hint-color", "text-view/text-view-hint-color");
     return examples;
-}
-
-export class SubMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
-}
+}

apps/app/ui-tests-app/web-view/main-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { TestPageMainViewModel } from "../test-page-main-view-model";
+import { SubMainPageViewModel } from "../sub-main-page-view-model";
 import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 
@@ -16,9 +16,3 @@ export function loadExamples() {
     examples.set("query", "web-view/query-params");
     return examples;
 }
-
-export class SubMainPageViewModel extends TestPageMainViewModel {
-    constructor(container: WrapLayout, examples: Map<string, string>) {
-        super(container, examples);
-    }
-}

apps/package.json

@@ -5,11 +5,11 @@
   "repository": "<fill-your-repository-here>",
   "nativescript": {
     "id": "org.nativescript.apps",
-    "tns-ios": {
-      "version": "3.0.0"
-    },
     "tns-android": {
       "version": "3.0.0"
+    },
+    "tns-ios": {
+      "version": "3.1.0-2017-5-16-2"
     }
   },
   "dependencies": {