From fc2c5557aecd82ca208fffea31aac21b133d5e76 Mon Sep 17 00:00:00 2001
From: kevinzhow <kevinchou.c@gmail.com>
Date: Fri, 22 May 2015 04:04:56 +0800
Subject: [PATCH] Update font and text color

---
 Yep/Base.lproj/Main.storyboard                        | 6 +++---
 Yep/Configs/YepConfig.swift                           | 2 +-
 Yep/Extensions/UIColor+Yep.swift                      | 4 ++++
 Yep/Extensions/UIFont+Yep.swift                       | 8 ++++----
 Yep/Info.plist                                        | 2 +-
 Yep/Views/Cells/ProfileFooter/ProfileFooterCell.swift | 1 +
 Yep/Views/Cells/ProfileFooter/ProfileFooterCell.xib   | 4 ++--
 7 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard
index 0ac531f8..7e663c4c 100644
--- a/Yep/Base.lproj/Main.storyboard
+++ b/Yep/Base.lproj/Main.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Ha4-ol-D2e">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Ha4-ol-D2e">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
         <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
     </dependencies>
@@ -89,7 +89,7 @@
                                             <userDefinedRuntimeAttribute type="string" keyPath="title" value="Choose photo"/>
                                         </userDefinedRuntimeAttributes>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HcA-7v-16m" userLabel="Take Photo Button" customClass="MessageTypeButton" customModule="Yep" customModuleProvider="target">
+                                    <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HcA-7v-16m" userLabel="Take Photo Button" customClass="MessageTypeButton" customModule="Yep" customModuleProvider="target">
                                         <rect key="frame" x="213" y="20" width="174" height="260"/>
                                         <state key="normal">
                                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
diff --git a/Yep/Configs/YepConfig.swift b/Yep/Configs/YepConfig.swift
index 5800c2fc..4cb57bb8 100644
--- a/Yep/Configs/YepConfig.swift
+++ b/Yep/Configs/YepConfig.swift
@@ -82,7 +82,7 @@ class YepConfig {
     struct Profile {
         static let leftEdgeInset: CGFloat = UIDevice.matchMarginFrom(20, 38, 40)
         static let rightEdgeInset: CGFloat = leftEdgeInset
-        static let introductionLabelFont = UIFont(name: "HelveticaNeue-Thin", size: 12)!
+        static let introductionLabelFont = UIFont(name: "Helvetica-Light", size: 14)!
     }
     
     struct Settings {
diff --git a/Yep/Extensions/UIColor+Yep.swift b/Yep/Extensions/UIColor+Yep.swift
index bdc67118..723a471d 100644
--- a/Yep/Extensions/UIColor+Yep.swift
+++ b/Yep/Extensions/UIColor+Yep.swift
@@ -52,5 +52,9 @@ extension UIColor {
     class func yepDisabledColor() -> UIColor {
         return UIColor(red:0.95, green:0.95, blue:0.95, alpha:1)
     }
+    
+    class func yepGrayColor() -> UIColor {
+        return UIColor(red: 142.0/255.0, green: 142.0/255.0, blue: 147.0/255.0, alpha: 1.0)
+    }
 
 }
diff --git a/Yep/Extensions/UIFont+Yep.swift b/Yep/Extensions/UIFont+Yep.swift
index 6fd1eb22..21a02a51 100644
--- a/Yep/Extensions/UIFont+Yep.swift
+++ b/Yep/Extensions/UIFont+Yep.swift
@@ -14,19 +14,19 @@ extension UIFont {
     }
 
     class func skillTextFont() -> UIFont {
-        return UIFont(name: "HelveticaNeue-Light", size: 14)!
+        return UIFont(name: "Helvetica-Light", size: 14)!
     }
 
     class func skillTextLargeFont() -> UIFont {
-        return UIFont(name: "HelveticaNeue-Light", size: 20)!
+        return UIFont(name: "Helvetica-Light", size: 20)!
     }
     
     class func skillHomeTextLargeFont() -> UIFont {
-        return UIFont(name: "HelveticaNeue-Light", size: 18)!
+        return UIFont(name: "Helvetica-Light", size: 18)!
     }
     
     class func skillHomeButtonFont() -> UIFont {
-        return UIFont(name: "HelveticaNeue-Light", size: 16)!
+        return UIFont(name: "Helvetica-Light", size: 16)!
     }
 
     class func navigationBarTitleFont() -> UIFont {
diff --git a/Yep/Info.plist b/Yep/Info.plist
index cba00180..50d4d43a 100644
--- a/Yep/Info.plist
+++ b/Yep/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>16</string>
+	<string>18</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>
diff --git a/Yep/Views/Cells/ProfileFooter/ProfileFooterCell.swift b/Yep/Views/Cells/ProfileFooter/ProfileFooterCell.swift
index 33bac2fb..bcfb8ddc 100644
--- a/Yep/Views/Cells/ProfileFooter/ProfileFooterCell.swift
+++ b/Yep/Views/Cells/ProfileFooter/ProfileFooterCell.swift
@@ -22,6 +22,7 @@ class ProfileFooterCell: UICollectionViewCell {
         instroductionLabelRightConstraint.constant = YepConfig.Profile.rightEdgeInset
 
         introductionLabel.font = YepConfig.Profile.introductionLabelFont
+        introductionLabel.textColor = UIColor.yepGrayColor()
     }
 
 }
diff --git a/Yep/Views/Cells/ProfileFooter/ProfileFooterCell.xib b/Yep/Views/Cells/ProfileFooter/ProfileFooterCell.xib
index 388dd25e..413469b7 100644
--- a/Yep/Views/Cells/ProfileFooter/ProfileFooterCell.xib
+++ b/Yep/Views/Cells/ProfileFooter/ProfileFooterCell.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>