From 661fe6347a8e5ed24159385dbd893a4f2a02ef58 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 12:09:22 +0800
Subject: [PATCH 01/31] update version 1.0 (94)

---
 Podfile.lock   | 2 +-
 Yep/Info.plist | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Podfile.lock b/Podfile.lock
index 5580f8ac..a80d6d99 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -71,7 +71,7 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   MZFayeClient:
-    :path: "../CatchLib-iOS/MZFayeClient/"
+    :path: ../CatchLib-iOS/MZFayeClient/
   Realm:
     :branch: swift-2.0
     :git: https://github.com/realm/realm-cocoa.git
diff --git a/Yep/Info.plist b/Yep/Info.plist
index a5e847be..9fa30ab7 100644
--- a/Yep/Info.plist
+++ b/Yep/Info.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>93</string>
+	<string>94</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

From 5280ae7fd64a50d79918bf91d7ffd0afa2cb25e3 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 13:56:07 +0800
Subject: [PATCH 02/31] font, navigationBar title color

---
 Yep/AppDelegate.swift                       |  2 +-
 Yep/Extensions/UIColor+Yep.swift            |  4 ++++
 Yep/Extensions/UIFont+Yep.swift             | 18 ++++++++++++------
 Yep/Views/Labels/NavigationTitleLabel.swift |  2 +-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Yep/AppDelegate.swift b/Yep/AppDelegate.swift
index 380c8810..afc84e0b 100644
--- a/Yep/AppDelegate.swift
+++ b/Yep/AppDelegate.swift
@@ -304,7 +304,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         }()
 
         let textAttributes = [
-            NSForegroundColorAttributeName: UIColor.yepTintColor(),
+            NSForegroundColorAttributeName: UIColor.yepNavgationBarTitleColor(),
             NSShadowAttributeName: shadow,
             NSFontAttributeName: UIFont.navigationBarTitleFont()
         ]
diff --git a/Yep/Extensions/UIColor+Yep.swift b/Yep/Extensions/UIColor+Yep.swift
index 342c0b3e..e806accf 100644
--- a/Yep/Extensions/UIColor+Yep.swift
+++ b/Yep/Extensions/UIColor+Yep.swift
@@ -13,6 +13,10 @@ extension UIColor {
         return UIColor(red: 50/255.0, green: 167/255.0, blue: 255/255.0, alpha: 1.0)
     }
 
+    class func yepNavgationBarTitleColor() -> UIColor {
+        return UIColor(red: 0.247, green: 0.247, blue: 0.247, alpha: 1.0)
+    }
+
     class func avatarBackgroundColor() -> UIColor {
         return UIColor(red: 50/255.0, green: 167/255.0, blue: 255/255.0, alpha: 0.3)
     }
diff --git a/Yep/Extensions/UIFont+Yep.swift b/Yep/Extensions/UIFont+Yep.swift
index 55c15622..5fe83336 100644
--- a/Yep/Extensions/UIFont+Yep.swift
+++ b/Yep/Extensions/UIFont+Yep.swift
@@ -14,26 +14,32 @@ extension UIFont {
     }
 
     class func skillTextFont() -> UIFont {
-        return UIFont(name: "Helvetica-Light", size: 14)!
+        //return UIFont(name: "Helvetica-Light", size: 14)!
+        return UIFont.systemFontOfSize(14)
     }
 
     class func skillTextLargeFont() -> UIFont {
-        return UIFont(name: "Helvetica-Light", size: 20)!
+        //return UIFont(name: "Helvetica-Light", size: 20)!
+        return UIFont.systemFontOfSize(20)
     }
     
     class func skillHomeTextLargeFont() -> UIFont {
-        return UIFont(name: "Helvetica-Light", size: 18)!
+        //return UIFont(name: "Helvetica-Light", size: 18)!
+        return UIFont.systemFontOfSize(18)
     }
     
     class func skillHomeButtonFont() -> UIFont {
-        return UIFont(name: "Helvetica-Light", size: 16)!
+        //return UIFont(name: "Helvetica-Light", size: 16)!
+        return UIFont.systemFontOfSize(16)
     }
     
     class func barButtonFont() -> UIFont {
-        return UIFont(name: "Helvetica-Light", size: 14)!
+        //return UIFont(name: "Helvetica-Light", size: 14)!
+        return UIFont.systemFontOfSize(14)
     }
 
     class func navigationBarTitleFont() -> UIFont {
-        return UIFont(name: "Helvetica-Bold", size: 15)!
+        //return UIFont(name: "Helvetica-Bold", size: 15)!
+        return UIFont.boldSystemFontOfSize(15)
     }
 }
diff --git a/Yep/Views/Labels/NavigationTitleLabel.swift b/Yep/Views/Labels/NavigationTitleLabel.swift
index bb2443ec..76eb6d67 100644
--- a/Yep/Views/Labels/NavigationTitleLabel.swift
+++ b/Yep/Views/Labels/NavigationTitleLabel.swift
@@ -21,7 +21,7 @@ class NavigationTitleLabel: UILabel {
 
         textAlignment = .Center
         font = UIFont.navigationBarTitleFont()
-        textColor = UIColor.yepTintColor()
+        textColor = UIColor.yepNavgationBarTitleColor()
 
         sizeToFit()
     }

From b52ea351c56fdd12a4cb6baa1bb81afb635cb406 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 13:57:51 +0800
Subject: [PATCH 03/31] NSLocalizedString("Nickname", comment: "")

---
 .../Register/RegisterPickNameViewController.swift               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Yep/ViewControllers/Register/RegisterPickNameViewController.swift b/Yep/ViewControllers/Register/RegisterPickNameViewController.swift
