From 01368d4bb5246cb78550fb798e68207d0582709d Mon Sep 17 00:00:00 2001
From: Panayot Cankov <panayot.cankov@telerik.com>
Date: Wed, 15 Mar 2017 13:57:27 +0200
Subject: [PATCH] FontAwesome will now work in iOS buttons, being bold will
 fallback to Helvetica

---
 apps/app/ui-tests-app/font/issue-3654.xml     | 24 ++++++-------
 .../ui/text-base/text-base-common.ts          | 23 ++++++++++++-
 .../ui/text-base/text-base.ios.ts             | 34 ++-----------------
 3 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/apps/app/ui-tests-app/font/issue-3654.xml b/apps/app/ui-tests-app/font/issue-3654.xml
index 9adf3cfe9..29ec40abe 100644
--- a/apps/app/ui-tests-app/font/issue-3654.xml
+++ b/apps/app/ui-tests-app/font/issue-3654.xml
@@ -8,38 +8,38 @@
         <Label text="&#xf0a1;" class="font-awesome" fontFamily="FontAwesome" fontSize="42em" />
         <Button text="TAP" tap="onTap">
             <FormattedString>
-                <Span text="&#xf0a1;" class="font-awesome" fontFamily="FontAwesome" fontSize="42em" foregroundColor="white" fontAttributes="Bold"></Span>
-                <Span text="font-awesome" fontAttributes="Bold"></Span>
+                <Span text="&#xf0a1;" class="font-awesome" fontFamily="FontAwesome" fontSize="42em" color="white"></Span>
+                <Span text="font-awesome" fontWeight="bold"></Span>
             </FormattedString>
         </Button>
         <Button text="TAP" tap="onTap" class="">
             <FormattedString>
-                <Span text="&#xf1ec;" fontFamily="FontAwesome" fontSize="42em" foregroundColor="white" fontAttributes="Bold"></Span>
-                <Span text="some text" fontAttributes="Bold"></Span>
+                <Span text="&#xf1ec;" fontFamily="FontAwesome" fontSize="42em" color="white"></Span>
+                <Span text="some text" fontWeight="bold"></Span>
             </FormattedString>
         </Button>
         <Button text="TAP" tap="onTap" class="">
             <FormattedString>
-                <Span text="&#xf017;" fontFamily="FontAwesome" fontSize="42em" foregroundColor="white" fontAttributes="Bold"></Span>
-                <Span text="some text" fontAttributes="Bold"></Span>
+                <Span text="&#xf017;" fontFamily="FontAwesome" fontSize="42em" color="white"></Span>
+                <Span text="some text" fontWeight="bold"></Span>
             </FormattedString>
         </Button>
         <Button text="TAP" tap="onTap" class="">
             <FormattedString>
-                <Span text="&#xf1b9;" fontFamily="FontAwesome" fontSize="42em" foregroundColor="white" fontAttributes="Bold"></Span>
-                <Span text="some text" fontAttributes="Bold"></Span>
+                <Span text="&#xf1b9;" fontFamily="FontAwesome" fontSize="42em" color="white"></Span>
+                <Span text="some text" fontWeight="bold"></Span>
             </FormattedString>
         </Button>
         <Button text="TAP" tap="onTap" class="">
             <FormattedString>
-                <Span text="&#xf075;" fontFamily="FontAwesome" fontSize="42em" foregroundColor="white" fontAttributes="Bold"></Span>
-                <Span text="some text" fontAttributes="Bold"></Span>
+                <Span text="&#xf075;" fontFamily="FontAwesome" fontSize="42em" color="white"></Span>
+                <Span text="some text" fontWeight="bold"></Span>
             </FormattedString>
         </Button>
         <Button text="TAP" tap="onTap" class="">
             <FormattedString>
