From 996858825c4ba83744c352790155d42c7e023a63 Mon Sep 17 00:00:00 2001
From: Rossen Hristov <rossen.hristov@telerik.com>
Date: Mon, 22 Aug 2016 15:43:45 +0300
Subject: [PATCH 1/5] Fix: Text color of the Button not applied, when
 text-transform has been set.

Resolves #2601
---
 apps/.vscode/tasks.json                              | 10 ++++++++++
 apps/app/ui-tests-app/css/main-page.ts               |  1 +
 .../ui-tests-app/css/text-transform-and-color.xml    | 12 ++++++++++++
 apps/package.json                                    |  8 ++++----
 tests/package.json                                   |  4 ++--
 tns-core-modules/ui/button/button.ios.ts             |  1 -
 6 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 apps/.vscode/tasks.json
 create mode 100644 apps/app/ui-tests-app/css/text-transform-and-color.xml

diff --git a/apps/.vscode/tasks.json b/apps/.vscode/tasks.json
new file mode 100644
index 000000000..926b1ddcd
--- /dev/null
+++ b/apps/.vscode/tasks.json
@@ -0,0 +1,10 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "0.1.0",
+    "command": "tsc",
+    "isShellCommand": true,
+    "args": ["-p", "."],
+    "showOutput": "silent",
+    "problemMatcher": "$tsc"
+}
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/css/main-page.ts b/apps/app/ui-tests-app/css/main-page.ts
index e4531ace5..96f5fb1a0 100644
--- a/apps/app/ui-tests-app/css/main-page.ts
+++ b/apps/app/ui-tests-app/css/main-page.ts
@@ -25,6 +25,7 @@ export function pageLoaded(args: EventData) {
     examples.set("clipPath", "css/clip-path");
     examples.set("padding", "css/padding");
     examples.set("label-background-image", "css/label-background-image");
+    examples.set("text-transform-and-color", "css/text-transform-and-color");
 
     let viewModel = new SubMianPageViewModel(wrapLayout, examples);
     page.bindingContext = viewModel;
diff --git a/apps/app/ui-tests-app/css/text-transform-and-color.xml b/apps/app/ui-tests-app/css/text-transform-and-color.xml
new file mode 100644
index 000000000..f3da458a4
--- /dev/null
+++ b/apps/app/ui-tests-app/css/text-transform-and-color.xml
@@ -0,0 +1,12 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd">
+  <StackLayout>
+    <Label text="Label red" style="color: red;"/>
+    <Button text="Button red" style="color: red;"/>
+    <TextField text="TextField red" style="color: red;"/>
+    <TextView text="TextView red" style="color: red;"/>
+    <Label text="Label uppercase red" style="text-transform: uppercase; color: red;"/>
+    <Button text="Button uppercase red" style="text-transform: uppercase; color: red;"/>
+    <TextField text="TextField uppercase red" style="text-transform: uppercase; color: red;"/>
+    <TextView text="TextView uppercase red" style="text-transform: uppercase; color: red;"/>
+  </StackLayout>
+</Page>
\ No newline at end of file
diff --git a/apps/package.json b/apps/package.json
index c5f563c87..38f30df87 100644
--- a/apps/package.json
+++ b/apps/package.json
@@ -5,11 +5,11 @@
   "repository": "<fill-your-repository-here>",
   "nativescript": {
     "id": "org.nativescript.apps",
-    "tns-android": {
-      "version": "2.1.1"
-    },
     "tns-ios": {
-      "version": "2.1.1"
+      "version": "2.2.1"
+    },
+    "tns-android": {
+      "version": "2.2.0"
     }
   },
   "dependencies": {
diff --git a/tests/package.json b/tests/package.json
index cca777fa5..6c20e7169 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -6,10 +6,10 @@
   "nativescript": {
     "id": "org.nativescript.tests",
     "tns-ios": {
-      "version": "2.1.1"
+      "version": "2.2.1"
     },
     "tns-android": {
-      "version": "2.1.1"
+      "version": "2.2.0"
     }
   },
   "dependencies": {
diff --git a/tns-core-modules/ui/button/button.ios.ts b/tns-core-modules/ui/button/button.ios.ts
index 9954b1b85..567fa9e9f 100644
--- a/tns-core-modules/ui/button/button.ios.ts
+++ b/tns-core-modules/ui/button/button.ios.ts
@@ -310,7 +310,6 @@ export class ButtonStyler implements style.Styler {
                 button.ios.setAttributedTitleForState(result, UIControlState.UIControlStateNormal);
             } 
             else {
-                button.ios.setAttributedTitleForState(NSMutableAttributedString.alloc().initWithString(source), UIControlState.UIControlStateNormal);
                 button.ios.setTitleForState(source, UIControlState.UIControlStateNormal);
             }
         }

From e802f10bbc72559694df7819a7b69b48e08f36cb Mon Sep 17 00:00:00 2001
From: Rossen Hristov <rossen.hristov@telerik.com>
Date: Mon, 22 Aug 2016 18:00:13 +0300
Subject: [PATCH 2/5] Fix UI test decoration_05_lineThroughUnderlineNone

---
 apps/app/ui-tests-app/css/main-page.ts        |  2 +-
 .../css/text-transform-and-color.xml          | 12 ----------
 .../css/transform-decoration-color.css        |  8 +++++++
 .../css/transform-decoration-color.xml        | 23 +++++++++++++++++++
 4 files changed, 32 insertions(+), 13 deletions(-)
 delete mode 100644 apps/app/ui-tests-app/css/text-transform-and-color.xml
 create mode 100644 apps/app/ui-tests-app/css/transform-decoration-color.css
 create mode 100644 apps/app/ui-tests-app/css/transform-decoration-color.xml

diff --git a/apps/app/ui-tests-app/css/main-page.ts b/apps/app/ui-tests-app/css/main-page.ts
index 96f5fb1a0..d0f64ab21 100644
--- a/apps/app/ui-tests-app/css/main-page.ts
+++ b/apps/app/ui-tests-app/css/main-page.ts
@@ -25,7 +25,7 @@ export function pageLoaded(args: EventData) {
     examples.set("clipPath", "css/clip-path");
     examples.set("padding", "css/padding");
     examples.set("label-background-image", "css/label-background-image");
-    examples.set("text-transform-and-color", "css/text-transform-and-color");
+    examples.set("transform-decoration-color", "css/transform-decoration-color");
 
     let viewModel = new SubMianPageViewModel(wrapLayout, examples);
     page.bindingContext = viewModel;
diff --git a/apps/app/ui-tests-app/css/text-transform-and-color.xml b/apps/app/ui-tests-app/css/text-transform-and-color.xml
deleted file mode 100644
index f3da458a4..000000000
--- a/apps/app/ui-tests-app/css/text-transform-and-color.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Page xmlns="http://schemas.nativescript.org/tns.xsd">
-  <StackLayout>
-    <Label text="Label red" style="color: red;"/>
-    <Button text="Button red" style="color: red;"/>
-    <TextField text="TextField red" style="color: red;"/>
-    <TextView text="TextView red" style="color: red;"/>
-    <Label text="Label uppercase red" style="text-transform: uppercase; color: red;"/>
-    <Button text="Button uppercase red" style="text-transform: uppercase; color: red;"/>
-    <TextField text="TextField uppercase red" style="text-transform: uppercase; color: red;"/>
-    <TextView text="TextView uppercase red" style="text-transform: uppercase; color: red;"/>
-  </StackLayout>
-</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/css/transform-decoration-color.css b/apps/app/ui-tests-app/css/transform-decoration-color.css
new file mode 100644
index 000000000..64d5bb506
--- /dev/null
+++ b/apps/app/ui-tests-app/css/transform-decoration-color.css
@@ -0,0 +1,8 @@
+Label, Button, TextField, TextView {
+    font-size: 12;
+    text-align: left;
+}
+
+TextView {
+    margin-bottom: 10;
+}
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/css/transform-decoration-color.xml b/apps/app/ui-tests-app/css/transform-decoration-color.xml
new file mode 100644
index 000000000..4a1d8d55c
--- /dev/null
+++ b/apps/app/ui-tests-app/css/transform-decoration-color.xml
@@ -0,0 +1,23 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd">
+  <StackLayout>
+    <Label text="Label red" style="color: red;"/>
+    <Button text="Button red" style="color: red;"/>
+    <TextField text="TextField red" style="color: red;"/>
+    <TextView text="TextView red" style="color: red;"/>
+
+    <Label text="Label uppercase red" style="text-transform: uppercase; color: red;"/>
+    <Button text="Button uppercase red" style="text-transform: uppercase; color: red;"/>
+    <TextField text="TextField uppercase red" style="text-transform: uppercase; color: red;"/>
+    <TextView text="TextView uppercase red" style="text-transform: uppercase; color: red;"/>
+
+    <Label text="Label underline line-through blue" style="text-decoration: underline line-through; color: blue;"/>
+    <Button text="Button underline line-through blue" style="text-decoration: underline line-through; color: blue;"/>
+    <TextField text="TextField underline line-through blue" style="text-decoration: underline line-through; color: blue;"/>
+    <TextView text="TextView underline line-through blue" style="text-decoration: underline line-through; color: blue;"/>
+    
+    <Label text="Label uppercase underline line-through green" style="text-transform: uppercase; text-decoration: underline line-through; color: green;"/>
+    <Button text="Button uppercase underline line-through green" style="text-transform: uppercase; text-decoration: underline line-through; color: green;"/>
+    <TextField text="TextField uppercase underline line-through green" style="text-transform: uppercase; text-decoration: underline line-through; color: green;"/>
+    <TextView text="TextView uppercase underline line-through green" style="text-transform: uppercase; text-decoration: underline line-through; color: green;"/>
+  </StackLayout>
+</Page>
\ No newline at end of file

From 416144b970d0dfee6f71b8e17cff2907ac952c32 Mon Sep 17 00:00:00 2001
From: Rossen Hristov <rossen.hristov@telerik.com>
Date: Mon, 22 Aug 2016 18:05:22 +0300
Subject: [PATCH 3/5] Add button.ios.ts to the commit

---
 tns-core-modules/ui/button/button.ios.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tns-core-modules/ui/button/button.ios.ts b/tns-core-modules/ui/button/button.ios.ts
index 567fa9e9f..29a59328b 100644
--- a/tns-core-modules/ui/button/button.ios.ts
+++ b/tns-core-modules/ui/button/button.ios.ts
@@ -279,11 +279,10 @@ export class ButtonStyler implements style.Styler {
             let attributes = new Array();
             let range = { location: 0, length: source.length };
 
-            var decorationValues = (decoration + "").split(" ");
+            let decorationValues = (decoration + "").split(" ");
 
+            let dict = new Map<string, number>();
             if (decorationValues.indexOf(enums.TextDecoration.none) === -1 || hasLetterSpacing) {
-                let dict = new Map<string, number>();
-
                 if (decorationValues.indexOf(enums.TextDecoration.underline) !== -1) {
                     dict.set(NSUnderlineStyleAttributeName, NSUnderlineStyle.NSUnderlineStyleSingle);
                 }
@@ -295,14 +294,21 @@ export class ButtonStyler implements style.Styler {
                 if (hasLetterSpacing) {
                     dict.set(NSKernAttributeName, letterSpacing * button.ios.font.pointSize);
                 }
+            }
 
+            if (button.style.color && button.style.color.ios){
+                console.log(`>>>>>>>>>>>>>>>> dict.set(NSForegroundColorAttributeName, ${button.style.color.ios});`);
+                dict.set(NSForegroundColorAttributeName, button.style.color.ios);
+            }
+            
+            if (dict.size > 0){
                 attributes.push({ attrs: dict, range: NSValue.valueWithRange(range) });
             }
 
             source = utils.ios.getTransformedText(button, source, transform);
 
+            let result = NSMutableAttributedString.alloc().initWithString(source);
             if (attributes.length > 0) {
-                let result = NSMutableAttributedString.alloc().initWithString(source);
                 for (let i = 0; i < attributes.length; i++) {
                     result.setAttributesRange(attributes[i]["attrs"], attributes[i]["range"].rangeValue);
                 }
@@ -310,6 +316,7 @@ export class ButtonStyler implements style.Styler {
                 button.ios.setAttributedTitleForState(result, UIControlState.UIControlStateNormal);
             } 
             else {
+                button.ios.setAttributedTitleForState(result, UIControlState.UIControlStateNormal);
                 button.ios.setTitleForState(source, UIControlState.UIControlStateNormal);
             }
         }

From d3f6e7d38408685529c46e5c6d6c61ab1c563f98 Mon Sep 17 00:00:00 2001
From: Rossen Hristov <rossen.hristov@telerik.com>
Date: Mon, 22 Aug 2016 18:06:09 +0300
Subject: [PATCH 4/5] Remove a console.log

---
 tns-core-modules/ui/button/button.ios.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tns-core-modules/ui/button/button.ios.ts b/tns-core-modules/ui/button/button.ios.ts
index 29a59328b..26d9f8b75 100644
--- a/tns-core-modules/ui/button/button.ios.ts
+++ b/tns-core-modules/ui/button/button.ios.ts
@@ -297,7 +297,6 @@ export class ButtonStyler implements style.Styler {
             }
 
             if (button.style.color && button.style.color.ios){
-                console.log(`>>>>>>>>>>>>>>>> dict.set(NSForegroundColorAttributeName, ${button.style.color.ios});`);
                 dict.set(NSForegroundColorAttributeName, button.style.color.ios);
             }
             

From 501ad372d7c97286319eb24e82aadbe3f7679cd6 Mon Sep 17 00:00:00 2001
From: Rossen Hristov <rossen.hristov@telerik.com>
Date: Mon, 22 Aug 2016 18:13:32 +0300
Subject: [PATCH 5/5] Optimization

---
 tns-core-modules/ui/button/button.ios.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tns-core-modules/ui/button/button.ios.ts b/tns-core-modules/ui/button/button.ios.ts
index 26d9f8b75..361f3dc92 100644
--- a/tns-core-modules/ui/button/button.ios.ts
+++ b/tns-core-modules/ui/button/button.ios.ts
@@ -296,8 +296,9 @@ export class ButtonStyler implements style.Styler {
                 }
             }
 
-            if (button.style.color && button.style.color.ios){
-                dict.set(NSForegroundColorAttributeName, button.style.color.ios);
+            let buttonColor = button.style.color;
+            if (buttonColor){
+                dict.set(NSForegroundColorAttributeName, buttonColor.ios);
             }
             
             if (dict.size > 0){