index 015a32a9..3c4beca0 100644
--- a/Yep/ViewControllers/Register/RegisterPickNameViewController.swift
+++ b/Yep/ViewControllers/Register/RegisterPickNameViewController.swift
@@ -63,7 +63,7 @@ class RegisterPickNameViewController: BaseViewController {
         let tap = UITapGestureRecognizer(target: self, action: "tapTerms")
         promptTermsLabel.addGestureRecognizer(tap)
 
-        //nameTextField.placeholder = ""
+        nameTextField.placeholder = NSLocalizedString("Nickname", comment: "")
         nameTextField.delegate = self
         nameTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
 

From 69be396dd11da23e5b81ddfb1ff958004e0cf327 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 13:59:49 +0800
Subject: [PATCH 04/31] By tapping

---
 .../Register/RegisterPickNameViewController.swift               | 2 +-
 Yep/en.lproj/Localizable.strings                                | 2 +-
 Yep/zh-Hans.lproj/Localizable.strings                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Yep/ViewControllers/Register/RegisterPickNameViewController.swift b/Yep/ViewControllers/Register/RegisterPickNameViewController.swift
index 3c4beca0..62f0a7f1 100644
--- a/Yep/ViewControllers/Register/RegisterPickNameViewController.swift
+++ b/Yep/ViewControllers/Register/RegisterPickNameViewController.swift
@@ -42,7 +42,7 @@ class RegisterPickNameViewController: BaseViewController {
 
         pickNamePromptLabel.text = NSLocalizedString("What's your name?", comment: "")
 
-        let text = NSLocalizedString("By tap Next you agree to our terms.", comment: "")
+        let text = NSLocalizedString("By tapping Next you agree to our terms.", comment: "")
         let textAttributes: [String: AnyObject] = [
             NSFontAttributeName: UIFont.systemFontOfSize(14),
             NSForegroundColorAttributeName: UIColor.grayColor(),
diff --git a/Yep/en.lproj/Localizable.strings b/Yep/en.lproj/Localizable.strings
index 8ded021b..b91f670c 100644
--- a/Yep/en.lproj/Localizable.strings
+++ b/Yep/en.lproj/Localizable.strings
@@ -66,7 +66,7 @@
 /* No comment provided by engineer. */
 "Build world together" = "Build world together";
 
-"By tap Next you agree to our terms." = "By tap Next you agree to our terms.";
+"By tapping Next you agree to our terms." = "By tapping Next you agree to our terms.";
 
 /* No comment provided by engineer. */
 "Call me" = "Call me";
diff --git a/Yep/zh-Hans.lproj/Localizable.strings b/Yep/zh-Hans.lproj/Localizable.strings
index 2c66ed19..2c8815e0 100644
--- a/Yep/zh-Hans.lproj/Localizable.strings
+++ b/Yep/zh-Hans.lproj/Localizable.strings
@@ -66,7 +66,7 @@
 /* No comment provided by engineer. */
 "Build world together" = "共建世界";
 
-"By tap Next you agree to our terms." = "点击下一步表示您同意我们的条款。";
+"By tapping Next you agree to our terms." = "点击下一步表示您同意我们的条款。";
 
 /* No comment provided by engineer. */
 "Call me" = "呼叫我";

From 070bfac32f216d82a5a4406791fa26a9b599d40b Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 14:01:59 +0800
Subject: [PATCH 05/31] placeholders

---
 Yep/ViewControllers/Login/LoginVerifyMobileViewController.swift | 2 +-
 .../Register/RegisterPickNameViewController.swift               | 2 +-
 .../Register/RegisterVerifyMobileViewController.swift           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Yep/ViewControllers/Login/LoginVerifyMobileViewController.swift b/Yep/ViewControllers/Login/LoginVerifyMobileViewController.swift
index 3a38de7d..caa3fd5b 100644
--- a/Yep/ViewControllers/Login/LoginVerifyMobileViewController.swift
+++ b/Yep/ViewControllers/Login/LoginVerifyMobileViewController.swift
@@ -60,7 +60,7 @@ class LoginVerifyMobileViewController: UIViewController {
         verifyMobileNumberPromptLabel.text = NSLocalizedString("Input verification code send to", comment: "")
         phoneNumberLabel.text = "+" + areaCode + " " + mobile
 
-        //verifyCodeTextField.placeholder = ""
+        verifyCodeTextField.placeholder = " "
         verifyCodeTextField.delegate = self
         verifyCodeTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
 
diff --git a/Yep/ViewControllers/Register/RegisterPickNameViewController.swift b/Yep/ViewControllers/Register/RegisterPickNameViewController.swift
index 62f0a7f1..a4d4f586 100644
--- a/Yep/ViewControllers/Register/RegisterPickNameViewController.swift
+++ b/Yep/ViewControllers/Register/RegisterPickNameViewController.swift
@@ -63,7 +63,7 @@ class RegisterPickNameViewController: BaseViewController {
         let tap = UITapGestureRecognizer(target: self, action: "tapTerms")
         promptTermsLabel.addGestureRecognizer(tap)
 
-        nameTextField.placeholder = NSLocalizedString("Nickname", comment: "")
+        nameTextField.placeholder = " "//NSLocalizedString("Nickname", comment: "")
         nameTextField.delegate = self
         nameTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
 
diff --git a/Yep/ViewControllers/Register/RegisterVerifyMobileViewController.swift b/Yep/ViewControllers/Register/RegisterVerifyMobileViewController.swift
index 9db1e687..dbb01d54 100644
--- a/Yep/ViewControllers/Register/RegisterVerifyMobileViewController.swift
+++ b/Yep/ViewControllers/Register/RegisterVerifyMobileViewController.swift
@@ -60,7 +60,7 @@ class RegisterVerifyMobileViewController: UIViewController {
         verifyMobileNumberPromptLabel.text = NSLocalizedString("Input verification code send to", comment: "")
         phoneNumberLabel.text = "+" + areaCode + " " + mobile
 
-        //verifyCodeTextField.placeholder = ""
+        verifyCodeTextField.placeholder = " "
         verifyCodeTextField.delegate = self
         verifyCodeTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
 

From aa53a7e1719aba19b29a6320c9623b3ee98dd020 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 14:05:14 +0800
Subject: [PATCH 06/31] sent to

---
 Yep/ViewControllers/Login/LoginVerifyMobileViewController.swift | 2 +-
 .../Register/RegisterVerifyMobileViewController.swift           | 2 +-
 Yep/en.lproj/Localizable.strings                                | 2 +-
 Yep/zh-Hans.lproj/Localizable.strings                           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Yep/ViewControllers/Login/LoginVerifyMobileViewController.swift b/Yep/ViewControllers/Login/LoginVerifyMobileViewController.swift
index caa3fd5b..6bc93329 100644
--- a/Yep/ViewControllers/Login/LoginVerifyMobileViewController.swift
+++ b/Yep/ViewControllers/Login/LoginVerifyMobileViewController.swift
@@ -57,7 +57,7 @@ class LoginVerifyMobileViewController: UIViewController {
 
         NSNotificationCenter.defaultCenter().addObserver(self, selector: "activeAgain:", name: AppDelegate.Notification.applicationDidBecomeActive, object: nil)
         
-        verifyMobileNumberPromptLabel.text = NSLocalizedString("Input verification code send to", comment: "")
+        verifyMobileNumberPromptLabel.text = NSLocalizedString("Input verification code sent to", comment: "")
         phoneNumberLabel.text = "+" + areaCode + " " + mobile
 
         verifyCodeTextField.placeholder = " "
diff --git a/Yep/ViewControllers/Register/RegisterVerifyMobileViewController.swift b/Yep/ViewControllers/Register/RegisterVerifyMobileViewController.swift
index dbb01d54..7bad4ebf 100644
--- a/Yep/ViewControllers/Register/RegisterVerifyMobileViewController.swift
+++ b/Yep/ViewControllers/Register/RegisterVerifyMobileViewController.swift
@@ -57,7 +57,7 @@ class RegisterVerifyMobileViewController: UIViewController {
 
         NSNotificationCenter.defaultCenter().addObserver(self, selector: "activeAgain:", name: AppDelegate.Notification.applicationDidBecomeActive, object: nil)
 
-        verifyMobileNumberPromptLabel.text = NSLocalizedString("Input verification code send to", comment: "")
+        verifyMobileNumberPromptLabel.text = NSLocalizedString("Input verification code sent to", comment: "")
         phoneNumberLabel.text = "+" + areaCode + " " + mobile
 
         verifyCodeTextField.placeholder = " "
diff --git a/Yep/en.lproj/Localizable.strings b/Yep/en.lproj/Localizable.strings
index b91f670c..b8aa18a2 100644
--- a/Yep/en.lproj/Localizable.strings
+++ b/Yep/en.lproj/Localizable.strings
@@ -207,7 +207,7 @@
 "Hold for Voice" = "Hold for Voice";
 
 /* No comment provided by engineer. */
-"Input verification code send to" = "Input verification code send to";
+"Input verification code sent to" = "Input verification code sent to";
 
 /* No comment provided by engineer. */
 "Introduce yourself here." = "Introduce yourself here.";
diff --git a/Yep/zh-Hans.lproj/Localizable.strings b/Yep/zh-Hans.lproj/Localizable.strings
index 2c8815e0..4bee50ce 100644
--- a/Yep/zh-Hans.lproj/Localizable.strings
+++ b/Yep/zh-Hans.lproj/Localizable.strings
@@ -206,7 +206,7 @@
 "Hold for Voice" = "长按录制声音";
 
 /* No comment provided by engineer. */
-"Input verification code send to" = "输入收到的短信验证码";
+"Input verification code sent to" = "输入收到的短信验证码";
 
 /* No comment provided by engineer. */
 "Introduce yourself here." = "此处是自我介绍";

From 06f32bef3aefd4d1cad323485f6b897d42d9dc0e Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 14:23:32 +0800
Subject: [PATCH 07/31] yepViewBackgroundColor & yepInputTextColor

---
 Yep/Base.lproj/Intro.storyboard                       | 11 ++++++-----
 Yep/Extensions/UIColor+Yep.swift                      |  8 ++++++++
 .../Login/LoginByMobileViewController.swift           |  5 +++++
 .../Login/LoginVerifyMobileViewController.swift       |  4 ++++
 .../Register/RegisterPickAvatarViewController.swift   |  2 ++
 .../Register/RegisterPickMobileViewController.swift   |  5 +++++
 .../Register/RegisterPickNameViewController.swift     |  4 ++++
 .../Register/RegisterVerifyMobileViewController.swift |  4 ++++
 8 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/Yep/Base.lproj/Intro.storyboard b/Yep/Base.lproj/Intro.storyboard
index 1af3b6d3..1f0966d0 100644
--- a/Yep/Base.lproj/Intro.storyboard
+++ b/Yep/Base.lproj/Intro.storyboard
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
         <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
     </dependencies>
@@ -113,7 +114,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="What's your name?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pw6-yh-kid">
-                                <rect key="frame" x="223" y="124" width="154" height="21"/>
+                                <rect key="frame" x="223" y="124" width="153.5" height="21"/>
                                 <animations/>
                                 <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="18"/>
                                 <nil key="highlightedColor"/>
@@ -132,13 +133,13 @@
                                 <rect key="frame" x="0.0" y="145" width="600" height="50"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="By tap Next you agree to our terms." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h5A-MY-QLR">
-                                        <rect key="frame" x="163" y="14" width="274" height="21"/>
+                                        <rect key="frame" x="164.5" y="14.5" width="271.5" height="20.5"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstAttribute="centerY" secondItem="h5A-MY-QLR" secondAttribute="centerY" id="twk-Oz-6CQ"/>
                                     <constraint firstAttribute="centerX" secondItem="h5A-MY-QLR" secondAttribute="centerX" id="xeW-Fb-QfO"/>
diff --git a/Yep/Extensions/UIColor+Yep.swift b/Yep/Extensions/UIColor+Yep.swift
index e806accf..f3b681b9 100644
--- a/Yep/Extensions/UIColor+Yep.swift
+++ b/Yep/Extensions/UIColor+Yep.swift
@@ -17,6 +17,14 @@ extension UIColor {
         return UIColor(red: 0.247, green: 0.247, blue: 0.247, alpha: 1.0)
     }
 
+    class func yepViewBackgroundColor() -> UIColor {
+        return UIColor(red: 0.98, green: 0.98, blue: 0.98, alpha: 1.0)
+    }
+
+    class func yepInputTextColor() -> UIColor {
+        return UIColor(red: 0.557, green: 0.557, blue: 0.576, alpha: 1.0)
+    }
+
     class func avatarBackgroundColor() -> UIColor {
         return UIColor(red: 50/255.0, green: 167/255.0, blue: 255/255.0, alpha: 0.3)
     }
diff --git a/Yep/ViewControllers/Login/LoginByMobileViewController.swift b/Yep/ViewControllers/Login/LoginByMobileViewController.swift
index 35d02456..b4786d15 100644
--- a/Yep/ViewControllers/Login/LoginByMobileViewController.swift
+++ b/Yep/ViewControllers/Login/LoginByMobileViewController.swift
@@ -30,6 +30,8 @@ class LoginByMobileViewController: BaseViewController {
 
         animatedOnNavigationBar = false
 
+        view.backgroundColor = UIColor.yepViewBackgroundColor()
+
         navigationItem.titleView = NavigationTitleLabel(title: NSLocalizedString("Login", comment: ""))
    
         navigationItem.rightBarButtonItem = nextButton
@@ -37,11 +39,14 @@ class LoginByMobileViewController: BaseViewController {
         pickMobileNumberPromptLabel.text = NSLocalizedString("What's your number?", comment: "")
 
         areaCodeTextField.text = NSTimeZone.areaCode
+        areaCodeTextField.backgroundColor = UIColor.whiteColor()
         
         areaCodeTextField.delegate = self
         areaCodeTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
 
         //mobileNumberTextField.placeholder = ""
+        mobileNumberTextField.backgroundColor = UIColor.whiteColor()
+        mobileNumberTextField.textColor = UIColor.yepInputTextColor()
         mobileNumberTextField.delegate = self
         mobileNumberTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
 
diff --git a/Yep/ViewControllers/Login/LoginVerifyMobileViewController.swift b/Yep/ViewControllers/Login/LoginVerifyMobileViewController.swift
index 6bc93329..9ba655f3 100644
--- a/Yep/ViewControllers/Login/LoginVerifyMobileViewController.swift
+++ b/Yep/ViewControllers/Login/LoginVerifyMobileViewController.swift
@@ -51,6 +51,8 @@ class LoginVerifyMobileViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        view.backgroundColor = UIColor.yepViewBackgroundColor()
+
         navigationItem.titleView = NavigationTitleLabel(title: NSLocalizedString("Login", comment: ""))
 
         navigationItem.rightBarButtonItem = nextButton
@@ -61,6 +63,8 @@ class LoginVerifyMobileViewController: UIViewController {
         phoneNumberLabel.text = "+" + areaCode + " " + mobile
 
         verifyCodeTextField.placeholder = " "
+        verifyCodeTextField.backgroundColor = UIColor.whiteColor()
+        verifyCodeTextField.textColor = UIColor.yepInputTextColor()
         verifyCodeTextField.delegate = self
         verifyCodeTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
 
diff --git a/Yep/ViewControllers/Register/RegisterPickAvatarViewController.swift b/Yep/ViewControllers/Register/RegisterPickAvatarViewController.swift
index ec5b9f34..19423760 100644
--- a/Yep/ViewControllers/Register/RegisterPickAvatarViewController.swift
+++ b/Yep/ViewControllers/Register/RegisterPickAvatarViewController.swift
@@ -116,6 +116,8 @@ class RegisterPickAvatarViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        view.backgroundColor = UIColor.yepViewBackgroundColor()
+
         navigationItem.titleView = NavigationTitleLabel(title: NSLocalizedString("Avatar", comment: ""))
 
         navigationItem.rightBarButtonItem = nextButton
diff --git a/Yep/ViewControllers/Register/RegisterPickMobileViewController.swift b/Yep/ViewControllers/Register/RegisterPickMobileViewController.swift
index 02d5f812..b4e6c2da 100644
--- a/Yep/ViewControllers/Register/RegisterPickMobileViewController.swift
+++ b/Yep/ViewControllers/Register/RegisterPickMobileViewController.swift
@@ -28,6 +28,8 @@ class RegisterPickMobileViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        view.backgroundColor = UIColor.yepViewBackgroundColor()
+
         navigationItem.titleView = NavigationTitleLabel(title: NSLocalizedString("Sign up", comment: ""))
 
         navigationItem.rightBarButtonItem = nextButton
@@ -35,11 +37,14 @@ class RegisterPickMobileViewController: UIViewController {
         pickMobileNumberPromptLabel.text = NSLocalizedString("What's your number?", comment: "")
 
         areaCodeTextField.text = NSTimeZone.areaCode
+        areaCodeTextField.backgroundColor = UIColor.whiteColor()
 
         areaCodeTextField.delegate = self
         areaCodeTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
 
         //mobileNumberTextField.placeholder = ""
+        mobileNumberTextField.backgroundColor = UIColor.whiteColor()
+        mobileNumberTextField.textColor = UIColor.yepInputTextColor()
         mobileNumberTextField.delegate = self
         mobileNumberTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
 
diff --git a/Yep/ViewControllers/Register/RegisterPickNameViewController.swift b/Yep/ViewControllers/Register/RegisterPickNameViewController.swift
index a4d4f586..755632f2 100644
--- a/Yep/ViewControllers/Register/RegisterPickNameViewController.swift
+++ b/Yep/ViewControllers/Register/RegisterPickNameViewController.swift
@@ -36,6 +36,8 @@ class RegisterPickNameViewController: BaseViewController {
 
         animatedOnNavigationBar = false
 
+        view.backgroundColor = UIColor.yepViewBackgroundColor()
+
         navigationItem.titleView = NavigationTitleLabel(title: NSLocalizedString("Sign up", comment: ""))
 
         navigationItem.rightBarButtonItem = nextButton
@@ -63,6 +65,8 @@ class RegisterPickNameViewController: BaseViewController {
         let tap = UITapGestureRecognizer(target: self, action: "tapTerms")
         promptTermsLabel.addGestureRecognizer(tap)
 
+        nameTextField.backgroundColor = UIColor.whiteColor()
+        nameTextField.textColor = UIColor.yepInputTextColor()
         nameTextField.placeholder = " "//NSLocalizedString("Nickname", comment: "")
         nameTextField.delegate = self
         nameTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
diff --git a/Yep/ViewControllers/Register/RegisterVerifyMobileViewController.swift b/Yep/ViewControllers/Register/RegisterVerifyMobileViewController.swift
index 7bad4ebf..cd7e5f4f 100644
--- a/Yep/ViewControllers/Register/RegisterVerifyMobileViewController.swift
+++ b/Yep/ViewControllers/Register/RegisterVerifyMobileViewController.swift
@@ -51,6 +51,8 @@ class RegisterVerifyMobileViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        view.backgroundColor = UIColor.yepViewBackgroundColor()
+
         navigationItem.titleView = NavigationTitleLabel(title: NSLocalizedString("Sign up", comment: ""))
 
         navigationItem.rightBarButtonItem = nextButton
@@ -61,6 +63,8 @@ class RegisterVerifyMobileViewController: UIViewController {
         phoneNumberLabel.text = "+" + areaCode + " " + mobile
 
         verifyCodeTextField.placeholder = " "
+        verifyCodeTextField.backgroundColor = UIColor.whiteColor()
+        verifyCodeTextField.textColor = UIColor.yepInputTextColor()
         verifyCodeTextField.delegate = self
         verifyCodeTextField.addTarget(self, action: "textFieldDidChange:", forControlEvents: .EditingChanged)
 

From 892684a282509a5911278603d950b2bbcea27051 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 14:32:28 +0800
Subject: [PATCH 08/31] skillCategoryButtonWidth 280

---
 Yep/Views/Cells/SkillCategory/SkillCategoryCell.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Yep/Views/Cells/SkillCategory/SkillCategoryCell.swift b/Yep/Views/Cells/SkillCategory/SkillCategoryCell.swift
index 2db8aeeb..8f650188 100644
--- a/Yep/Views/Cells/SkillCategory/SkillCategoryCell.swift
+++ b/Yep/Views/Cells/SkillCategory/SkillCategoryCell.swift
@@ -10,7 +10,7 @@ import UIKit
 
 class SkillCategoryCell: UICollectionViewCell {
 
-    static let skillCategoryButtonWidth: CGFloat = CGRectGetWidth(UIScreen.mainScreen().bounds) - 20 * 2
+    static let skillCategoryButtonWidth: CGFloat = 280//CGRectGetWidth(UIScreen.mainScreen().bounds) - 20 * 2
     static let skillCategoryButtonHeight: CGFloat = 60
 
     @IBOutlet weak var skillCategoryButton: SkillCategoryButton!

From 87f8e6586e5c0f969146f81aeb99f4c1f6da0843 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 14:45:09 +0800
Subject: [PATCH 09/31] registerPickSkillsLayoutLeftEdgeInset

---
 .../Profile/ProfileViewController.swift                |  4 ++++
 .../Register/RegisterPickSkillsLayout.swift            |  4 +++-
 .../Register/RegisterPickSkillsViewController.swift    |  2 +-
 .../AddSkills/AddSkillsReusableView.swift              |  8 ++++++++
 .../ReusableViews/AddSkills/AddSkillsReusableView.xib  | 10 ++++++----
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/Yep/ViewControllers/Profile/ProfileViewController.swift b/Yep/ViewControllers/Profile/ProfileViewController.swift
index 44ad9a08..56282e8c 100644
--- a/Yep/ViewControllers/Profile/ProfileViewController.swift
+++ b/Yep/ViewControllers/Profile/ProfileViewController.swift
@@ -646,6 +646,10 @@ class ProfileViewController: UIViewController {
                 })
             }
 
+            YepAlert.confirmOrCancel(title: NSLocalizedString("Notice", comment: ""), message: NSLocalizedString("You don't have any skills!\nWould you like to pick some?", comment: ""), confirmTitle: NSLocalizedString("OK", comment: ""), cancelTitle: NSLocalizedString("Not now", comment: ""), inViewController: self, withConfirmAction: { [weak self] in
+                self?.pickSkills()
+                }, cancelAction: {})
+            
             if profileUserIsMe {
 
                 // 提示没有 Skills
diff --git a/Yep/ViewControllers/Register/RegisterPickSkillsLayout.swift b/Yep/ViewControllers/Register/RegisterPickSkillsLayout.swift
index c6e204c7..00bd1a42 100644
--- a/Yep/ViewControllers/Register/RegisterPickSkillsLayout.swift
+++ b/Yep/ViewControllers/Register/RegisterPickSkillsLayout.swift
@@ -7,8 +7,10 @@
 //
 
 import UIKit
+import Ruler
 
-let registerPickSkillsLayoutLeftEdgeInset: CGFloat = 20
+let registerPickSkillsLayoutLeftEdgeInset: CGFloat = Ruler.iPhoneHorizontal(20, 40, 40).value
+let registerPickSkillsLayoutRightEdgeInset: CGFloat = registerPickSkillsLayoutLeftEdgeInset
 
 class RegisterPickSkillsLayout: UICollectionViewFlowLayout {
 
diff --git a/Yep/ViewControllers/Register/RegisterPickSkillsViewController.swift b/Yep/ViewControllers/Register/RegisterPickSkillsViewController.swift
index 164909dd..6cda7b5d 100644
--- a/Yep/ViewControllers/Register/RegisterPickSkillsViewController.swift
+++ b/Yep/ViewControllers/Register/RegisterPickSkillsViewController.swift
@@ -40,7 +40,7 @@ class RegisterPickSkillsViewController: BaseViewController {
         }()
 
     let sectionLeftEdgeInset: CGFloat = registerPickSkillsLayoutLeftEdgeInset
-    let sectionRightEdgeInset: CGFloat = 20
+    let sectionRightEdgeInset: CGFloat = registerPickSkillsLayoutRightEdgeInset
     let sectionBottomEdgeInset: CGFloat = 50
 
     var skillCategories: [SkillCategory]?
diff --git a/Yep/Views/ReusableViews/AddSkills/AddSkillsReusableView.swift b/Yep/Views/ReusableViews/AddSkills/AddSkillsReusableView.swift
index 39ca613b..4963ee9e 100644
--- a/Yep/Views/ReusableViews/AddSkills/AddSkillsReusableView.swift
+++ b/Yep/Views/ReusableViews/AddSkills/AddSkillsReusableView.swift
@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Ruler
 
 class AddSkillsReusableView: UICollectionReusableView {
     
@@ -17,4 +18,11 @@ class AddSkillsReusableView: UICollectionReusableView {
     }
 
     @IBOutlet weak var skillTypeLabel: UILabel!
+    @IBOutlet weak var skillTypeLabelLeadingConstraint: NSLayoutConstraint!
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+
+        skillTypeLabelLeadingConstraint.constant = registerPickSkillsLayoutLeftEdgeInset
+    }
 }
diff --git a/Yep/Views/ReusableViews/AddSkills/AddSkillsReusableView.xib b/Yep/Views/ReusableViews/AddSkills/AddSkillsReusableView.xib
index 662d5770..2d88a128 100644
--- a/Yep/Views/ReusableViews/AddSkills/AddSkillsReusableView.xib
+++ b/Yep/Views/ReusableViews/AddSkills/AddSkillsReusableView.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="15A178w" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -11,10 +12,10 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Skill Type" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zXh-oX-lPA" userLabel="Skill Type Label">
-                    <rect key="frame" x="20" y="23" width="119" height="36"/>
+                    <rect key="frame" x="20" y="23" width="121.5" height="36"/>
                     <animations/>
                     <fontDescription key="fontDescription" type="system" weight="light" pointSize="30"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>
@@ -25,6 +26,7 @@
             </constraints>
             <connections>
                 <outlet property="skillTypeLabel" destination="zXh-oX-lPA" id="qEO-HY-0G3"/>
+                <outlet property="skillTypeLabelLeadingConstraint" destination="eii-nG-1pk" id="VPV-a8-3Dm"/>
             </connections>
             <point key="canvasLocation" x="318" y="411"/>
         </collectionReusableView>

From 6bc95b22bb06c7a04b30a13d17d2c8c678715be2 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 14:49:42 +0800
Subject: [PATCH 10/31] badge

---
 Yep/Views/Cells/Contacts/ContactsCell.xib | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Yep/Views/Cells/Contacts/ContactsCell.xib b/Yep/Views/Cells/Contacts/ContactsCell.xib
index 0051cd82..8e45c6ae 100644
--- a/Yep/Views/Cells/Contacts/ContactsCell.xib
+++ b/Yep/Views/Cells/Contacts/ContactsCell.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="15A204h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
@@ -12,7 +13,7 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="79.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="yGz-R6-Ojm">
@@ -24,7 +25,7 @@
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Last seen just now" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GZ1-Eh-QgO">
-                        <rect key="frame" x="152" y="10" width="160" height="15"/>
+                        <rect key="frame" x="147.5" y="10.5" width="164.5" height="14.5"/>
                         <animations/>
                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="12"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
@@ -38,18 +39,18 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ivk-sQ-ylu">
-                        <rect key="frame" x="85" y="9" width="39" height="17"/>
+                        <rect key="frame" x="85" y="9" width="38.5" height="17"/>
                         <animations/>
                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
                         <color key="textColor" white="0.24954602940000001" alpha="1" colorSpace="calibratedWhite"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="tcJ-0E-OaK" userLabel="Badge Image View">
-                        <rect key="frame" x="128" y="8" width="20" height="20"/>
+                        <rect key="frame" x="127.5" y="9.5" width="16" height="16"/>
                         <animations/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="20" id="13c-mN-wTw"/>
-                            <constraint firstAttribute="height" constant="20" id="ym9-Np-uSB"/>
+                            <constraint firstAttribute="width" constant="16" id="13c-mN-wTw"/>
+                            <constraint firstAttribute="height" constant="16" id="ym9-Np-uSB"/>
                         </constraints>
                     </imageView>
                 </subviews>

From 1b5b9cd7cbf002e2813d59be107de6f71d5e86d7 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 14:59:34 +0800
Subject: [PATCH 11/31] new skill_bubble_large_empty

---
 Yep/Images.xcassets/Contents.json             |   6 ++++++
 .../Contents.json                             |   4 ++--
 .../skill_bubble_large_empty.pdf              | Bin 4265 -> 4253 bytes
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 Yep/Images.xcassets/Contents.json

diff --git a/Yep/Images.xcassets/Contents.json b/Yep/Images.xcassets/Contents.json
new file mode 100644
index 00000000..da4a164c
--- /dev/null
+++ b/Yep/Images.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Yep/Images.xcassets/skill_bubble_large_empty.imageset/Contents.json b/Yep/Images.xcassets/skill_bubble_large_empty.imageset/Contents.json
index 87661c83..2dce6866 100644
--- a/Yep/Images.xcassets/skill_bubble_large_empty.imageset/Contents.json
+++ b/Yep/Images.xcassets/skill_bubble_large_empty.imageset/Contents.json
@@ -6,10 +6,10 @@
       "resizing" : {
         "mode" : "3-part-horizontal",
         "center" : {
-          "mode" : "fill",
+          "mode" : "tile",
           "width" : 1
         },
-        "capInsets" : {
+        "cap-insets" : {
           "right" : 17,
           "left" : 17
         }
diff --git a/Yep/Images.xcassets/skill_bubble_large_empty.imageset/skill_bubble_large_empty.pdf b/Yep/Images.xcassets/skill_bubble_large_empty.imageset/skill_bubble_large_empty.pdf
index 7bf76597c626cee4c34780bba7f74ff789fb9d63..94ae34102699e2f03f20e1967cb5936165dbe78e 100644
GIT binary patch
delta 827
zcmZ3fI9G8(Q2l8?W<#Dm&$VmZUQM!iUz~qumE4bpsR9dhg<dt@Pk)oLSzANsQOBxn
zW!K7V=6&3Ex%1x317)WsCQZ4|ExNzb`+L=iO~?5D&osIIRCAX1W=qBUM}1NsWfXHg
zVb+->F+29%J0C^Ag+(9#CM=X#Cex+AOjTu?iSF@j0mVzX&fY!9TfdOyobKkL4B4JT
zmuAo0K6`6;f>Z4D8PQwhyq3mXUtD+6SeDI-$4z$f@&~J)dl}sL{iMv1YyHzV54JKN
z=ng((xoqBqlyhriR!+QfHH>v$(SZX|IZQSueT+PxW<1D#$97>$vupKZff)Y`*)2tR
z_YKzlV*2#4@7{?lc_$6UlS>1*>%GL}i#;@U@``-p)39-UIqCF*NQ13^-ppy-TXcP`
z>%8np?obA0J*J0c!fmc!6{Wi$3B}Hsypcn=-J7*H`)QsI!_~9grVhc2#CO@p$({`_
z`nB_%?Th*cHM=gS%I(MxV6V)1{KvM`>2mn1mUH_9+ZWa^=Cl5#TsqIr;X3oa^*0i)
zJ3ju%(;w?=CT`ikO-%cD{KsP_&1QZUTyM5~yX+JH4_ymHJ0%v^n!4P4yHIbVMt-bu
zN3MGI?p0w+%acu<ziu*hzPh9C%H@mvv4?NB=;oF^+hCHtd;9U?Ws@yynVwBiRG)0a
zB+X=DG&zzfmdVU`^G+r&ZXi9Gjjxc|K+kk?1)mP5rIC?=nW>4X(d4y!jap`g3I-sc
zkf*=}W*8WlTAHJa8JilLPLAMLt2ehmmohN3v_uy(HU%1pZmhW(rm-d#80w7849(E>
z8k?Cx#Q2fiX>4w2IhjYmF5WE7*uXH!EZNj3(b6=@*f=@aIL+KL)g;Z>*doO|$<&U^
ihM*FKSOq&fuHur!qLPZD)HE(*3u7}bRaIAiH!c7Ju{!Yp

delta 824
zcmbQMxKeRKQ2p*a8AF~oUq#pO-f5e%BD^-%>Ty@i0me4rH>?KhPP|X|czfEB=SIQv
zG{dOg6%UiYIQ4&VQumx_Vsuv{tH{LK%5|+t|6f*n`J47~FU;pI3ebD#CM3-8gYAvJ
z-y`b_#+;sWjot}#rD{!D6)-z!^-^)KSG(t!vOdr@ox3G_-8SR;V1EmRJ9CeFGsrN0
zSrFbXw)V(8Hrr(l+}8}6X1HyYUXbu@b@cPJT{RP{-)}RR7{1AdeIH}1)loG=b)yB5
zpLV_d=wPdHjH|13RZv#BTz_#;5P#FrWtM?!9&DX;ym5`k#y6`P`8REx73<I?bdY;T
z=A7f_w7zdGc`vZObHl}@8Ts`bmnUg$S@LH0;!o3lh8ex7kPAvWckZzTQ;1{kh8v$E
z6r%d~i&<^H(jet=(B*^N<o=%<mR}AEH5K}O@<tU)j1#{=+Lz?hNl#2fe|g?NS3c$6
zJ6n-m@#UAUdwhNQP?)V%)&5Fd_Q&YA{AOzM+53IJ)Zda{v-#bu^6m1;pYnfC{g*qT
z<$cB<{YSMT=fu}6`f_ON&HrciZe;ozwWVm`Y039<6MSy)9G>^7_lE1kOey7z!@H$Z
z&fHz}BS3!gd(Bza4pD0NpNXs0pO%@;c>UFa4erNf-}3!`_%QMh<2|Fx&-NYVxqV>&
zstc^npMQwkUsF9f*?>u!$<k!9FH<bDp@GrnHB4UIAjae$yoHR0lXLiVIL(ZV4UA1q
zjZG&n<ZIM2H&!qJ0fjsTE-=Huz|6oBUCh|j#A31!zgoSe0lJidxuFrdn6arLrm^N0
z7<!FOEHTs>n;B!OGlS~oM{=jJxv}9S0XyeZGYexA^OTgd6r)trR1>45#6(le6vL#{
fR1;%!^JD`%E*nBhCN~NQbDCIisj9mAyKw;kMNdRg


From 5c71940e2f13a68d5d1e7edcbfded5d618699cda Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 15:03:14 +0800
Subject: [PATCH 12/31] leftEdgeInset of RegisterSelectSkillsLayout

---
 Yep/ViewControllers/Register/RegisterSelectSkillsLayout.swift   | 2 +-
 .../Register/RegisterSelectSkillsViewController.swift           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Yep/ViewControllers/Register/RegisterSelectSkillsLayout.swift b/Yep/ViewControllers/Register/RegisterSelectSkillsLayout.swift
index fc8816fd..f01d63fc 100644
--- a/Yep/ViewControllers/Register/RegisterSelectSkillsLayout.swift
+++ b/Yep/ViewControllers/Register/RegisterSelectSkillsLayout.swift
@@ -10,7 +10,7 @@ import UIKit
 
 class RegisterSelectSkillsLayout: UICollectionViewFlowLayout {
 
-    let leftEdgeInset: CGFloat = 20
+    let leftEdgeInset: CGFloat = registerPickSkillsLayoutLeftEdgeInset
 
     override func layoutAttributesForElementsInRect(rect: CGRect) -> [UICollectionViewLayoutAttributes]? {
         let layoutAttributes = super.layoutAttributesForElementsInRect(rect)
diff --git a/Yep/ViewControllers/Register/RegisterSelectSkillsViewController.swift b/Yep/ViewControllers/Register/RegisterSelectSkillsViewController.swift
index 2a13d265..c1ae1852 100644
--- a/Yep/ViewControllers/Register/RegisterSelectSkillsViewController.swift
+++ b/Yep/ViewControllers/Register/RegisterSelectSkillsViewController.swift
@@ -48,7 +48,7 @@ class RegisterSelectSkillsViewController: UIViewController {
     let skillTextAttributes = [NSFontAttributeName: UIFont.skillTextLargeFont()]
 
     let sectionLeftEdgeInset: CGFloat = registerPickSkillsLayoutLeftEdgeInset
-    let sectionRightEdgeInset: CGFloat = 20
+    let sectionRightEdgeInset: CGFloat = registerPickSkillsLayoutRightEdgeInset
 
     var skillCategories = [SkillCategory]()
     var skillCategoryIndex: Int = 0

From 7a0d16dfb68531a507f71ac6cf7b244f3bab6966 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 15:07:37 +0800
Subject: [PATCH 13/31] back & cancel

---
 Yep/Base.lproj/Intro.storyboard | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Yep/Base.lproj/Intro.storyboard b/Yep/Base.lproj/Intro.storyboard
index 1f0966d0..3753233b 100644
--- a/Yep/Base.lproj/Intro.storyboard
+++ b/Yep/Base.lproj/Intro.storyboard
@@ -583,10 +583,10 @@
                                 <rect key="frame" x="0.0" y="540" width="600" height="60"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ssh-a5-EGH">
-                                        <rect key="frame" x="260" y="5" width="80" height="50"/>
+                                        <rect key="frame" x="260" y="0.0" width="80" height="40"/>
                                         <animations/>
                                         <constraints>
-                                            <constraint firstAttribute="height" constant="50" id="oNI-Fk-e5A"/>
+                                            <constraint firstAttribute="height" constant="40" id="oNI-Fk-e5A"/>
                                         </constraints>
                                         <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="18"/>
                                         <inset key="contentEdgeInsets" minX="8" minY="0.0" maxX="0.0" maxY="0.0"/>
@@ -599,10 +599,10 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AY6-Bh-fXh">
-                                        <rect key="frame" x="273" y="5" width="54" height="50"/>
+                                        <rect key="frame" x="273" y="0.0" width="54" height="40"/>
                                         <animations/>
                                         <constraints>
-                                            <constraint firstAttribute="height" constant="50" id="Z7e-qU-8v2"/>
+                                            <constraint firstAttribute="height" constant="40" id="Z7e-qU-8v2"/>
                                         </constraints>
                                         <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="18"/>
                                         <inset key="contentEdgeInsets" minX="6" minY="0.0" maxX="0.0" maxY="0.0"/>
@@ -621,8 +621,8 @@
                                     <constraint firstAttribute="centerX" secondItem="AY6-Bh-fXh" secondAttribute="centerX" id="Trr-6g-2dt"/>
                                     <constraint firstAttribute="centerX" secondItem="Ssh-a5-EGH" secondAttribute="centerX" id="cON-1Z-JBr"/>
                                     <constraint firstAttribute="height" constant="60" id="jdB-3f-yEa"/>
-                                    <constraint firstAttribute="centerY" secondItem="AY6-Bh-fXh" secondAttribute="centerY" id="l6a-zv-aRm"/>
-                                    <constraint firstAttribute="centerY" secondItem="Ssh-a5-EGH" secondAttribute="centerY" id="lc2-tG-IwL"/>
+                                    <constraint firstItem="Ssh-a5-EGH" firstAttribute="top" secondItem="VwP-wh-PsD" secondAttribute="top" id="m6P-lJ-RxV"/>
+                                    <constraint firstItem="AY6-Bh-fXh" firstAttribute="top" secondItem="Ssh-a5-EGH" secondAttribute="top" id="uxf-df-QXa"/>
                                 </constraints>
                             </view>
                         </subviews>

From 9c2d30443cf7dbf730db92e8c7b150efe72f7558 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 15:31:33 +0800
Subject: [PATCH 14/31] new dot

---
 .../icon_dot_failed.pdf                       | Bin 3922 -> 4074 bytes
 .../icon_dot_sending.pdf                      | Bin 3917 -> 3987 bytes
 .../icon_dot_unread.pdf                       | Bin 3927 -> 4074 bytes
 .../ChatRightAudio/ChatRightAudioCell.xib     |  18 +++++++-----------
 .../ChatRightImage/ChatRightImageCell.xib     |  16 ++++++----------
 .../ChatRightLocationCell.xib                 |  18 +++++++-----------
 .../Cells/ChatRightText/ChatRightTextCell.xib |  16 ++++++----------
 .../ChatRightVideo/ChatRightVideoCell.xib     |  16 ++++++----------
 8 files changed, 32 insertions(+), 52 deletions(-)

diff --git a/Yep/Images.xcassets/icon_dot_failed.imageset/icon_dot_failed.pdf b/Yep/Images.xcassets/icon_dot_failed.imageset/icon_dot_failed.pdf
index 9058d72e3477a8c49a8cfad31b2b41f31d43d313..996c1ef9aaf059ced6dd4bd3ed44d7ea7f25fc2a 100644
GIT binary patch
delta 675
zcmca4_ey?3Kz(n}?!3bW0=K`4&f)gB`f{yh^mYYj`vVRW#rzr+oa^`7SZ*{H$xQrR
zVpM6<d5N_;CP7v0$g4sp52H<$DP~`~Di7xW{5bLNzb50Hw;f0CWO4u0N>a^K-Kg8m
z6_g;d;iks-bq|Es?_Qm-%SpklU~WP*Q)<Z8j76(jqhdolb#K-S%KMim{M*{xbHMHB
z)R-v0IVLXR!6IcjCuT^zU$Il2IrE6zio~UXF0T)@tut|D+PFCK*S}Xy<&IS!w;r_i
zRNDIFp;wE`x~Yxt*BmS|;jy}O=Xu?OeETz!kBs(Jisb*<x1-@}LmB(IZLL$^RDbUL
zU!}Y9SJUCX>z)sOMmX|q@bo!T!eqHCD|~l;>Opz6&b*2!@tWy3%%hU$TCFLJE4+NH
z@Xm=-GYcN*-uTaudUGNlS885LaY<2XVlIf4pOnRAs$if1qKyrVC$llevKksF7#eI&
zV|3?+Feh)|DPT06tjMdwX=!9+U~Xt`XgN8Iw?WI)!brgY1QhZVxWEhp0~13FbTMON
z(@A`4^~RQ#=rRVTMh56&#>Pg5=wb$@7FbL*z))vwVr-7C*Vx1YEGB^LOk-0MgUMU@
z?BXrV49yag4U!WL%nU7z%*+#0EzQgg5);!B&6AUolFaS6YzQh*h*hw&<0>vmEGnre
TN=@T3HZwKnQdM>JcjE#8;>7I)

delta 502
zcmaDQe@SjaK)r9jH`ieU9@g)cN2A3bdHvJ)v`hWODt3-3B5#~d{9V`;e5YaJv3cqn
z%+A~}D4HeU68JDudaB#v^O8@$*vGAZ`J7jtMc|ddT$PI=Z<P|nlOAZaF?L_gvzBo?
z6T9e2GV@l;U$^C~d2ZghRpt7d$?~A|_v7ax$_!3y3_5W+<;hedsnvYHn+zLoPTP{S
zT;}M!oc$%=MD@?aU)XEjHo2BjirLWAbn-05SY|T?v(0}P-MK-G$sW7~jK-69^6GG!
z8JHRxn3@|JO@7DQpk-ogpkM$33V8}#V1|K#kvWE#v5~>#8GLH>My7@s%8juoH#Emo
zXJTxDuGiQQ(>!A%3sVer#>QYV0c3X?8(UaR_T{&WH%K-}Gf6VAFf>RpF)=kZNijFI
xG%!vwG)+!5Gc~a=w&SuPs6-)F!Oo7WxFoTtq@pM_jmy~7z?4f>)z#mP3jm?NnYaJ|

diff --git a/Yep/Images.xcassets/icon_dot_sending.imageset/icon_dot_sending.pdf b/Yep/Images.xcassets/icon_dot_sending.imageset/icon_dot_sending.pdf
index 3323c1b4397aa46b142f67df4e466c241e5d63f1..d83e3d928058f063a23795ecb05e76660286365a 100644
GIT binary patch
delta 550
zcmX>rH(7o{K>gGJ!@R==Ja@i!&E~!#s@pj&E&nDHe`Q01lI|R)#`YR}b*s!hB^)fA
z?w{VdeCkqO_d-Se$ic@<n)fawt&o1yk-FOcL*;q9+6U7MKXAM<D-7V8<*j~kiO#zP
zQ)jnl{#Y3KBkp7G`ApF(qK{abwwj6k7Ro;DQ0(V3{p?T9^FMyor}KS3CUZ&s&X13c
z-`RIhTQ>8eg6rQIvY$^*f1_NSdc~sZs7+xf)A`GsY$;c`nUvQp;WzXM(SFy|@M=fq
ztW3X;uEDQFuHJhZ8m{*LL~pQR@sr20o6kkv;!4d+DK05WP0R(c@{_W-Oce|iK(vve
z8BEAX!C*2EV-TyMfr6pI=0rw!ZU}SoYMuf{)5$WtIvkcpMh50a<|dN^c$>5=fo6b!
zLY@K_m|<XGY;1@wW^80;Ir$H-DzmYn(PSS!)ifhx6Ld8OrUqE_8Dgk2Ha0at*K2G7
zbOD+>j7>}@ujjLOHngxvO*BeQHAziLG)+!QvP@1fHa4;_H%zfKN;NS~wd1lOq-3%o
Qzc8n{0hg+(tG^o;0Fgwx_y7O^

delta 483
zcmbO%e^zcnK)rAOS*~USftL4nN9S;FjNF_zY4i4bN1Wvqrf<t|{PpibXP8do)7dr7
zbzwab4^<>XjKn-nNuQP8=_mZ`?*AVj@9&HM(Dr~WGw#FMhn=rK2=WLAtKY2gDc%3w
zvQqVFhSc6fsfx7+iY*mgrm!}4>Sr{w1!k|ZVKQ7$pvAxW%Ii#{o?|aw&GFCgao@Re
zZd2!c+5MIM1_fNHc`3yuMX8CoAXa`-7MH1lfdYs&G&Pv)%oxjTp<uCjDWf|#h%xyi
zPXVLx<Ro4l4l@H|19MX|<H^%_o3xC8nm|AyPk{@}FfcGO!w@qzGBBL%#HXrlWMYP)
z-WZE|Lo>6<S$wK?hM4M&jVuh%%`i4L#v*1h`757&d`e=XNvfftrIA5ua++z1MM{!s
xk_FH~DQ1?Y#s*2|c3d_Dl_<n2*x7Lvmn0UIR1~GAaT%K$7;veoy863u0RRXHnUw$l

diff --git a/Yep/Images.xcassets/icon_dot_unread.imageset/icon_dot_unread.pdf b/Yep/Images.xcassets/icon_dot_unread.imageset/icon_dot_unread.pdf
index 5982732eed37086b3cef8b4d32d2ed36984c58fa..a72b04830d76fc93ca123bf148a1ec550b512b34 100644
GIT binary patch
delta 640
zcmcaE_ey?3K>gI9-Fb%%c<y`^H5Z@Y{VFx{+cn)27x)DNmbeBfoS1O`y=R%s;#@9~
zwv&tdmMmF(?#4r&)rN=qn}p{~?(36{40n@BuRGYD`|Y)`og{bmq{uE|?kMrq3#U)I
z<8c4QwZ+#94&QTXYbm$!7kAz3(CbvVQde6k!#<3CZSj+$nb!B~A28<gzf1gA*w1l%
z?xhJyrwk2Fd}!v6b5`nEc4^%kt`h}&^Mdc%o}IWhXRFyR#>*1!?=JjZZ*}6q78Ob3
z75-BusR~RrYz+*$e%#r%^!hVR&feU4%YGl<Ww7%6i`zAt*U$faB~bX(A?`>0mc@76
zOy5fWEp*vD|HlrIL+7>j94eZj|CJ@K+3U4|*vZUi=8g-roH*x-d`<N=o>}VqGOfSd
z?)yfale){3&R^f~o2l)?<nD>@q?nBjj3;w5#<Ch3C>R=S&SrGyhA<~@<tbn^ovg;I
z!)a+`WMFP+ZfH3<nzupQ)WS%?00b2B6u7_)0|OI73v@AKV^g!qY<#L>#+H`oat5YG
zlPB^Crx_Vy%2;4A$pAy0v5B!cx?W=w3rsOn6NAaS`0V1%OwBCJ%*-u}(-ISnQ%wyF
zEYeaEEmIOx%@QqB4b2SfxNHb2QHWKrv*Ri*Nh~U<C`wJ^GBz_c=TcR5^>^a}0PWi4
A#Q*>R

delta 508
zcmaDQe_d`uK)r9jFV|rO0k`j#N4M)`r2mmDy(^q@m6=1eHG*TOeMwRm?};;)zw=s1
zr{x&P2=7TTu{byPn%}XhO<%v*$E|z$oL9a=;Fic5my?DsTn}7hKkq1FyXsmZyNuhF
z*hMBu!e1?a-4?Xwd3onjwex?b$b-_~kDps%eZor5NmJW%$s|pApA_#&6FfGA&)`Ul
z4eOrwRpZx^>SLSrD-!=PP5f`EGP#yfirLW2VDc=+SY|T?v(0}P-MK-G$sW7~jK-69
z^6GG!85kRwo0=J$PJYMRplxDos$c*D3V8}#V1|K#kvWE#v5}$S<e7Y`^+u*<80w9&
zs5dmnRA*vhjIP(%5Ys$kBTEAeb;c%OF#%+U8XH?0Pxj@vi%(5XOiMB~Hc2rtHb_Y`
zNHIz=Pf9j7vM@F<F)>dxFty{dA*e(lR>97WtGFbwsHCDOHI2*I)X;!SRn^tsjSB!q
CQ<)n8

diff --git a/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.xib b/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.xib
index 858290b1..7cdf7ee8 100644
--- a/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.xib
+++ b/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.xib
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="ChatRightAudioCell" id="gTV-IL-0wX" customClass="ChatRightAudioCell" customModule="Yep" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="3" width="316" height="105"/>
+            <rect key="frame" x="0.0" y="0.0" width="316" height="105"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                 <rect key="frame" x="0.0" y="0.0" width="316" height="105"/>
@@ -52,8 +53,8 @@
                         </subviews>
                         <animations/>
                     </view>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="dkr-y8-xRJ" userLabel="Dot Image View">
-                        <rect key="frame" x="95" y="50" width="6" height="6"/>
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="dkr-y8-xRJ" userLabel="Dot Image View">
+                        <rect key="frame" x="95" y="50" width="10" height="10"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <animations/>
                     </imageView>
@@ -76,13 +77,8 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="icon_dot_sending" width="8" height="8"/>
+        <image name="icon_dot_sending" width="10" height="10"/>
         <image name="icon_play" width="30" height="30"/>
         <image name="right_tail_bubble" width="48" height="40"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/Yep/Views/Cells/ChatRightImage/ChatRightImageCell.xib b/Yep/Views/Cells/ChatRightImage/ChatRightImageCell.xib
index 28e6f781..5549996a 100644
--- a/Yep/Views/Cells/ChatRightImage/ChatRightImageCell.xib
+++ b/Yep/Views/Cells/ChatRightImage/ChatRightImageCell.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -20,8 +21,8 @@
                         <rect key="frame" x="50" y="0.0" width="151" height="121"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     </imageView>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="C9m-E2-m8h" userLabel="Dot Image View">
-                        <rect key="frame" x="39" y="58" width="6" height="6"/>
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="C9m-E2-m8h" userLabel="Dot Image View">
+                        <rect key="frame" x="39" y="58" width="10" height="10"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     </imageView>
                 </subviews>
@@ -37,11 +38,6 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="icon_dot_sending" width="8" height="8"/>
+        <image name="icon_dot_sending" width="10" height="10"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/Yep/Views/Cells/ChatRightLocation/ChatRightLocationCell.xib b/Yep/Views/Cells/ChatRightLocation/ChatRightLocationCell.xib
index 9794c5be..f35c3bdc 100644
--- a/Yep/Views/Cells/ChatRightLocation/ChatRightLocationCell.xib
+++ b/Yep/Views/Cells/ChatRightLocation/ChatRightLocationCell.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -20,15 +21,15 @@
                         <rect key="frame" x="57" y="0.0" width="192" height="108"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     </imageView>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="eTJ-7c-9qB" userLabel="Dot Image View">
-                        <rect key="frame" x="46" y="56" width="6" height="6"/>
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="eTJ-7c-9qB" userLabel="Dot Image View">
+                        <rect key="frame" x="46" y="56" width="10" height="10"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="LcY-WJ-YG7" userLabel="Location Name Label">
                         <rect key="frame" x="77" y="88" width="152" height="20"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                 </subviews>
@@ -45,11 +46,6 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="icon_dot_sending" width="8" height="8"/>
+        <image name="icon_dot_sending" width="10" height="10"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/Yep/Views/Cells/ChatRightText/ChatRightTextCell.xib b/Yep/Views/Cells/ChatRightText/ChatRightTextCell.xib
index ce2c56bf..1b5fd1dc 100644
--- a/Yep/Views/Cells/ChatRightText/ChatRightTextCell.xib
+++ b/Yep/Views/Cells/ChatRightText/ChatRightTextCell.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -28,8 +29,8 @@
                         <animations/>
                         <color key="tintColor" red="0.80000001192092896" green="0.40000000596046448" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                     </imageView>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="tB7-GG-3Zd" userLabel="Dot Image View">
-                        <rect key="frame" x="310" y="62.5" width="6" height="6"/>
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="tB7-GG-3Zd" userLabel="Dot Image View">
+                        <rect key="frame" x="310" y="62.5" width="10" height="10"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <animations/>
                     </imageView>
@@ -69,11 +70,6 @@
     <resources>
         <image name="bubble_body" width="42" height="40"/>
         <image name="bubble_right_tail" width="13" height="14"/>
-        <image name="icon_dot_sending" width="8" height="8"/>
+        <image name="icon_dot_sending" width="10" height="10"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.xib b/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.xib
index b29b8373..caf44d1e 100644
--- a/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.xib
+++ b/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -27,8 +28,8 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <animations/>
                     </imageView>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="t6J-8M-Prm" userLabel="Dot Image View">
-                        <rect key="frame" x="52" y="55" width="6" height="6"/>
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="t6J-8M-Prm" userLabel="Dot Image View">
+                        <rect key="frame" x="52" y="55" width="10" height="10"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <animations/>
                     </imageView>
@@ -48,12 +49,7 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="icon_dot_sending" width="8" height="8"/>
+        <image name="icon_dot_sending" width="10" height="10"/>
         <image name="icon_playvideo" width="30" height="30"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>

From a641d1209983a1f5e129a6fa717cde296f9b704e Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 15:45:48 +0800
Subject: [PATCH 15/31] new messageToolBarHighlightColor

---
 Yep/Extensions/UIColor+Yep.swift              | 3 ++-
 Yep/Views/MessageToolbar/MessageToolbar.swift | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Yep/Extensions/UIColor+Yep.swift b/Yep/Extensions/UIColor+Yep.swift
index f3b681b9..eb018863 100644
--- a/Yep/Extensions/UIColor+Yep.swift
+++ b/Yep/Extensions/UIColor+Yep.swift
@@ -54,7 +54,8 @@ extension UIColor {
     }
 
     class func messageToolBarHighlightColor() -> UIColor {
-        return UIColor.yepTintColor()
+        //return UIColor.yepTintColor()
+        return UIColor(red:0.557, green:0.557, blue:0.576, alpha:1)
     }
 
     class func messageToolBarNormalColor() -> UIColor {
diff --git a/Yep/Views/MessageToolbar/MessageToolbar.swift b/Yep/Views/MessageToolbar/MessageToolbar.swift
index eab4f98c..fafe3b3e 100644
--- a/Yep/Views/MessageToolbar/MessageToolbar.swift
+++ b/Yep/Views/MessageToolbar/MessageToolbar.swift
@@ -156,7 +156,7 @@ class MessageToolbar: UIToolbar {
         textView.textContainerInset = UIEdgeInsets(top: 8, left: 4, bottom: 8, right: 4)
         textView.font = UIFont.systemFontOfSize(15)
         textView.layer.borderWidth = 1
-        textView.layer.borderColor = UIColor.messageToolBarHighlightColor().CGColor
+        textView.layer.borderColor = UIColor(red: 0.8, green: 0.8, blue: 0.8, alpha: 1.0).CGColor//UIColor.messageToolBarHighlightColor().CGColor
         textView.layer.cornerRadius = self.normalCornerRadius
         textView.delegate = self
         textView.scrollEnabled = false // 重要：若没有它，换行时可能有 top inset 不正确

From 9329e4e67ca3ca40f1a8b892fc6e20a011d4225f Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 15:52:23 +0800
Subject: [PATCH 16/31] tapToCollapseMessageToolBar

---
 .../Conversation/ConversationViewController.swift          | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index 9878029d..4579085e 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -262,6 +262,9 @@ class ConversationViewController: BaseViewController {
         
         conversationCollectionView.bounces = true
 
+        let tap = UITapGestureRecognizer(target: self, action: "tapToCollapseMessageToolBar:")
+        conversationCollectionView.addGestureRecognizer(tap)
+
         messageToolbarBottomConstraint.constant = 0
         moreMessageTypesViewHeightConstraint.constant = moreMessageTypesViewDefaultHeight
 
@@ -1202,6 +1205,10 @@ class ConversationViewController: BaseViewController {
 
     // MARK: Actions
 
+    func tapToCollapseMessageToolBar(sender: UITapGestureRecognizer) {
+        messageToolbar.state = .Default
+    }
+
     func checkTypingStatus() {
 
         typingResetDelay = typingResetDelay - 0.5

From 2d6d1c508e8f43e9d2aa3de4359658e30a8c7765 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 16:06:12 +0800
Subject: [PATCH 17/31] use conversationCollectionViewContentInsetYOffset

---
 .../Conversation/ConversationViewController.swift   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index 4579085e..1a81781e 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -121,6 +121,7 @@ class ConversationViewController: BaseViewController {
     let samplingInterval = 6
     
     @IBOutlet weak var conversationCollectionView: UICollectionView!
+    let conversationCollectionViewContentInsetYOffset: CGFloat = 10
 
     @IBOutlet weak var messageToolbar: MessageToolbar!
     @IBOutlet weak var messageToolbarBottomConstraint: NSLayoutConstraint!
@@ -262,6 +263,7 @@ class ConversationViewController: BaseViewController {
         
         conversationCollectionView.bounces = true
 
+
         let tap = UITapGestureRecognizer(target: self, action: "tapToCollapseMessageToolBar:")
         conversationCollectionView.addGestureRecognizer(tap)
 
@@ -920,10 +922,12 @@ class ConversationViewController: BaseViewController {
             dispatch_async(dispatch_get_main_queue()) { [weak self] in
 
                 UIView.animateWithDuration(0.2, delay: 0.1, options: UIViewAnimationOptions.CurveEaseInOut, animations: {
-                    self?.conversationCollectionView.contentInset.top = 64
+                    if let strongSelf = self {
+                        strongSelf.conversationCollectionView.contentInset.top = 64 + strongSelf.conversationCollectionViewContentInsetYOffset
 
-                    friendRequestViewTop.constant -= FriendRequestView.height
-                    self?.view.layoutIfNeeded()
+                        friendRequestViewTop.constant -= FriendRequestView.height
+                        strongSelf.view.layoutIfNeeded()
+                    }
 
                 }, completion: { _ in
                     friendRequestView.removeFromSuperview()
@@ -1025,6 +1029,9 @@ class ConversationViewController: BaseViewController {
     }
 
     private func setConversaitonCollectionViewOriginalContentInset() {
+
+        conversationCollectionView.contentInset.top = 64 + conversationCollectionViewContentInsetYOffset
+
         setConversaitonCollectionViewContentInsetBottom(CGRectGetHeight(messageToolbar.bounds) + sectionInsetBottom)
     }
 

From d9625df16872ddc5e071e65809b1875fc53df395 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 16:41:39 +0800
Subject: [PATCH 18/31] yepMessageToolbarSubviewBorderColor

---
 Yep/Extensions/UIColor+Yep.swift              |  7 ++++-
 Yep/Views/MessageToolbar/MessageToolbar.swift | 13 +++++----
 .../MessageToolbar/VoiceRecordButton.swift    | 27 +++++++++++++++++++
 Yep/en.lproj/Localizable.strings              |  2 ++
 Yep/zh-Hans.lproj/Localizable.strings         |  4 ++-
 5 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/Yep/Extensions/UIColor+Yep.swift b/Yep/Extensions/UIColor+Yep.swift
index eb018863..6695410c 100644
--- a/Yep/Extensions/UIColor+Yep.swift
+++ b/Yep/Extensions/UIColor+Yep.swift
@@ -25,6 +25,10 @@ extension UIColor {
         return UIColor(red: 0.557, green: 0.557, blue: 0.576, alpha: 1.0)
     }
 
+    class func yepMessageToolbarSubviewBorderColor() -> UIColor {
+        return UIColor(red: 0.8, green: 0.8, blue: 0.8, alpha: 1.0)
+    }
+
     class func avatarBackgroundColor() -> UIColor {
         return UIColor(red: 50/255.0, green: 167/255.0, blue: 255/255.0, alpha: 0.3)
     }
@@ -42,7 +46,8 @@ extension UIColor {
     }
 
     class func rightWaveColor() -> UIColor {
-        return UIColor(white: 0.0, alpha: 0.15)
+        //return UIColor(white: 0.0, alpha: 0.15)
+        return UIColor(red:0.176,  green:0.537,  blue:0.878, alpha:1)
     }
 
     class func skillMasterColor() -> UIColor {
diff --git a/Yep/Views/MessageToolbar/MessageToolbar.swift b/Yep/Views/MessageToolbar/MessageToolbar.swift
index fafe3b3e..b5d1b172 100644
--- a/Yep/Views/MessageToolbar/MessageToolbar.swift
+++ b/Yep/Views/MessageToolbar/MessageToolbar.swift
@@ -156,7 +156,7 @@ class MessageToolbar: UIToolbar {
         textView.textContainerInset = UIEdgeInsets(top: 8, left: 4, bottom: 8, right: 4)
         textView.font = UIFont.systemFontOfSize(15)
         textView.layer.borderWidth = 1
-        textView.layer.borderColor = UIColor(red: 0.8, green: 0.8, blue: 0.8, alpha: 1.0).CGColor//UIColor.messageToolBarHighlightColor().CGColor
+        textView.layer.borderColor = UIColor.yepMessageToolbarSubviewBorderColor().CGColor
         textView.layer.cornerRadius = self.normalCornerRadius
         textView.delegate = self
         textView.scrollEnabled = false // 重要：若没有它，换行时可能有 top inset 不正确
@@ -169,7 +169,7 @@ class MessageToolbar: UIToolbar {
         button.backgroundColor = UIColor.whiteColor()
         button.layer.cornerRadius = self.normalCornerRadius
         button.layer.borderWidth = 1
-        button.layer.borderColor = UIColor.messageToolBarHighlightColor().CGColor
+        button.layer.borderColor = UIColor.yepMessageToolbarSubviewBorderColor().CGColor
         button.tintColor = UIColor.messageToolBarHighlightColor()
 
         button.touchesBegin = { [weak self] in
@@ -389,17 +389,20 @@ class MessageToolbar: UIToolbar {
     }
 
     func tryVoiceRecordBegin() {
-        voiceRecordButton.backgroundColor = UIColor.lightGrayColor()
+        //voiceRecordButton.backgroundColor = UIColor.lightGrayColor()
+        voiceRecordButton.stateTintColor = UIColor.yepTintColor()
         voiceRecordBeginAction?(messageToolBar: self)
     }
     
     func tryVoiceRecordEnd() {
-        voiceRecordButton.backgroundColor = UIColor.whiteColor()
+        //voiceRecordButton.backgroundColor = UIColor.whiteColor()
+        voiceRecordButton.stateTintColor = UIColor.yepMessageToolbarSubviewBorderColor()
         voiceRecordEndAction?(messageToolBar: self)
     }
     
     func tryVoiceRecordCancel() {
-        voiceRecordButton.backgroundColor = UIColor.whiteColor()
+        //voiceRecordButton.backgroundColor = UIColor.whiteColor()
+        voiceRecordButton.stateTintColor = UIColor.yepMessageToolbarSubviewBorderColor()
         voiceRecordCancelAction?(messageToolBar: self)
     }
     
diff --git a/Yep/Views/MessageToolbar/VoiceRecordButton.swift b/Yep/Views/MessageToolbar/VoiceRecordButton.swift
index 31298cbf..6c7239f8 100644
--- a/Yep/Views/MessageToolbar/VoiceRecordButton.swift
+++ b/Yep/Views/MessageToolbar/VoiceRecordButton.swift
@@ -20,24 +20,45 @@ class VoiceRecordButton: UIView {
 
     var abort = false
 
+    var titleLabel: UILabel?
+    var leftVoiceImageView: UIImageView?
+    var rightVoiceImageView: UIImageView?
+
+    var stateTintColor: UIColor? {
+        willSet {
+            if let color = newValue {
+                layer.borderColor = color.CGColor
+                titleLabel?.textColor = color
+                leftVoiceImageView?.tintColor = color
+                rightVoiceImageView?.tintColor = color
+            }
+        }
+    }
+
     override func touchesBegan(touches: Set<UITouch>, withEvent event: UIEvent?) {
         super.touchesBegan(touches, withEvent: event)
 
         abort = false
         
         touchesBegin?()
+
+        titleLabel?.text = NSLocalizedString("Release to Send", comment: "")
     }
     
     override func touchesEnded(touches: Set<UITouch>, withEvent event: UIEvent?) {
         super.touchesEnded(touches, withEvent: event)
         
         touchesEnded?(needAbort: abort)
+
+        titleLabel?.text = NSLocalizedString("Hold for Voice", comment: "")
     }
     
     override func touchesCancelled(touches: Set<UITouch>?, withEvent event: UIEvent?) {
         super.touchesCancelled(touches, withEvent: event)
         
         touchesCancelled?()
+
+        titleLabel?.text = NSLocalizedString("Hold for Voice", comment: "")
     }
     
     override func touchesMoved(touches: Set<UITouch>, withEvent event: UIEvent?) {
@@ -66,6 +87,8 @@ class VoiceRecordButton: UIView {
         titleLabel.textAlignment = .Center
         titleLabel.textColor = self.tintColor
 
+        self.titleLabel = titleLabel
+
         self.addSubview(titleLabel)
         titleLabel.translatesAutoresizingMaskIntoConstraints = false
 
@@ -73,6 +96,8 @@ class VoiceRecordButton: UIView {
         leftVoiceImageView.contentMode = .Center
         leftVoiceImageView.tintColor = self.tintColor
 
+        self.leftVoiceImageView = leftVoiceImageView
+
         self.addSubview(leftVoiceImageView)
         leftVoiceImageView.translatesAutoresizingMaskIntoConstraints = false
 
@@ -80,6 +105,8 @@ class VoiceRecordButton: UIView {
         rightVoiceImageView.contentMode = .Center
         rightVoiceImageView.tintColor = self.tintColor
 
+        self.rightVoiceImageView = rightVoiceImageView
+
         self.addSubview(rightVoiceImageView)
         rightVoiceImageView.translatesAutoresizingMaskIntoConstraints = false
 
diff --git a/Yep/en.lproj/Localizable.strings b/Yep/en.lproj/Localizable.strings
index b8aa18a2..03fdcd63 100644
--- a/Yep/en.lproj/Localizable.strings
+++ b/Yep/en.lproj/Localizable.strings
@@ -616,3 +616,5 @@
 
 /* No comment provided by engineer. */
 "Set username failed!" = "Set username failed!";
+
+"Release to Send" = "Release to Send";
diff --git a/Yep/zh-Hans.lproj/Localizable.strings b/Yep/zh-Hans.lproj/Localizable.strings
index 4bee50ce..46a86547 100644
--- a/Yep/zh-Hans.lproj/Localizable.strings
+++ b/Yep/zh-Hans.lproj/Localizable.strings
@@ -203,7 +203,7 @@
 "Meet with genius" = "Meet with genius";
 
 /* No comment provided by engineer. */
-"Hold for Voice" = "长按录制声音";
+"Hold for Voice" = "按住 录音";
 
 /* No comment provided by engineer. */
 "Input verification code sent to" = "输入收到的短信验证码";
@@ -618,3 +618,5 @@
 
 /* No comment provided by engineer. */
 "Set username failed!" = "设置用户名失败！";
+
+"Release to Send" = "松开 发送";

From eb6fde339a2bd741f43b6624afe725b19a5d1679 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 16:48:09 +0800
Subject: [PATCH 19/31] new dots

---
 .../icon_dot_failed.pdf                       | Bin 4074 -> 3925 bytes
 .../icon_dot_sending.pdf                      | Bin 3987 -> 3923 bytes
 .../icon_dot_unread.pdf                       | Bin 4074 -> 3931 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/Yep/Images.xcassets/icon_dot_failed.imageset/icon_dot_failed.pdf b/Yep/Images.xcassets/icon_dot_failed.imageset/icon_dot_failed.pdf
index 996c1ef9aaf059ced6dd4bd3ed44d7ea7f25fc2a..36f5a5b94647d62f0ab0f4bb880eed5c9ab7f944 100644
GIT binary patch
delta 475
zcmaDQe^qWmK)rAOMXtjNJg)bDi+-;RNEhn;RvCX`d96cY$%5uf|J#?Y+tH-rex7#*
zud!Lr6q^WJEtlZMmoijl2Gsp~@^x0-y$_Boi}_xeWc3}?lYFGY!D`wQv8L?yLxY=l
zR8QHO70iCT|Lw-Z8_up>8@@%qVtK{me>XT!^EH+GO#U^cS3^KmviI=51d$0hCWXD3
zviQd2x8>hN_0Pl~K4{)Nxt39i+0fKv^DIVx9u^A|6XVHmc^kD&jExlxKtLf+feXwq
zFfcN+L>DtQGBBS!lTWqY$kYH`&cN8*5M9jJ(A)@J%)rDL(_BMS40Xmv78dAwjg5`L
zVgkqxH8!?1ob1bQ7oTEcVPKqWn4DygXkubwo|clFn38N_XlZPbY?6{{Ze+)0Lr{rA
etb&~#S8+*VQAtHnY8scZseuKTs;aBM8y5i5iI^_{

delta 646
zcmcaA_ey?3Kz(n}?!3bW0=K`4&f)gB`f{yh^mYYj`vVRW#rzr+oa^`7SZ*{H$xQrR
zVpM6<d5N_;CP7v0$g4sp52H<$DP~`~Di7xW{5bLNzb50Hw;f0CWO4u0N>a^K-Kg8m
z6_g;d;iks-bq|Es?_Qm-%SpklU~WP*Q)<Z8j76(jqhdolb#K-S%KMim{M*{xbHMHB
z)R-v0IVLXR!6IcjCuT^zU$Il2IrE6zio~UXF0T)@tut|D+PFCK*S}Xy<&IS!w;r_i
zRNDIFp;wE`x~Yxt*BmS|;jy}O=Xu?OeETz!kBs(Jisb*<x1-@}LmB(IZLL$^RDbUL
zU!}Y9SJUCX>z)sOMmX|q@bo!T!eqHCD|~l;>Opz6&b*2!@tWy3%%hU$TCFLJE4+NH
z@Xm=-GYcN*-uTaudUGNlS885LaY<2XVlIf4pOnRAs$if1qKyrVH?uPO^RSp3nj21z
z;BC}4wJ=gJ00D(O1uihdz`(@N0$t45*wkz?3!iGev85%toPnv40lJv6v5_IVn1QJU
z7IO_S)ES!?o1^PBHn9MU2_QSv*wn;e@(w<`cndQ_v&3YB<U|8ALklA_^Tbq3GjoH)
t#I!{7<fNn|b2}~@f=U!(73}P|ic1oUN-By{)3}VyOwGAeRbBnvxBvnn<~{%b

diff --git a/Yep/Images.xcassets/icon_dot_sending.imageset/icon_dot_sending.pdf b/Yep/Images.xcassets/icon_dot_sending.imageset/icon_dot_sending.pdf
index d83e3d928058f063a23795ecb05e76660286365a..d5fadbd801b0d1316cb9aea266b70ebbd93eebd1 100644
GIT binary patch
delta 494
zcmbO%e_3uqK)rAOUcP1no|f`?kDhr2SaYh)++6C+Q`?}E%Q`ineV?7Xgu}Eo*7eis
z!+IhvS}p&e6)|J&s-3IM)XuQmJ$ZfW_nwE`Z>#<+Jj>k0zr=V?;dy)4c`xRuO;&vO
zH7;n1!&ElzW{G8Iu5u-A;cD+V^mjtq!vOg`Y^y&c*>HI`9@hD0@-XM|S%Xcs=he3#
z(`(z3@aXVkHYp`Tajw+7l;V=2)Wlp6D?cfV%T&QY0Yn>`8f|uF^ygu<FflQ<oIIVk
zQOnp+!2kpl@)Wqh3<CorGjnt?V<Q98$xeK#^+qNZ=yC?eW|rt;#)jqw=wb#Y#+c?B
znqsIkHnK27*K2HS3>FhWcBrwjh2`XLe0K3hrlyvr=Elb6$;PQ>NvQ?~=7xqQCZ?t-
shKWXoNvVc*Ts8!iD8wq**>M$@Bo>ua6s4wd8JilIajB}h`nz!f0HVN_N&o-=

delta 569
zcmcaCH(7o{K>gGJ!@R==Ja@i!&E~!#s@pj&E&nDHe`Q01lI|R)#`YR}b*s!hB^)fA
z?w{VdeCkqO_d-Se$ic@<n)fawt&o1yk-FOcL*;q9+6U7MKXAM<D-7V8<*j~kiO#zP
zQ)jnl{#Y3KBkp7G`ApF(qK{abwwj6k7Ro;DQ0(V3{p?T9^FMyor}KS3CUZ&s&X13c
z-`RIhTQ>8eg6rQIvY$^*f1_NSdc~sZs7+xf)A`GsY$;c`nUvQp;WzXM(SFy|@M=fq
ztW3X;uEDQFuHJhZ8m{*LL~pQR@sr20o6kkv;!4d+DK05WP0R(c@{_W-Oce|iK(vve
z8BEAX!C*5VqYDqKxskbv>Ev+UMlDOAG7wP6Q{VzK3=E8o4bjDnjm#`3Gx4d`8yf=6
zKvQpGY>X~uY-DVLE@ohAfW=%x40XoFrUvMGjZJ_q1X?SA>`-G9Q{&0o`0U~hEi6(K
zjgnJMQd1I5larDxlT(b1jV#O!Q!I^AO^j3RxNHb2QHWKrv*Ri*Nh~U<C`wJ^GB!0g
M;8Im}^>^a}0Fs!#fB*mh

diff --git a/Yep/Images.xcassets/icon_dot_unread.imageset/icon_dot_unread.pdf b/Yep/Images.xcassets/icon_dot_unread.imageset/icon_dot_unread.pdf
index a72b04830d76fc93ca123bf148a1ec550b512b34..7ec0372736641bb490740980d80a467ab0ffd30b 100644
GIT binary patch
delta 481
zcmaDQe_L)sK)r9jH`ieU9+&TyN7rx{e%&ZqeOEZ;Dl>~0m#5;Be*s5%^A7YJt5Z(Q
zmDsrO`5^)2H5W3j>R$c2hV^v+{JMS1=9||{P>8VRo~E<>#dIECsj0OgWmY@QZk=)5
zwAni(YR%+Z>h-sh*ahFu&W;V-?{M(LvA-LQm&uB>bYGlsH*(P=dCfABQwfC%hwT=I
zZ}_!IuWp+2pOfEhUiXL})9(tmG@M+^D8+1OX0Uk{qdyOeg^7vr<hQ(y+9t-93I-sc
zkf*=}W*8V4nVX`E85<cIPoBxAT5n`(hAwAdY;KM&W^8C~fi7lXVuER|p(%zsV<Srw
zbiKyLCSWlEWQQ6XTbfVy<+qDBO*Kq3wlp?PwKOzKvPeucv`jTOG%zwSPfj&7Gfy(L
k<FX;BL?Kqe&W@|NB(bQZq9`?u%h=S=giBS`)!&T^0Bbmuy8r+H

delta 624
zcmcaD_ey?3K>gI9-Fb%%c<y`^H5Z@Y{VFx{+cn)27x)DNmbeBfoS1O`y=R%s;#@9~
zwv&tdmMmF(?#4r&)rN=qn}p{~?(36{40n@BuRGYD`|Y)`og{bmq{uE|?kMrq3#U)I
z<8c4QwZ+#94&QTXYbm$!7kAz3(CbvVQde6k!#<3CZSj+$nb!B~A28<gzf1gA*w1l%
z?xhJyrwk2Fd}!v6b5`nEc4^%kt`h}&^Mdc%o}IWhXRFyR#>*1!?=JjZZ*}6q78Ob3
z75-BusR~RrYz+*$e%#r%^!hVR&feU4%YGl<Ww7%6i`zAt*U$faB~bX(A?`>0mc@76
zOy5fWEp*vD|HlrIL+7>j94eZj|CJ@K+3U4|*vZUi=8g-roH*x-d`<N=o>}VqGOfSd
z?)yfale){3&R^f~o2l)?<nD>@q?nBjj5l*L`tz`u8=4zVj^l0AHnlKPFaQCCJOwT=
z!@$7A&;nh|*x1x;G8dm}y|JYwx}1Tjkpa4xv9XaMx|o5f1r~D+Fw_~F7@MQ(H8!yT
ziwPh*)Y#O-VDdgbyLdBGGYc~_a|`3N#6;s%Qv(Bww3I~4l*ClCM9Wk|GXpy=8-hv{
eVioM{xQa^>i%KerQq#DM%}mX?R8?L5-M9dwJ>dxe


From a8f8ce09fc4f5fc48a480705ea5d1fe179bfdff8 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 16:57:59 +0800
Subject: [PATCH 20/31] DoNotDisturbPeriodRow.Switch height

---
 .../Notifications/NotificationsViewController.swift             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Yep/ViewControllers/Notifications/NotificationsViewController.swift b/Yep/ViewControllers/Notifications/NotificationsViewController.swift
index a1e8a4a9..36ba84f4 100644
--- a/Yep/ViewControllers/Notifications/NotificationsViewController.swift
+++ b/Yep/ViewControllers/Notifications/NotificationsViewController.swift
@@ -339,7 +339,7 @@ extension NotificationsViewController: UITableViewDataSource, UITableViewDelegat
             switch indexPath.row {
 
             case DoNotDisturbPeriodRow.Switch.rawValue:
-                return 44
+                return 60
 
             case DoNotDisturbPeriodRow.Period.rawValue:
                 return 60

From cc4ff3f8c698ce52c127e1098d9f4b766d7423d5 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 17:06:55 +0800
Subject: [PATCH 21/31] checkImageView for DiscoverFilterCell

---
 .../DiscoverFilter/DiscoverFilterView.swift   | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/Yep/Views/DiscoverFilter/DiscoverFilterView.swift b/Yep/Views/DiscoverFilter/DiscoverFilterView.swift
index 3a23842d..268994b3 100644
--- a/Yep/Views/DiscoverFilter/DiscoverFilterView.swift
+++ b/Yep/Views/DiscoverFilter/DiscoverFilterView.swift
@@ -26,11 +26,9 @@ class DiscoverFilterCell: UITableViewCell {
         return label
         }()
 
-    lazy var checkLabel: UILabel = {
-        let label = UILabel()
-        label.text = "✓"
-        label.textColor = UIColor.yepTintColor()
-        return label
+    lazy var checkImageView: UIImageView = {
+        let imageView = UIImageView(image: UIImage(named: "icon_location_checkmark"))
+        return imageView
         }()
 
     var colorTitleLabelTextColor: UIColor = UIColor.yepTintColor() {
@@ -58,9 +56,9 @@ class DiscoverFilterCell: UITableViewCell {
     func makeUI() {
 
         contentView.addSubview(colorTitleLabel)
-        contentView.addSubview(checkLabel)
+        contentView.addSubview(checkImageView)
         colorTitleLabel.translatesAutoresizingMaskIntoConstraints = false
-        checkLabel.translatesAutoresizingMaskIntoConstraints = false
+        checkImageView.translatesAutoresizingMaskIntoConstraints = false
 
         let centerY = NSLayoutConstraint(item: colorTitleLabel, attribute: .CenterY, relatedBy: .Equal, toItem: contentView, attribute: .CenterY, multiplier: 1, constant: 0)
         let centerX = NSLayoutConstraint(item: colorTitleLabel, attribute: .CenterX, relatedBy: .Equal, toItem: contentView, attribute: .CenterX, multiplier: 1, constant: 0)
@@ -68,10 +66,10 @@ class DiscoverFilterCell: UITableViewCell {
         NSLayoutConstraint.activateConstraints([centerY, centerX])
 
 
-        let checkLabelCenterY = NSLayoutConstraint(item: checkLabel, attribute: .CenterY, relatedBy: .Equal, toItem: contentView, attribute: .CenterY, multiplier: 1, constant: 0)
-        let checkLabelTrailing = NSLayoutConstraint(item: checkLabel, attribute: .Trailing, relatedBy: .Equal, toItem: contentView, attribute: .Trailing, multiplier: 1, constant: -20)
+        let checkImageViewCenterY = NSLayoutConstraint(item: checkImageView, attribute: .CenterY, relatedBy: .Equal, toItem: contentView, attribute: .CenterY, multiplier: 1, constant: 0)
+        let checkImageViewTrailing = NSLayoutConstraint(item: checkImageView, attribute: .Trailing, relatedBy: .Equal, toItem: contentView, attribute: .Trailing, multiplier: 1, constant: -20)
 
-        NSLayoutConstraint.activateConstraints([checkLabelCenterY, checkLabelTrailing])
+        NSLayoutConstraint.activateConstraints([checkImageViewCenterY, checkImageViewTrailing])
     }
 
 }
@@ -269,7 +267,7 @@ extension DiscoverFilterView: UITableViewDataSource, UITableViewDelegate {
                 cell.colorTitleLabelTextColor = UIColor.yepTintColor()
                 cell.colorTitleLabelFontStyle = .Light
 
-                cell.checkLabel.hidden = !(currentDiscoveredUserSortStyle == .Distance)
+                cell.checkImageView.hidden = !(currentDiscoveredUserSortStyle == .Distance)
 
                 return cell
 
@@ -281,7 +279,7 @@ extension DiscoverFilterView: UITableViewDataSource, UITableViewDelegate {
                 cell.colorTitleLabelTextColor = UIColor.yepTintColor()
                 cell.colorTitleLabelFontStyle = .Light
 
-                cell.checkLabel.hidden = !(currentDiscoveredUserSortStyle == .LastSignIn)
+                cell.checkImageView.hidden = !(currentDiscoveredUserSortStyle == .LastSignIn)
 
                 return cell
 
@@ -293,7 +291,7 @@ extension DiscoverFilterView: UITableViewDataSource, UITableViewDelegate {
                 cell.colorTitleLabelTextColor = UIColor.yepTintColor()
                 cell.colorTitleLabelFontStyle = .Light
 
-                cell.checkLabel.hidden = !(currentDiscoveredUserSortStyle == .Default)
+                cell.checkImageView.hidden = !(currentDiscoveredUserSortStyle == .Default)
 
                 return cell
 

From 2f9873d42595a8dc9f55b39636787cdd0b26fc43 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 17:10:26 +0800
Subject: [PATCH 22/31] all use icon_accessory_mini

---
 Yep/Views/Cells/About/AboutCell.xib           | 15 +++++------
 .../Cells/AddFriendMore/AddFriendMoreCell.xib | 17 +++++++------
 .../DoNotDisturb/DoNotDisturbPeriodCell.xib   | 25 ++++++++++---------
 .../EditProfileLessInfoCell.xib               | 15 +++++------
 .../Cells/SettingsMore/SettingsMoreCell.xib   | 15 +++++------
 .../Cells/SettingsUser/SettingsUserCell.xib   | 19 +++++++-------
 .../ProfileSectionHeaderReusableView.xib      |  5 ++--
 7 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/Yep/Views/Cells/About/AboutCell.xib b/Yep/Views/Cells/About/AboutCell.xib
index 46959dd7..79e2d535 100644
--- a/Yep/Views/Cells/About/AboutCell.xib
+++ b/Yep/Views/Cells/About/AboutCell.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -10,17 +11,17 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Va3-0s-Lh3">
-                        <rect key="frame" x="139" y="11" width="42" height="21"/>
+                        <rect key="frame" x="139" y="11" width="42" height="20.5"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.20000000298023224" green="0.20000000298023224" blue="0.20000000298023224" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory" translatesAutoresizingMaskIntoConstraints="NO" id="Ol2-AJ-ZKk" userLabel="Accessory Image View">
-                        <rect key="frame" x="289" y="12" width="11" height="20"/>
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory_mini" translatesAutoresizingMaskIntoConstraints="NO" id="Ol2-AJ-ZKk" userLabel="Accessory Image View">
+                        <rect key="frame" x="292" y="15.5" width="8" height="13"/>
                     </imageView>
                 </subviews>
                 <constraints>
@@ -37,6 +38,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="icon_accessory" width="11" height="20"/>
+        <image name="icon_accessory_mini" width="8" height="13"/>
     </resources>
 </document>
diff --git a/Yep/Views/Cells/AddFriendMore/AddFriendMoreCell.xib b/Yep/Views/Cells/AddFriendMore/AddFriendMoreCell.xib
index 008e7d78..1dec7b8d 100644
--- a/Yep/Views/Cells/AddFriendMore/AddFriendMoreCell.xib
+++ b/Yep/Views/Cells/AddFriendMore/AddFriendMoreCell.xib
@@ -1,7 +1,8 @@
 <?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="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -10,17 +11,17 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="More" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rFJ-sX-tIW" userLabel="Annotation Label">
-                        <rect key="frame" x="20" y="11" width="40" height="22"/>
+                        <rect key="frame" x="20" y="11.5" width="41.5" height="21.5"/>
                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="18"/>
-                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory" translatesAutoresizingMaskIntoConstraints="NO" id="kCv-aC-1z1" userLabel="Accessory Image View">
-                        <rect key="frame" x="289" y="12" width="11" height="20"/>
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory_mini" translatesAutoresizingMaskIntoConstraints="NO" id="kCv-aC-1z1" userLabel="Accessory Image View">
+                        <rect key="frame" x="292" y="15.5" width="8" height="13"/>
                     </imageView>
                 </subviews>
                 <constraints>
@@ -38,6 +39,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="icon_accessory" width="11" height="20"/>
+        <image name="icon_accessory_mini" width="8" height="13"/>
     </resources>
 </document>
diff --git a/Yep/Views/Cells/DoNotDisturb/DoNotDisturbPeriodCell.xib b/Yep/Views/Cells/DoNotDisturb/DoNotDisturbPeriodCell.xib
index a191827b..1cb371c0 100644
--- a/Yep/Views/Cells/DoNotDisturb/DoNotDisturbPeriodCell.xib
+++ b/Yep/Views/Cells/DoNotDisturb/DoNotDisturbPeriodCell.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
         <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
     </dependencies>
     <objects>
@@ -11,39 +12,39 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="79"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="78.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="From" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Enb-xl-VLt">
-                        <rect key="frame" x="20" y="17" width="40.5" height="21.5"/>
+                        <rect key="frame" x="20" y="17" width="41.5" height="21.5"/>
                         <animations/>
                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="18"/>
-                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GaZ-e1-aRj">
-                        <rect key="frame" x="20" y="39" width="18.5" height="21.5"/>
+                        <rect key="frame" x="20" y="39" width="19.5" height="21.5"/>
                         <animations/>
                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="18"/>
-                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="22:00" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Un-Ye-CSh">
-                        <rect key="frame" x="236" y="18" width="43" height="20.5"/>
+                        <rect key="frame" x="236.5" y="18" width="45.5" height="20.5"/>
                         <animations/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="07:00" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TZm-zG-HSh">
-                        <rect key="frame" x="236" y="39" width="43" height="20.5"/>
+                        <rect key="frame" x="237.5" y="39" width="44.5" height="20.5"/>
                         <animations/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory" translatesAutoresizingMaskIntoConstraints="NO" id="79s-Vw-btR">
-                        <rect key="frame" x="289" y="30" width="11" height="20"/>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory_mini" translatesAutoresizingMaskIntoConstraints="NO" id="79s-Vw-btR">
+                        <rect key="frame" x="292" y="33.5" width="8" height="13"/>
                     </imageView>
                 </subviews>
                 <animations/>
@@ -72,6 +73,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="icon_accessory" width="11" height="20"/>
+        <image name="icon_accessory_mini" width="8" height="13"/>
     </resources>
 </document>
diff --git a/Yep/Views/Cells/EditProfileLessInfo/EditProfileLessInfoCell.xib b/Yep/Views/Cells/EditProfileLessInfo/EditProfileLessInfoCell.xib
index 50b382a7..389408b3 100644
--- a/Yep/Views/Cells/EditProfileLessInfo/EditProfileLessInfoCell.xib
+++ b/Yep/Views/Cells/EditProfileLessInfo/EditProfileLessInfoCell.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="15A204h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -10,17 +11,17 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="88"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="87.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Annotation" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0FC-Jf-4Gf" userLabel="Annotation Label">
-                        <rect key="frame" x="20" y="33" width="84" height="22"/>
+                        <rect key="frame" x="20" y="33.5" width="87.5" height="21.5"/>
                         <animations/>
                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="18"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory" translatesAutoresizingMaskIntoConstraints="NO" id="0NC-W7-akb" userLabel="Accessory Image View">
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory_mini" translatesAutoresizingMaskIntoConstraints="NO" id="0NC-W7-akb" userLabel="Accessory Image View">
                         <rect key="frame" x="289" y="34" width="11" height="20"/>
                         <animations/>
                         <constraints>
@@ -33,7 +34,7 @@
                         <animations/>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Info" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fGP-fu-MyB" userLabel="Info Label">
-                        <rect key="frame" x="114" y="33" width="129" height="22"/>
+                        <rect key="frame" x="117.5" y="33.5" width="125.5" height="21.5"/>
                         <animations/>
                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="18"/>
                         <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
@@ -66,6 +67,6 @@
     </objects>
     <resources>
         <image name="badge_heart" width="30" height="30"/>
-        <image name="icon_accessory" width="11" height="20"/>
+        <image name="icon_accessory_mini" width="8" height="13"/>
     </resources>
 </document>
diff --git a/Yep/Views/Cells/SettingsMore/SettingsMoreCell.xib b/Yep/Views/Cells/SettingsMore/SettingsMoreCell.xib
index 0785f1b2..f47cacfb 100644
--- a/Yep/Views/Cells/SettingsMore/SettingsMoreCell.xib
+++ b/Yep/Views/Cells/SettingsMore/SettingsMoreCell.xib
@@ -1,7 +1,8 @@
 <?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="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -10,16 +11,16 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="72"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="71.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="More" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rWz-Jb-Xgj" userLabel="Annotation Label">
-                        <rect key="frame" x="20" y="25" width="40" height="22"/>
+                        <rect key="frame" x="20" y="25.5" width="41.5" height="21.5"/>
                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="18"/>
-                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory" translatesAutoresizingMaskIntoConstraints="NO" id="g81-Zw-MIi" userLabel="Accessory Image View">
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory_mini" translatesAutoresizingMaskIntoConstraints="NO" id="g81-Zw-MIi" userLabel="Accessory Image View">
                         <rect key="frame" x="289" y="26" width="11" height="20"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="Vcq-kU-dBt"/>
@@ -43,6 +44,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="icon_accessory" width="11" height="20"/>
+        <image name="icon_accessory_mini" width="8" height="13"/>
     </resources>
 </document>
diff --git a/Yep/Views/Cells/SettingsUser/SettingsUserCell.xib b/Yep/Views/Cells/SettingsUser/SettingsUserCell.xib
index fa0e61be..a2d8fc75 100644
--- a/Yep/Views/Cells/SettingsUser/SettingsUserCell.xib
+++ b/Yep/Views/Cells/SettingsUser/SettingsUserCell.xib
@@ -1,7 +1,8 @@
 <?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="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
     </dependencies>
     <objects>
@@ -11,7 +12,7 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="123"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="122.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ibs-9N-MGR" userLabel="Avatar Image View">
@@ -22,18 +23,18 @@
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="NIX" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gbe-2T-8A9" userLabel="Name Label">
-                        <rect key="frame" x="120" y="30" width="27" height="22"/>
+                        <rect key="frame" x="120" y="30" width="28.5" height="21.5"/>
                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="18"/>
-                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VeK-Pq-9Rc" userLabel="Intro Label">
-                        <rect key="frame" x="120" y="60" width="29" height="15"/>
+                        <rect key="frame" x="120" y="59.5" width="30.5" height="14.5"/>
                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="12"/>
-                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory" translatesAutoresizingMaskIntoConstraints="NO" id="8aX-g5-iad" userLabel="Accessory Image View">
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory_mini" translatesAutoresizingMaskIntoConstraints="NO" id="8aX-g5-iad" userLabel="Accessory Image View">
                         <rect key="frame" x="289" y="51" width="11" height="20"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="JYu-OH-0FU"/>
@@ -65,6 +66,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="icon_accessory" width="11" height="20"/>
+        <image name="icon_accessory_mini" width="8" height="13"/>
     </resources>
 </document>
diff --git a/Yep/Views/ReusableViews/ProfileSectionHeader/ProfileSectionHeaderReusableView.xib b/Yep/Views/ReusableViews/ProfileSectionHeader/ProfileSectionHeaderReusableView.xib
index 2ebb5ccc..16d86e7c 100644
--- a/Yep/Views/ReusableViews/ProfileSectionHeader/ProfileSectionHeaderReusableView.xib
+++ b/Yep/Views/ReusableViews/ProfileSectionHeader/ProfileSectionHeaderReusableView.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>

From d7cdf7c524bf6445c25bdb0abb7714519907b11f Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 17:15:15 +0800
Subject: [PATCH 23/31] Feedback bottomMargin

---
 Yep/Configs/YepConfig.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Yep/Configs/YepConfig.swift b/Yep/Configs/YepConfig.swift
index 9a8e1ae7..ef758ca5 100644
--- a/Yep/Configs/YepConfig.swift
+++ b/Yep/Configs/YepConfig.swift
@@ -192,7 +192,7 @@ class YepConfig {
     }
 
     struct Feedback {
-        static let bottomMargin: CGFloat = 20
+        static let bottomMargin: CGFloat = Ruler.iPhoneVertical(10, 20, 40, 40).value
     }
 
     struct Location {

From 00a65db991bd02785b72d32708cb79b4088c28da Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 17:32:04 +0800
Subject: [PATCH 24/31] FeedbackTextView

---
 Yep/Base.lproj/Main.storyboard                | 50 +++++++++++--------
 .../Feedback/FeedbackViewController.swift     | 50 ++++++++++++++++++-
 .../Profile/ProfileViewController.swift       |  4 --
 3 files changed, 78 insertions(+), 26 deletions(-)

diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard
index 9ff65c5a..4f7235fc 100644
--- a/Yep/Base.lproj/Main.storyboard
+++ b/Yep/Base.lproj/Main.storyboard
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" 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="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Ha4-ol-D2e">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
         <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
@@ -77,7 +78,7 @@
                                 <rect key="frame" x="0.0" y="270" width="600" height="100"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Swipe Up to Cancel" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zew-F7-znc">
-                                        <rect key="frame" x="235.5" y="62" width="129.5" height="18"/>
+                                        <rect key="frame" x="234" y="62" width="132.5" height="18"/>
                                         <animations/>
                                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="15"/>
                                         <color key="textColor" red="1" green="0.0" blue="0.23529411764705882" alpha="1" colorSpace="calibratedRGB"/>
@@ -122,7 +123,7 @@
                                         </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">
-                                        <rect key="frame" x="213.5" y="20" width="173" height="260"/>
+                                        <rect key="frame" x="213" y="20" width="173" height="260"/>
                                         <animations/>
                                         <state key="normal">
                                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -133,7 +134,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hg3-Ss-sqD" userLabel="Add Location Button" customClass="MessageTypeButton" customModule="Yep" customModuleProvider="target">
-                                        <rect key="frame" x="406.5" y="20" width="173.5" height="260"/>
+                                        <rect key="frame" x="406" y="20" width="173.5" height="260"/>
                                         <animations/>
                                         <state key="normal">
                                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -899,18 +900,18 @@
                                             </connections>
                                         </imageView>
                                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_profile_phone" translatesAutoresizingMaskIntoConstraints="NO" id="xcV-T4-317" userLabel="Phone Image View">
-                                            <rect key="frame" x="229" y="178" width="16" height="24"/>
+                                            <rect key="frame" x="227" y="178" width="16" height="24"/>
                                             <animations/>
                                         </imageView>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="186-0235-4812" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bhV-NM-wXG" userLabel="Mobile Label">
-                                            <rect key="frame" x="253" y="180" width="119" height="21"/>
+                                            <rect key="frame" x="251" y="180.5" width="123" height="20.5"/>
                                             <animations/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zc6-4l-BNt" userLabel="Helper View">
-                                            <rect key="frame" x="229" y="175" width="143" height="30"/>
+                                            <rect key="frame" x="227" y="175" width="147" height="30"/>
                                             <animations/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                             <constraints>
@@ -1046,7 +1047,7 @@
                                 </connections>
                             </button>
                             <pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hap-y9-JVX">
-                                <rect key="frame" x="0.0" y="389" width="600" height="162"/>
+                                <rect key="frame" x="0.0" y="335" width="600" height="216"/>
                                 <animations/>
                                 <connections>
                                     <outlet property="dataSource" destination="GqQ-V0-aYk" id="ruH-BN-Hig"/>
@@ -1148,19 +1149,19 @@
                                 <rect key="frame" x="240" y="84" width="120" height="120"/>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Yep" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0gW-5K-DQz">
-                                <rect key="frame" x="276" y="223" width="49" height="36"/>
+                                <rect key="frame" x="275.5" y="223" width="50" height="36"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="30"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version 1.0" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="102-IE-TP0">
-                                <rect key="frame" x="264" y="267" width="71.5" height="17"/>
+                                <rect key="frame" x="264.5" y="267" width="70.5" height="17"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.60000002384185791" green="0.60000002384185791" blue="0.60000002384185791" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2015 Catch Inc." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6nN-bl-dxT">
-                                <rect key="frame" x="224" y="577" width="151" height="14.5"/>
+                                <rect key="frame" x="220" y="577" width="159" height="14.5"/>
                                 <fontDescription key="fontDescription" type="system" weight="light" pointSize="12"/>
                                 <color key="textColor" red="0.60000002384185791" green="0.60000002384185791" blue="0.60000002384185791" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
@@ -1207,11 +1208,14 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="PodCell" textLabel="C1J-Nr-hJu" style="IBUITableViewCellStyleDefault" id="IC9-zO-JHD">
+                                <rect key="frame" x="0.0" y="86" width="600" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="IC9-zO-JHD" id="S8x-8A-E2F">
+                                    <rect key="frame" x="0.0" y="0.0" width="567" height="43.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="C1J-Nr-hJu">
+                                            <rect key="frame" x="15" y="0.0" width="550" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -1250,7 +1254,7 @@
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" keyboardDismissMode="onDrag" translatesAutoresizingMaskIntoConstraints="NO" id="fVo-Zl-gHQ">
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" keyboardDismissMode="onDrag" translatesAutoresizingMaskIntoConstraints="NO" id="fVo-Zl-gHQ" customClass="FeedbackTextView" customModule="Yep" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="164.5" width="600" height="121.5"/>
                                 <animations/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -1293,8 +1297,10 @@
                             <tableViewSection id="TBf-1w-J6s">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="60" id="hf0-DA-HE1">
+                                        <rect key="frame" x="0.0" y="99" width="600" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hf0-DA-HE1" id="M5n-HW-GKn">
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="59.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="NIX" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="QU0-LQ-GUp">
@@ -1320,8 +1326,10 @@
                             <tableViewSection id="Osi-AX-ugj">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="250" id="rCs-Rg-jvK">
+                                        <rect key="frame" x="0.0" y="179" width="600" height="250"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rCs-Rg-jvK" id="Q18-jR-H2H">
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="249.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="enabled_badge_background" translatesAutoresizingMaskIntoConstraints="NO" id="bd9-dd-MZA" userLabel="Badge Enabled Image View">
@@ -1755,7 +1763,7 @@
                                 <animations/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <view key="tableHeaderView" hidden="YES" contentMode="scaleToFill" id="TOk-uh-YYP">
-                                    <rect key="frame" x="0.0" y="0.0" width="600" height="230"/>
+                                    <rect key="frame" x="0.0" y="64" width="600" height="230"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <subviews>
                                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="default_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="YwC-QR-xbE" userLabel="Avatar Image View">
@@ -1767,42 +1775,42 @@
                                             </constraints>
                                         </imageView>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="264" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zm7-GR-gdk" userLabel="Followers Count Label">
-                                            <rect key="frame" x="183" y="141" width="47" height="34"/>
+                                            <rect key="frame" x="179.5" y="141" width="54.5" height="33.5"/>
                                             <animations/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Followers" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oJN-WT-en7" userLabel="Followers Label">
-                                            <rect key="frame" x="181" y="183" width="50" height="14"/>
+                                            <rect key="frame" x="181" y="182.5" width="50" height="13.5"/>
                                             <animations/>
                                             <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                             <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="465" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AYA-Wt-nJZ" userLabel="Stars Count Label">
-                                            <rect key="frame" x="277" y="141" width="47" height="34"/>
+                                            <rect key="frame" x="273" y="141" width="55" height="33.5"/>
                                             <animations/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Stars" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cGf-Ne-05g" userLabel="Stars Label">
-                                            <rect key="frame" x="287" y="183" width="27" height="14"/>
+                                            <rect key="frame" x="287" y="182.5" width="27.5" height="13.5"/>
                                             <animations/>
                                             <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                             <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="odP-wn-O9l" userLabel="Following Count Label">
-                                            <rect key="frame" x="388" y="141" width="16" height="34"/>
+                                            <rect key="frame" x="387.5" y="141" width="17.5" height="33.5"/>
                                             <animations/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="28"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Following" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hSD-4E-AKI" userLabel="Following Label">
-                                            <rect key="frame" x="371" y="183" width="50" height="14"/>
+                                            <rect key="frame" x="371" y="182.5" width="50" height="13.5"/>
                                             <animations/>
                                             <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                             <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
@@ -1972,7 +1980,7 @@
         <image name="yep_icon_solo" width="120" height="120"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="l4P-ds-ihU"/>
+        <segue reference="PTw-QB-dRp"/>
         <segue reference="o3b-2D-AMq"/>
         <segue reference="6No-Lc-7X4"/>
     </inferredMetricsTieBreakers>
diff --git a/Yep/ViewControllers/Feedback/FeedbackViewController.swift b/Yep/ViewControllers/Feedback/FeedbackViewController.swift
index 71ee5f05..dc3de711 100644
--- a/Yep/ViewControllers/Feedback/FeedbackViewController.swift
+++ b/Yep/ViewControllers/Feedback/FeedbackViewController.swift
@@ -10,6 +10,52 @@ import UIKit
 import KeyboardMan
 import DeviceGuru
 
+
+class FeedbackTextView: UITextView {
+
+    let lineColor: UIColor = UIColor(red: 0.898, green: 0.898, blue: 0.898, alpha: 1)
+    let lineWidth: CGFloat = 1
+
+    lazy var topLineLayer: CAShapeLayer = {
+        let layer = CAShapeLayer()
+        layer.lineWidth = self.lineWidth
+        layer.strokeColor = self.lineColor.CGColor
+        return layer
+        }()
+
+    lazy var bottomLineLayer: CAShapeLayer = {
+        let layer = CAShapeLayer()
+        layer.lineWidth = self.lineWidth
+        layer.strokeColor = self.lineColor.CGColor
+        return layer
+        }()
+
+    override func didMoveToSuperview() {
+        super.didMoveToSuperview()
+
+        backgroundColor = UIColor.whiteColor()
+
+        layer.addSublayer(topLineLayer)
+        layer.addSublayer(bottomLineLayer)
+    }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+
+        let topPath = UIBezierPath()
+        topPath.moveToPoint(CGPoint(x: 0, y: 0))
+        topPath.addLineToPoint(CGPoint(x: CGRectGetWidth(bounds), y: 0))
+
+        topLineLayer.path = topPath.CGPath
+
+        let bottomPath = UIBezierPath()
+        bottomPath.moveToPoint(CGPoint(x: 0, y: CGRectGetHeight(bounds)))
+        bottomPath.addLineToPoint(CGPoint(x: CGRectGetWidth(bounds), y: CGRectGetHeight(bounds)))
+
+        bottomLineLayer.path = bottomPath.CGPath
+    }
+}
+
 class FeedbackViewController: UIViewController {
 
     @IBOutlet weak var promptLabel: UILabel! {
@@ -19,7 +65,7 @@ class FeedbackViewController: UIViewController {
         }
     }
 
-    @IBOutlet weak var feedbackTextView: UITextView! {
+    @IBOutlet weak var feedbackTextView: FeedbackTextView! {
         didSet {
             feedbackTextView.text = ""
             feedbackTextView.delegate = self
@@ -46,6 +92,8 @@ class FeedbackViewController: UIViewController {
 
         title = NSLocalizedString("Feedback", comment: "")
 
+        view.backgroundColor = UIColor.yepViewBackgroundColor()
+
         let doneBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.Done, target: self, action: "done")
         navigationItem.rightBarButtonItem = doneBarButtonItem
         navigationItem.rightBarButtonItem?.enabled = false
diff --git a/Yep/ViewControllers/Profile/ProfileViewController.swift b/Yep/ViewControllers/Profile/ProfileViewController.swift
index 56282e8c..44ad9a08 100644
--- a/Yep/ViewControllers/Profile/ProfileViewController.swift
+++ b/Yep/ViewControllers/Profile/ProfileViewController.swift
@@ -646,10 +646,6 @@ class ProfileViewController: UIViewController {
                 })
             }
 
-            YepAlert.confirmOrCancel(title: NSLocalizedString("Notice", comment: ""), message: NSLocalizedString("You don't have any skills!\nWould you like to pick some?", comment: ""), confirmTitle: NSLocalizedString("OK", comment: ""), cancelTitle: NSLocalizedString("Not now", comment: ""), inViewController: self, withConfirmAction: { [weak self] in
-                self?.pickSkills()
-                }, cancelAction: {})
-            
             if profileUserIsMe {
 
                 // 提示没有 Skills

From 1143043d90136af56280d57c3453a53b8b49af8c Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 17:37:09 +0800
Subject: [PATCH 25/31] update textAttributes

---
 Yep/AppDelegate.swift                             | 10 +++++-----
 Yep/ViewControllers/Base/BaseViewController.swift |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Yep/AppDelegate.swift b/Yep/AppDelegate.swift
index afc84e0b..52190483 100644
--- a/Yep/AppDelegate.swift
+++ b/Yep/AppDelegate.swift
@@ -309,14 +309,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             NSFontAttributeName: UIFont.navigationBarTitleFont()
         ]
         
-        let barButtonTextAttributes = [
-            NSForegroundColorAttributeName: UIColor.yepTintColor(),
-            NSFontAttributeName: UIFont.barButtonFont()
-        ]
+//        let barButtonTextAttributes = [
+//            NSForegroundColorAttributeName: UIColor.yepTintColor(),
+//            NSFontAttributeName: UIFont.barButtonFont()
+//        ]
 
         UINavigationBar.appearance().titleTextAttributes = textAttributes
         UINavigationBar.appearance().barTintColor = UIColor.whiteColor()
-        UIBarButtonItem.appearance().setTitleTextAttributes(barButtonTextAttributes, forState: UIControlState.Normal)
+        //UIBarButtonItem.appearance().setTitleTextAttributes(barButtonTextAttributes, forState: UIControlState.Normal)
         //UINavigationBar.appearance().setBackgroundImage(UIImage(named:"white"), forBarMetrics: .Default)
         //UINavigationBar.appearance().shadowImage = UIImage()
         //UINavigationBar.appearance().translucent = false
diff --git a/Yep/ViewControllers/Base/BaseViewController.swift b/Yep/ViewControllers/Base/BaseViewController.swift
index 3ff5bd6d..06b4b495 100644
--- a/Yep/ViewControllers/Base/BaseViewController.swift
+++ b/Yep/ViewControllers/Base/BaseViewController.swift
@@ -32,7 +32,7 @@ class BaseViewController: UIViewController {
             navigationController.navigationBar.setBackgroundImage(nil, forBarMetrics: UIBarMetrics.Default)
             
             let textAttributes = [
-                NSForegroundColorAttributeName: UIColor.yepTintColor(),
+                NSForegroundColorAttributeName: UIColor.yepNavgationBarTitleColor(),
                 NSFontAttributeName: UIFont.navigationBarTitleFont()
             ]
             

From ef3003dbb75104b188157a66f13566b8141cd755 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 17:43:58 +0800
Subject: [PATCH 26/31] ConversationMoreView show cancel

---
 Yep/Views/ConversationMore/ConversationMoreView.swift | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Yep/Views/ConversationMore/ConversationMoreView.swift b/Yep/Views/ConversationMore/ConversationMoreView.swift
index 2e24998f..87fbd5a2 100644
--- a/Yep/Views/ConversationMore/ConversationMoreView.swift
+++ b/Yep/Views/ConversationMore/ConversationMoreView.swift
@@ -122,13 +122,14 @@ class ConversationMoreColorTitleCell: UITableViewCell {
             colorTitleLabel.text = NSLocalizedString("Block", comment: "")
         }
 
-        colorTitleLabelTextColor = blocked ? UIColor.redColor() : UIColor.yepTintColor()
+        //colorTitleLabelTextColor = blocked ? UIColor.redColor() : UIColor.yepTintColor()
+        colorTitleLabelTextColor = UIColor.redColor()
     }
 }
 
 class ConversationMoreView: UIView {
 
-    let totalHeight: CGFloat = 240
+    let totalHeight: CGFloat = 60 * 5
 
     lazy var containerView: UIView = {
         let view = UIView()

From 85460fe5cfc43b56881526a20297215220e02bdd Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 17:45:42 +0800
Subject: [PATCH 27/31] fix layout warning

---
 Yep/Base.lproj/Intro.storyboard | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Yep/Base.lproj/Intro.storyboard b/Yep/Base.lproj/Intro.storyboard
index 3753233b..8dc16eed 100644
--- a/Yep/Base.lproj/Intro.storyboard
+++ b/Yep/Base.lproj/Intro.storyboard
@@ -186,13 +186,13 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You mobile number?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i8w-Yk-LWX">
-                                <rect key="frame" x="218" y="124" width="165" height="21"/>
+                                <rect key="frame" x="218.5" y="124" width="164.5" height="21"/>
                                 <animations/>
                                 <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="18"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="749" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="86" placeholder=" " adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="rD8-Pa-pw2" customClass="BorderTextField" customModule="Yep" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="195" width="60" height="60"/>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="749" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="86" placeholder=" " adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="rD8-Pa-pw2" customClass="BorderTextField" customModule="Yep" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="195" width="77" height="60"/>
                                 <animations/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="60" id="Uzt-dE-3IR"/>
@@ -210,8 +210,8 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </textField>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Mobile" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="BMl-2s-Pwj" customClass="BorderTextField" customModule="Yep" customModuleProvider="target">
-                                <rect key="frame" x="60" y="195" width="540" height="60"/>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Mobile" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="BMl-2s-Pwj" customClass="BorderTextField" customModule="Yep" customModuleProvider="target">
+                                <rect key="frame" x="77" y="195" width="523" height="60"/>
                                 <animations/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="120" id="5y7-kD-E2s"/>
@@ -690,13 +690,13 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You mobile number?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kW8-kQ-Gt5">
-                                <rect key="frame" x="218" y="124" width="165" height="21"/>
+                                <rect key="frame" x="218.5" y="124" width="164.5" height="21"/>
                                 <animations/>
                                 <fontDescription key="fontDescription" name="Helvetica-Light" family="Helvetica" pointSize="18"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="749" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="86" placeholder=" " minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="lCp-RT-8MI" customClass="BorderTextField" customModule="Yep" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="195" width="60" height="60"/>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="749" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="86" placeholder=" " minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="lCp-RT-8MI" customClass="BorderTextField" customModule="Yep" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="195" width="77" height="60"/>
                                 <animations/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="60" id="LIQ-lH-fzY"/>
@@ -718,8 +718,8 @@
                                 <color key="textColor" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Mobile" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FGO-sg-N4b" customClass="BorderTextField" customModule="Yep" customModuleProvider="target">
-                                <rect key="frame" x="60" y="195" width="540" height="60"/>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Mobile" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FGO-sg-N4b" customClass="BorderTextField" customModule="Yep" customModuleProvider="target">
+                                <rect key="frame" x="77" y="195" width="523" height="60"/>
                                 <animations/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="120" id="U4j-Tg-Ig3"/>

From 9e1e8beef83c42ab199d4250ddb2fe6a4f9b2b81 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 17:50:43 +0800
Subject: [PATCH 28/31] githubTableView.contentInset.bottom

---
 Yep/Configs/YepConfig.swift                                     | 2 +-
 .../SocialWorks/SocialWorkGithubViewController.swift            | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Yep/Configs/YepConfig.swift b/Yep/Configs/YepConfig.swift
index ef758ca5..1f8cc2f5 100644
--- a/Yep/Configs/YepConfig.swift
+++ b/Yep/Configs/YepConfig.swift
@@ -122,7 +122,7 @@ class YepConfig {
 
     struct SocialWorkGithub {
         struct Repo {
-            static let leftEdgeInset: CGFloat = Ruler.iPhoneHorizontal(20, 38, 40).value
+            static let leftEdgeInset: CGFloat = Ruler.iPhoneHorizontal(20, 40, 40).value
             static let rightEdgeInset: CGFloat = leftEdgeInset
         }
     }
diff --git a/Yep/ViewControllers/SocialWorks/SocialWorkGithubViewController.swift b/Yep/ViewControllers/SocialWorks/SocialWorkGithubViewController.swift
index 97c06b09..2727dccf 100644
--- a/Yep/ViewControllers/SocialWorks/SocialWorkGithubViewController.swift
+++ b/Yep/ViewControllers/SocialWorks/SocialWorkGithubViewController.swift
@@ -84,6 +84,8 @@ class SocialWorkGithubViewController: BaseViewController {
         githubTableView.registerNib(UINib(nibName: githubRepoCellIdentifier, bundle: nil), forCellReuseIdentifier: githubRepoCellIdentifier)
 
         githubTableView.rowHeight = 100
+
+        githubTableView.contentInset.bottom = YepConfig.SocialWorkGithub.Repo.rightEdgeInset - 10
         
         if let gestures = navigationController?.view.gestureRecognizers {
             for recognizer in gestures {

From ea59a6f35267db23c566f09781050a372c0c3b1e Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 18:07:23 +0800
Subject: [PATCH 29/31] after OAuth, goto this social work

---
 .../OAuth/OAuthViewController.swift           | 62 ++-----------------
 .../Profile/ProfileViewController.swift       |  5 ++
 2 files changed, 10 insertions(+), 57 deletions(-)

diff --git a/Yep/ViewControllers/OAuth/OAuthViewController.swift b/Yep/ViewControllers/OAuth/OAuthViewController.swift
index 1d081443..bccb38df 100644
--- a/Yep/ViewControllers/OAuth/OAuthViewController.swift
+++ b/Yep/ViewControllers/OAuth/OAuthViewController.swift
@@ -19,10 +19,6 @@ class OAuthViewController: BaseViewController {
     @IBOutlet weak var webView: UIWebView!
     @IBOutlet weak var activityIndicator: UIActivityIndicatorView!
     
-    var authenticated = false
-    
-    var failedRequest: NSURLRequest!
-
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -50,7 +46,6 @@ class OAuthViewController: BaseViewController {
 
     @IBAction func fillPassword(sender: AnyObject) {
         OnePasswordExtension.sharedExtension().fillItemIntoWebView(webView, forViewController: self, sender: sender, showOnlyLogins: false) { (finish, error) -> Void in
-            
         }
     }
 
@@ -64,21 +59,14 @@ class OAuthViewController: BaseViewController {
 extension OAuthViewController: UIWebViewDelegate {
 
     func webView(webView: UIWebView, shouldStartLoadWithRequest request: NSURLRequest, navigationType: UIWebViewNavigationType) -> Bool {
-        let result = authenticated
-        
+
         println(request.URL?.description)
         
         if let newURLString = request.URL?.description {
             handleWithRequestURL(newURLString)
-
         }
 
-        if (!authenticated) {
-            failedRequest = request
-            //NSURLConnection(request: request, delegate: self)
-        }
-
-        return result
+        return true
     }
     
     private func handleWithRequestURL(url: String) {
@@ -98,9 +86,9 @@ extension OAuthViewController: UIWebViewDelegate {
 
                 dispatch_async(dispatch_get_main_queue()) { [weak self] in
                     if let strongSelf = self {
-                        strongSelf.afterOAuthAction?(socialAccount: strongSelf.socialAccount)
-
-                        strongSelf.dismissViewControllerAnimated(true, completion: nil)
+                        strongSelf.dismissViewControllerAnimated(true) {
+                            strongSelf.afterOAuthAction?(socialAccount: strongSelf.socialAccount)
+                        }
                     }
                 }
             })
@@ -125,43 +113,3 @@ extension OAuthViewController: UIWebViewDelegate {
     }
 }
 
-// MARK: NSURLConnectionDelegate
-
-extension OAuthViewController: NSURLConnectionDelegate {
-
-    func connection(connection: NSURLConnection, willSendRequestForAuthenticationChallenge challenge: NSURLAuthenticationChallenge) {
-
-        if challenge.protectionSpace.authenticationMethod == NSURLAuthenticationMethodServerTrust {
-
-            let authURL = socialAccount.authURL
-            
-            if challenge.protectionSpace.host == authURL.host, let trust = challenge.protectionSpace.serverTrust {
-
-                println("OAuthViewController trusting connection to host \(challenge.protectionSpace.host)")
-                
-                let credential = NSURLCredential(trust: trust)
-                
-                challenge.sender?.useCredential(credential, forAuthenticationChallenge: challenge)
-            }
-        }
-        
-        challenge.sender?.continueWithoutCredentialForAuthenticationChallenge(challenge)
-    }
-}
-
-// MARK: NSURLConnectionDataDelegate
-
-extension OAuthViewController: NSURLConnectionDataDelegate {
-
-    func connection(connection: NSURLConnection, didReceiveResponse response: NSURLResponse) {
-
-        println("OAuthViewController didReceiveResponse")
-
-        authenticated = true
-        
-        connection.cancel()
-
-        webView.loadRequest(failedRequest)
-    }
-}
-
diff --git a/Yep/ViewControllers/Profile/ProfileViewController.swift b/Yep/ViewControllers/Profile/ProfileViewController.swift
index 44ad9a08..1bbe3213 100644
--- a/Yep/ViewControllers/Profile/ProfileViewController.swift
+++ b/Yep/ViewControllers/Profile/ProfileViewController.swift
@@ -1135,6 +1135,11 @@ class ProfileViewController: UIViewController {
                                 }
 
                                 self?.updateProfileCollectionView()
+
+                                // OAuth 成功后，自动跳转去显示对应的 social work
+                                delay(1) {
+                                    self?.performSegueWithIdentifier("showSocialWork\(socialAccount)", sender: providerName)
+                                }
                         }
                     }
                 }

From 892f5cb4a1fcbd81c27f10f101a34d6f825f037f Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 18:21:18 +0800
Subject: [PATCH 30/31] showSendingAnimation duration

---
 Yep/Views/Cells/ChatRightBase/ChatRightBaseCell.swift   | 2 +-
 Yep/Views/SkillHomeHeaderView/SkillHomeHeaderView.swift | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Yep/Views/Cells/ChatRightBase/ChatRightBaseCell.swift b/Yep/Views/Cells/ChatRightBase/ChatRightBaseCell.swift
index 8ffc78a9..6f6fb71c 100644
--- a/Yep/Views/Cells/ChatRightBase/ChatRightBaseCell.swift
+++ b/Yep/Views/Cells/ChatRightBase/ChatRightBaseCell.swift
@@ -74,7 +74,7 @@ class ChatRightBaseCell: ChatBaseCell {
         let animation = CABasicAnimation(keyPath: "transform.rotation.z")
         animation.fromValue = 0.0
         animation.toValue = 2 * M_PI
-        animation.duration = 3.0
+        animation.duration = 1.0
         animation.repeatCount = MAXFLOAT
 
         dotImageView.layer.addAnimation(animation, forKey: sendingAnimationName)
diff --git a/Yep/Views/SkillHomeHeaderView/SkillHomeHeaderView.swift b/Yep/Views/SkillHomeHeaderView/SkillHomeHeaderView.swift
index 62734ddf..ae9a6ae9 100644
--- a/Yep/Views/SkillHomeHeaderView/SkillHomeHeaderView.swift
+++ b/Yep/Views/SkillHomeHeaderView/SkillHomeHeaderView.swift
@@ -84,5 +84,5 @@ class SkillHomeHeaderView: UIView {
         
         learningButton.updateHightLightBounce()
     }
-
 }
+

From e5331bcb7868ad1a6f8164207c5a35a79be5139d Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 22 Sep 2015 18:46:58 +0800
Subject: [PATCH 31/31] fix createSkillHomeButtonWithText

---
 Yep/Views/SkillHomeSectionButton/SkillHomeSectionButton.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Yep/Views/SkillHomeSectionButton/SkillHomeSectionButton.swift b/Yep/Views/SkillHomeSectionButton/SkillHomeSectionButton.swift
index bb495c48..853919ef 100644
--- a/Yep/Views/SkillHomeSectionButton/SkillHomeSectionButton.swift
+++ b/Yep/Views/SkillHomeSectionButton/SkillHomeSectionButton.swift
@@ -61,8 +61,8 @@ class SkillHomeSectionButton: UIButton {
 
 
 func createSkillHomeButtonWithText(text: String, width: CGFloat, height: CGFloat) -> SkillHomeSectionButton {
-    
-    let button = UIButton(type: UIButtonType.Custom) as! SkillHomeSectionButton
+
+    let button = SkillHomeSectionButton()
     
     button.frame = CGRectMake(0, 0, width, height)
     button.setTitle(text, forState: UIControlState.Normal)