-                <Span text="&#xf05a;" fontFamily="FontAwesome" fontSize="42em" foregroundColor="white" fontAttributes="Bold"></Span>
-                <Span text="some text" fontAttributes="Bold"></Span>
+                <Span text="&#xf05a;" fontFamily="FontAwesome" fontSize="42em" color="white"></Span>
+                <Span text="some text" fontWeight="bold"></Span>
             </FormattedString>
         </Button>
         <Label text="{{ message }}" class="h2 text-center" textWrap="true"/>
diff --git a/tns-core-modules/ui/text-base/text-base-common.ts b/tns-core-modules/ui/text-base/text-base-common.ts
index 233748761..97b35f899 100644
--- a/tns-core-modules/ui/text-base/text-base-common.ts
+++ b/tns-core-modules/ui/text-base/text-base-common.ts
@@ -1,6 +1,6 @@
 // Definitions.
 import { TextBase as TextBaseDefinition } from ".";
-import { FontWeight } from "../styling/font";
+import { FontStyle, FontWeight } from "../styling/font";
 import { PropertyChangeData } from "../../data/observable";
 
 // Types.
@@ -19,6 +19,13 @@ export abstract class TextBaseCommon extends View implements TextBaseDefinition
     public text: string;
     public formattedText: FormattedString;
 
+    get fontFamily(): string {
+        return this.style.fontFamily;
+    }
+    set fontFamily(value: string) {
+        this.style.fontFamily = value;
+    }
+
     get fontSize(): number {
         return this.style.fontSize;
     }
@@ -26,6 +33,20 @@ export abstract class TextBaseCommon extends View implements TextBaseDefinition
         this.style.fontSize = value;
     }
 
+    get fontStyle(): FontStyle {
+        return this.style.fontStyle;
+    }
+    set fontStyle(value: FontStyle) {
+        this.style.fontStyle = value;
+    }
+
+    get fontWeight(): FontWeight {
+        return this.style.fontWeight;
+    }
+    set fontWeight(value: FontWeight) {
+        this.style.fontWeight = value;
+    }
+
     get letterSpacing(): number {
         return this.style.letterSpacing;
     }
diff --git a/tns-core-modules/ui/text-base/text-base.ios.ts b/tns-core-modules/ui/text-base/text-base.ios.ts
index b3259332f..8e185822c 100644
--- a/tns-core-modules/ui/text-base/text-base.ios.ts
+++ b/tns-core-modules/ui/text-base/text-base.ios.ts
@@ -234,37 +234,9 @@ export class TextBase extends TextBaseCommon {
         let fontSize = span.fontSize;
 
         if (bold || italic || fontFamily || fontSize) {
-            if (!fontSize) {
-                fontSize = viewFont.pointSize;
-            }
-
-            if (!fontFamily) {
-                fontFamily = viewFont.fontName;
-            }
-            
-            let font;
-
-            let fontDescriptor: UIFontDescriptor = viewFont.fontDescriptor;
-            if (fontFamily) {
-                fontDescriptor = fontDescriptor.fontDescriptorWithFamily(fontFamily);
-            }
-
-            let symbolicTraits;
-            if (bold) {
-                symbolicTraits |= UIFontDescriptorSymbolicTraits.TraitBold;
-            }
-
-            if (italic) {
-                symbolicTraits |= UIFontDescriptorSymbolicTraits.TraitItalic;
-            }
-
-            if (symbolicTraits) {
-                font = UIFont.fontWithDescriptorSize(fontDescriptor.fontDescriptorWithSymbolicTraits(symbolicTraits), fontSize);
-            } else {
-                font = UIFont.fontWithDescriptorSize(fontDescriptor, fontSize);
-            }
-
-            attrDict[NSFontAttributeName] = font;
+            let font = new Font(style.fontFamily, style.fontSize, style.fontStyle, style.fontWeight);
+            let iosFont = font.getUIFont(viewFont);
+            attrDict[NSFontAttributeName] = iosFont;
         }
 
         const color = span.color;