From f50ae4bb17a03a65d9b324c69b510537d69ae445 Mon Sep 17 00:00:00 2001
From: Svetoslav <tsenov.svetoslav@gmail.com>
Date: Mon, 16 Oct 2017 14:01:39 +0300
Subject: [PATCH] test: include test page for button highlight related to issue
 4740 (#4952)

---
 .../ui-tests-app/button/highlight-4740/highlight-4740.css | 7 +++++++
 .../ui-tests-app/button/highlight-4740/highlight-4740.ts  | 5 +++++
 .../ui-tests-app/button/highlight-4740/highlight-4740.xml | 7 +++++++
 apps/app/ui-tests-app/button/highlight-4740/sub-page.ts   | 5 +++++
 apps/app/ui-tests-app/button/highlight-4740/sub-page.xml  | 4 ++++
 apps/app/ui-tests-app/button/main-page.ts                 | 1 +
 apps/package.json                                         | 8 ++++----
 7 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 apps/app/ui-tests-app/button/highlight-4740/highlight-4740.css
 create mode 100644 apps/app/ui-tests-app/button/highlight-4740/highlight-4740.ts
 create mode 100644 apps/app/ui-tests-app/button/highlight-4740/highlight-4740.xml
 create mode 100644 apps/app/ui-tests-app/button/highlight-4740/sub-page.ts
 create mode 100644 apps/app/ui-tests-app/button/highlight-4740/sub-page.xml

diff --git a/apps/app/ui-tests-app/button/highlight-4740/highlight-4740.css b/apps/app/ui-tests-app/button/highlight-4740/highlight-4740.css
new file mode 100644
index 000000000..621669761
--- /dev/null
+++ b/apps/app/ui-tests-app/button/highlight-4740/highlight-4740.css
@@ -0,0 +1,7 @@
+.btn {
+    font-size: 18;
+}
+
+.btn:highlighted {
+    background-color: red
+}
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/button/highlight-4740/highlight-4740.ts b/apps/app/ui-tests-app/button/highlight-4740/highlight-4740.ts
new file mode 100644
index 000000000..8b2ef7505
--- /dev/null
+++ b/apps/app/ui-tests-app/button/highlight-4740/highlight-4740.ts
@@ -0,0 +1,5 @@
+import * as frame from "tns-core-modules/ui/frame";
+
+export function onTap() {
+    frame.topmost().navigate("ui-tests-app/button/highlight-4740/sub-page");
+}
diff --git a/apps/app/ui-tests-app/button/highlight-4740/highlight-4740.xml b/apps/app/ui-tests-app/button/highlight-4740/highlight-4740.xml
new file mode 100644
index 000000000..cf81614ad
--- /dev/null
+++ b/apps/app/ui-tests-app/button/highlight-4740/highlight-4740.xml
@@ -0,0 +1,7 @@
+
+<Page 
+    xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
+    <StackLayout class="p-20">
+        <Button text="go to sub" tap="onTap" class="btn"/>
+    </StackLayout>
+</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/button/highlight-4740/sub-page.ts b/apps/app/ui-tests-app/button/highlight-4740/sub-page.ts
new file mode 100644
index 000000000..d6ef686a9
--- /dev/null
+++ b/apps/app/ui-tests-app/button/highlight-4740/sub-page.ts
@@ -0,0 +1,5 @@
+import * as frame from "tns-core-modules/ui/frame";
+
+export function goBack() {
+    frame.goBack();
+}
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/button/highlight-4740/sub-page.xml b/apps/app/ui-tests-app/button/highlight-4740/sub-page.xml
new file mode 100644
index 000000000..8f8ff4f49
--- /dev/null
+++ b/apps/app/ui-tests-app/button/highlight-4740/sub-page.xml
@@ -0,0 +1,4 @@
+<Page 
+    xmlns="http://www.nativescript.org/tns.xsd">
+    <Button text="goBack" tap="goBack" />
+</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/button/main-page.ts b/apps/app/ui-tests-app/button/main-page.ts
index 916068f70..ca3dcb457 100644
--- a/apps/app/ui-tests-app/button/main-page.ts
+++ b/apps/app/ui-tests-app/button/main-page.ts
@@ -18,5 +18,6 @@ export function loadExamples() {
     examples.set("border-playground","button/border-playground");
     examples.set("issue-4287","button/issue-4287");
     examples.set("issue-4385","button/issue-4385");
+    examples.set("highlight-4740","button/highlight-4740/highlight-4740");
     return examples;
 }
\ No newline at end of file
diff --git a/apps/package.json b/apps/package.json
index da2add768..2cff88fe6 100644
--- a/apps/package.json
+++ b/apps/package.json
@@ -6,10 +6,10 @@
   "nativescript": {
     "id": "org.nativescript.apps",
     "tns-ios": {
-      "version": "3.1.0"
+      "version": "3.2.0"
     },
     "tns-android": {
-      "version": "3.1.0"
+      "version": "3.2.0"
     }
   },
   "dependencies": {
@@ -20,8 +20,8 @@
     "babel-types": "6.11.1",
     "babylon": "6.8.3",
     "lazy": "1.0.11",
-    "nativescript-dev-typescript": "^0.3.0",
+    "nativescript-dev-typescript": "^0.5.0",
     "tns-platform-declarations": "*",
-    "typescript": "~2.2.1"
+    "typescript": "~2.5.1"
   }
 }