From acc6ff4edde5f802b4d4c063381456725147a13f Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Fri, 16 Oct 2015 17:01:14 +0800
Subject: [PATCH 01/25] add MoreMessageTypesView

---
 Yep.xcodeproj/project.pbxproj                 |  12 ++
 Yep/Base.lproj/Main.storyboard                |  82 +-------
 .../ConversationViewController.swift          |  34 ++--
 .../MoreMessageTypesView.swift                | 176 ++++++++++++++++++
 4 files changed, 218 insertions(+), 86 deletions(-)
 create mode 100644 Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift

diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj
index 9cb5d45f..128b8b20 100644
--- a/Yep.xcodeproj/project.pbxproj
+++ b/Yep.xcodeproj/project.pbxproj
@@ -214,6 +214,7 @@
 		50AFBF4E1BB3A594007D19DA /* bub3.caf in Resources */ = {isa = PBXBuildFile; fileRef = 50AFBF4D1BB3A594007D19DA /* bub3.caf */; settings = {ASSET_TAGS = (); }; };
 		50AFBF5F1BB4F332007D19DA /* FeedsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50AFBF5E1BB4F332007D19DA /* FeedsViewController.swift */; settings = {ASSET_TAGS = (); }; };
 		50B2CA921BD0BF3800668AC6 /* FeedTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B2CA911BD0BF3800668AC6 /* FeedTextView.swift */; settings = {ASSET_TAGS = (); }; };
+		50B2CA941BD0EF7900668AC6 /* MoreMessageTypesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B2CA931BD0EF7900668AC6 /* MoreMessageTypesView.swift */; settings = {ASSET_TAGS = (); }; };
 		50B38FB71B69CD960064C132 /* Array+Yep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B38FB61B69CD960064C132 /* Array+Yep.swift */; };
 		50B38FCC1B6B37F00064C132 /* FeedbackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B38FCB1B6B37F00064C132 /* FeedbackViewController.swift */; };
 		50B8E6161B40F9E700C17EA1 /* YepDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B8E6151B40F9E700C17EA1 /* YepDownloader.swift */; };
@@ -511,6 +512,7 @@
 		50AFBF4D1BB3A594007D19DA /* bub3.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = bub3.caf; path = Sounds/bub3.caf; sourceTree = "<group>"; };
 		50AFBF5E1BB4F332007D19DA /* FeedsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FeedsViewController.swift; path = ViewControllers/Feeds/FeedsViewController.swift; sourceTree = "<group>"; };
 		50B2CA911BD0BF3800668AC6 /* FeedTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FeedTextView.swift; path = Views/TextViews/FeedTextView.swift; sourceTree = "<group>"; };
+		50B2CA931BD0EF7900668AC6 /* MoreMessageTypesView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MoreMessageTypesView.swift; path = Views/MoreMessageTypes/MoreMessageTypesView.swift; sourceTree = "<group>"; };
 		50B38FB61B69CD960064C132 /* Array+Yep.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Array+Yep.swift"; path = "Extensions/Array+Yep.swift"; sourceTree = "<group>"; };
 		50B38FCB1B6B37F00064C132 /* FeedbackViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FeedbackViewController.swift; path = ViewControllers/Feedback/FeedbackViewController.swift; sourceTree = "<group>"; };
 		50B8E6151B40F9E700C17EA1 /* YepDownloader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepDownloader.swift; path = Services/YepDownloader.swift; sourceTree = "<group>"; };
@@ -974,6 +976,7 @@
 				0AC25F041B1100F3009E6E13 /* ScrollView */,
 				50E18BB81B180F8E0076C3C6 /* SayHi */,
 				5019F62F1B39BFCB0000D993 /* ConversationMore */,
+				50B2CA951BD0EF8A00668AC6 /* MoreMessageTypes */,
 				500A0B201B451A7400D49358 /* Badge */,
 				504F85AD1B4D21E400F909BE /* DiscoverFilter */,
 				8409137E1B7DB178001C89D6 /* FriendRequest */,
@@ -1693,6 +1696,14 @@
 			name = Feed;
 			sourceTree = "<group>";
 		};
+		50B2CA951BD0EF8A00668AC6 /* MoreMessageTypes */ = {
+			isa = PBXGroup;
+			children = (
+				50B2CA931BD0EF7900668AC6 /* MoreMessageTypesView.swift */,
+			);
+			name = MoreMessageTypes;
+			sourceTree = "<group>";
+		};
 		50B38FCD1B6B37F90064C132 /* Feedback */ = {
 			isa = PBXGroup;
 			children = (
@@ -2242,6 +2253,7 @@
 				50F5AF991BBBD02A0033C9BC /* FeedMediaCell.swift in Sources */,
 				5023DE331AB688F600B3EE96 /* UIColor+Yep.swift in Sources */,
 				503315971AC1017E0008A209 /* ChatLeftTextCell.swift in Sources */,
+				50B2CA941BD0EF7900668AC6 /* MoreMessageTypesView.swift in Sources */,
 				0A8F54B11AB67D11004AD60E /* AppDelegate.swift in Sources */,
 				508F8FC81B0161EF00461B0B /* ProfileSeparationLineCell.swift in Sources */,
 				500A0B1C1B450C2100D49358 /* EditNicknameAndBadgeViewController.swift in Sources */,
diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard
index 277e7ff2..5ac28a41 100644
--- a/Yep/Base.lproj/Main.storyboard
+++ b/Yep/Base.lproj/Main.storyboard
@@ -117,91 +117,28 @@
                                 <animations/>
                                 <items/>
                             </toolbar>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g11-Ob-rEy" userLabel="More Message Types View">
-                                <rect key="frame" x="0.0" y="440" width="600" height="300"/>
-                                <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="avI-im-eEZ" userLabel="Choose Photo Button" customClass="MessageTypeButton" customModule="Yep" customModuleProvider="target">
-                                        <rect key="frame" x="20" y="20" width="173.5" height="260"/>
-                                        <animations/>
-                                        <state key="normal">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                        </state>
-                                        <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="image" keyPath="image" value="icon_more_choose_photo"/>
-                                            <userDefinedRuntimeAttribute type="string" keyPath="title" value="Choose photo"/>
-                                        </userDefinedRuntimeAttributes>
-                                    </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HcA-7v-16m" userLabel="Take Photo Button" customClass="MessageTypeButton" customModule="Yep" customModuleProvider="target">
-                                        <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"/>
-                                        </state>
-                                        <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="image" keyPath="image" value="icon_more_take_photo"/>
-                                            <userDefinedRuntimeAttribute type="string" keyPath="title" value="Take photo"/>
-                                        </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" y="20" width="173.5" height="260"/>
-                                        <animations/>
-                                        <state key="normal">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                        </state>
-                                        <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="image" keyPath="image" value="icon_more_add_location"/>
-                                            <userDefinedRuntimeAttribute type="string" keyPath="title" value="Add location"/>
-                                        </userDefinedRuntimeAttributes>
-                                    </button>
-                                </subviews>
-                                <animations/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <constraints>
-                                    <constraint firstItem="avI-im-eEZ" firstAttribute="top" secondItem="HcA-7v-16m" secondAttribute="top" id="0y8-Xc-wgh"/>
-                                    <constraint firstAttribute="trailing" secondItem="Hg3-Ss-sqD" secondAttribute="trailing" constant="20" id="662-1Z-vCm"/>
-                                    <constraint firstItem="Hg3-Ss-sqD" firstAttribute="top" secondItem="HcA-7v-16m" secondAttribute="top" id="EhU-aN-fWf"/>
-                                    <constraint firstItem="Hg3-Ss-sqD" firstAttribute="width" secondItem="HcA-7v-16m" secondAttribute="width" id="NQU-rh-0gL"/>
-                                    <constraint firstItem="avI-im-eEZ" firstAttribute="width" secondItem="HcA-7v-16m" secondAttribute="width" id="Ngh-ef-Srv"/>
-                                    <constraint firstItem="HcA-7v-16m" firstAttribute="leading" secondItem="avI-im-eEZ" secondAttribute="trailing" constant="20" id="T2D-2Y-aG4"/>
-                                    <constraint firstItem="avI-im-eEZ" firstAttribute="height" secondItem="HcA-7v-16m" secondAttribute="height" id="apZ-ns-N9S"/>
-                                    <constraint firstItem="avI-im-eEZ" firstAttribute="top" secondItem="g11-Ob-rEy" secondAttribute="top" constant="20" id="b4S-GW-ghP"/>
-                                    <constraint firstAttribute="height" constant="300" id="faf-Xw-b0H"/>
-                                    <constraint firstAttribute="bottom" secondItem="avI-im-eEZ" secondAttribute="bottom" constant="20" id="sv1-0R-BYO"/>
-                                    <constraint firstItem="Hg3-Ss-sqD" firstAttribute="leading" secondItem="HcA-7v-16m" secondAttribute="trailing" constant="20" id="uSu-cr-saV"/>
-                                    <constraint firstItem="avI-im-eEZ" firstAttribute="leading" secondItem="g11-Ob-rEy" secondAttribute="leading" constant="20" id="uke-uY-P5h"/>
-                                    <constraint firstItem="Hg3-Ss-sqD" firstAttribute="height" secondItem="HcA-7v-16m" secondAttribute="height" id="xWM-E0-CPp"/>
-                                </constraints>
-                            </view>
                         </subviews>
                         <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="Q0w-sM-iIR" secondAttribute="trailing" id="0ei-y5-SyW"/>
                             <constraint firstAttribute="bottom" secondItem="o5R-dM-KPW" secondAttribute="bottom" id="9CY-zU-Ezq"/>
-                            <constraint firstItem="g11-Ob-rEy" firstAttribute="leading" secondItem="P6X-OT-hT5" secondAttribute="leading" id="B04-LV-qWQ"/>
                             <constraint firstItem="Q0w-sM-iIR" firstAttribute="leading" secondItem="P6X-OT-hT5" secondAttribute="leading" id="BYY-lE-CF8"/>
                             <constraint firstItem="o5R-dM-KPW" firstAttribute="leading" secondItem="P6X-OT-hT5" secondAttribute="leading" id="BjN-8c-WjM"/>
                             <constraint firstItem="Gu7-gn-2ia" firstAttribute="centerX" secondItem="Q0w-sM-iIR" secondAttribute="centerX" id="MgC-bT-6sX"/>
                             <constraint firstItem="Gu7-gn-2ia" firstAttribute="width" secondItem="Q0w-sM-iIR" secondAttribute="width" id="Qru-A0-ifW"/>
                             <constraint firstAttribute="bottom" secondItem="Q0w-sM-iIR" secondAttribute="bottom" constant="160" id="Sf8-1u-t01"/>
-                            <constraint firstItem="g11-Ob-rEy" firstAttribute="top" secondItem="Q0w-sM-iIR" secondAttribute="bottom" id="UC0-RV-osX"/>
-                            <constraint firstAttribute="trailing" secondItem="g11-Ob-rEy" secondAttribute="trailing" id="cB1-tg-2P7"/>
                             <constraint firstItem="o5R-dM-KPW" firstAttribute="top" secondItem="P6X-OT-hT5" secondAttribute="top" id="d3q-cT-PCM"/>
                             <constraint firstAttribute="trailing" secondItem="o5R-dM-KPW" secondAttribute="trailing" id="qY6-Ly-z3r"/>
                             <constraint firstItem="Q0w-sM-iIR" firstAttribute="top" secondItem="Gu7-gn-2ia" secondAttribute="bottom" constant="20" id="xIr-4d-X2Q"/>
                         </constraints>
                     </view>
                     <connections>
-                        <outlet property="addLocationButton" destination="Hg3-Ss-sqD" id="WNz-XZ-VMJ"/>
-                        <outlet property="choosePhotoButton" destination="avI-im-eEZ" id="qkS-h6-VIM"/>
                         <outlet property="conversationCollectionView" destination="o5R-dM-KPW" id="lsW-8A-zmB"/>
                         <outlet property="messageToolbar" destination="Q0w-sM-iIR" id="vmQ-s1-SlQ"/>
                         <outlet property="messageToolbarBottomConstraint" destination="Sf8-1u-t01" id="f02-ze-rKh"/>
-                        <outlet property="moreMessageTypesView" destination="g11-Ob-rEy" id="82c-V7-Cu4"/>
-                        <outlet property="moreMessageTypesViewHeightConstraint" destination="faf-Xw-b0H" id="wNA-e7-3wx"/>
                         <outlet property="swipeUpPromptLabel" destination="Zew-F7-znc" id="4qL-BA-cWR"/>
                         <outlet property="swipeUpView" destination="Gu7-gn-2ia" id="C4f-tg-leq"/>
-                        <outlet property="takePhotoButton" destination="HcA-7v-16m" id="yfB-gA-lxG"/>
                         <segue destination="f92-fs-zdh" kind="presentation" identifier="presentMessageMedia" id="esY-9F-IrH"/>
                         <segue destination="wNI-He-VjY" kind="presentation" identifier="presentPickLocation" id="8Uc-bg-xSe"/>
                         <segue destination="AyC-pt-NR2" kind="show" identifier="showProfile" id="PTw-QB-dRp"/>
@@ -302,13 +239,13 @@
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k4j-Ub-3bn" customClass="MediaView" customModule="Yep" customModuleProvider="target">
+                            <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="k4j-Ub-3bn" customClass="MediaView" customModule="Yep" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                                 <animations/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <gestureRecognizers/>
                             </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2Cb-zQ-dUZ" customClass="MediaControlView" customModule="Yep" customModuleProvider="target">
+                            <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2Cb-zQ-dUZ" customClass="MediaControlView" customModule="Yep" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="520" width="600" height="80"/>
                                 <animations/>
                                 <color key="backgroundColor" red="0.40000000600000002" green="0.80000001190000003" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -1031,7 +968,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IrX-gK-Zkg">
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IrX-gK-Zkg">
                                 <rect key="frame" x="0.0" y="100" width="600" height="44"/>
                                 <animations/>
                                 <constraints>
@@ -1044,7 +981,7 @@
                                     <action selector="activeFrom" destination="GqQ-V0-aYk" eventType="touchUpInside" id="yIG-DH-kZc"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="flj-e3-cbm">
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="flj-e3-cbm">
                                 <rect key="frame" x="0.0" y="144" width="600" height="44"/>
                                 <animations/>
                                 <constraints>
@@ -1057,7 +994,7 @@
                                     <action selector="activeTo" destination="GqQ-V0-aYk" eventType="touchUpInside" id="90e-4a-0ZA"/>
                                 </connections>
                             </button>
-                            <pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hap-y9-JVX">
+                            <pickerView contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hap-y9-JVX">
                                 <rect key="frame" x="0.0" y="384" width="600" height="216"/>
                                 <animations/>
                                 <connections>
@@ -1271,14 +1208,14 @@
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="We read every feedback" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pdt-Vd-sD9">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="We read every feedback" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pdt-Vd-sD9">
                                 <rect key="frame" x="208" y="60" width="185" height="20.5"/>
                                 <animations/>
                                 <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>
-                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" keyboardDismissMode="onDrag" translatesAutoresizingMaskIntoConstraints="NO" id="fVo-Zl-gHQ" customClass="FeedbackTextView" customModule="Yep" customModuleProvider="target">
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" misplaced="YES" keyboardDismissMode="onDrag" translatesAutoresizingMaskIntoConstraints="NO" id="fVo-Zl-gHQ" customClass="FeedbackTextView" customModule="Yep" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="120.5" width="600" height="214.5"/>
                                 <animations/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -2083,9 +2020,6 @@
         <image name="icon_list" width="30" height="30"/>
         <image name="icon_me" width="30" height="30"/>
         <image name="icon_me_active" width="30" height="30"/>
-        <image name="icon_more_add_location" width="70" height="50"/>
-        <image name="icon_more_choose_photo" width="70" height="50"/>
-        <image name="icon_more_take_photo" width="70" height="50"/>
         <image name="icon_profile_phone" width="16" height="24"/>
         <image name="icon_settings" width="30" height="30"/>
         <image name="onepassword-navbar" width="23" height="23"/>
@@ -2096,7 +2030,7 @@
     </resources>
     <inferredMetricsTieBreakers>
         <segue reference="o3b-2D-AMq"/>
-        <segue reference="l4P-ds-ihU"/>
+        <segue reference="X2e-mz-fLa"/>
         <segue reference="N7F-Tw-oVn"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index 6f9213f5..be7b1ab7 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -148,6 +148,8 @@ class ConversationViewController: BaseViewController {
 
     lazy var moreView: ConversationMoreView = ConversationMoreView()
 
+    lazy var moreMessageTypesView: MoreMessageTypesView = MoreMessageTypesView()
+
     lazy var pullToRefreshView: PullToRefreshView = {
 
         let pullToRefreshView = PullToRefreshView()
@@ -206,13 +208,13 @@ class ConversationViewController: BaseViewController {
     @IBOutlet weak var messageToolbar: MessageToolbar!
     @IBOutlet weak var messageToolbarBottomConstraint: NSLayoutConstraint!
 
-    @IBOutlet weak var moreMessageTypesView: UIView!
-    @IBOutlet weak var moreMessageTypesViewHeightConstraint: NSLayoutConstraint!
-    let moreMessageTypesViewDefaultHeight: CGFloat = 110
+    //@IBOutlet weak var moreMessageTypesView: UIView!
+    //@IBOutlet weak var moreMessageTypesViewHeightConstraint: NSLayoutConstraint!
+    //let moreMessageTypesViewDefaultHeight: CGFloat = 110
 
-    @IBOutlet weak var choosePhotoButton: MessageTypeButton!
-    @IBOutlet weak var takePhotoButton: MessageTypeButton!
-    @IBOutlet weak var addLocationButton: MessageTypeButton!
+    //@IBOutlet weak var choosePhotoButton: MessageTypeButton!
+    //@IBOutlet weak var takePhotoButton: MessageTypeButton!
+    //@IBOutlet weak var addLocationButton: MessageTypeButton!
 
     @IBOutlet weak var swipeUpView: UIView!
     @IBOutlet weak var swipeUpPromptLabel: UILabel!
@@ -349,7 +351,7 @@ class ConversationViewController: BaseViewController {
         conversationCollectionView.addGestureRecognizer(tap)
 
         messageToolbarBottomConstraint.constant = 0
-        moreMessageTypesViewHeightConstraint.constant = moreMessageTypesViewDefaultHeight
+        //moreMessageTypesViewHeightConstraint.constant = moreMessageTypesViewDefaultHeight
 
         keyboardMan.animateWhenKeyboardAppear = { [weak self] appearPostIndex, keyboardHeight, keyboardHeightIncrement in
 
@@ -361,7 +363,7 @@ class ConversationViewController: BaseViewController {
 
                     // 注意第一次要减去已经有的高度偏移
                     if appearPostIndex == 0 {
-                        strongSelf.conversationCollectionView.contentOffset.y += keyboardHeightIncrement - strongSelf.moreMessageTypesViewDefaultHeight
+                        strongSelf.conversationCollectionView.contentOffset.y += keyboardHeightIncrement //- strongSelf.moreMessageTypesViewDefaultHeight
                     } else {
                         strongSelf.conversationCollectionView.contentOffset.y += keyboardHeightIncrement
                     }
@@ -388,10 +390,10 @@ class ConversationViewController: BaseViewController {
             if let strongSelf = self {
 
                 if strongSelf.messageToolbar.state == .MoreMessages {
-                    strongSelf.conversationCollectionView.contentOffset.y -= keyboardHeight - strongSelf.moreMessageTypesViewDefaultHeight
-                    strongSelf.conversationCollectionView.contentInset.bottom = strongSelf.messageToolbar.frame.height + strongSelf.moreMessageTypesViewDefaultHeight
+                    strongSelf.conversationCollectionView.contentOffset.y -= keyboardHeight //- strongSelf.moreMessageTypesViewDefaultHeight
+                    strongSelf.conversationCollectionView.contentInset.bottom = strongSelf.messageToolbar.frame.height //+ strongSelf.moreMessageTypesViewDefaultHeight
 
-                    strongSelf.messageToolbarBottomConstraint.constant = strongSelf.moreMessageTypesViewDefaultHeight
+                    //strongSelf.messageToolbarBottomConstraint.constant = strongSelf.moreMessageTypesViewDefaultHeight
                     strongSelf.view.layoutIfNeeded()
 
                 } else {
@@ -487,7 +489,7 @@ class ConversationViewController: BaseViewController {
 
                             UIView.animateWithDuration(0.2, delay: 0.0, options: .CurveEaseInOut, animations: { _ in
 
-                                strongSelf.conversationCollectionView.contentOffset.y -= strongSelf.moreMessageTypesViewDefaultHeight
+                                //strongSelf.conversationCollectionView.contentOffset.y -= strongSelf.moreMessageTypesViewDefaultHeight
                                 strongSelf.conversationCollectionView.contentInset.bottom = strongSelf.messageToolbar.frame.height
 
                                 strongSelf.messageToolbarBottomConstraint.constant = 0
@@ -501,6 +503,7 @@ class ConversationViewController: BaseViewController {
 
                         if currentState == .MoreMessages {
 
+                            /*
                             if previousState != .BeginTextInput && previousState != .TextInputing {
 
                                 dispatch_async(dispatch_get_main_queue()) { [weak self] in
@@ -522,6 +525,11 @@ class ConversationViewController: BaseViewController {
                             delay(0.2) {
                                 self?.imagePicker.hidesBarsOnTap = false
                             }
+                            */
+
+                            if let window = self?.view.window {
+                                self?.moreMessageTypesView.showInView(window)
+                            }
                         }
                     }
 
@@ -866,6 +874,7 @@ class ConversationViewController: BaseViewController {
 
             // MARK: More Message Types
 
+            /*
             choosePhotoButton.title = NSLocalizedString("Choose photo", comment: "")
             choosePhotoButton.tapAction = { [weak self] in
 
@@ -904,6 +913,7 @@ class ConversationViewController: BaseViewController {
             addLocationButton.tapAction = { [weak self] in
                 self?.performSegueWithIdentifier("presentPickLocation", sender: nil)
             }
+            */
         }
     }
 
diff --git a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
new file mode 100644
index 00000000..0edec3fb
--- /dev/null
+++ b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
@@ -0,0 +1,176 @@
+//
+//  MoreMessageTypesView.swift
+//  Yep
+//
+//  Created by nixzhu on 15/10/16.
+//  Copyright © 2015年 Catch Inc. All rights reserved.
+//
+
+import UIKit
+
+class MoreMessageTypesView: UIView {
+
+    let totalHeight: CGFloat = 60 * 5
+
+    lazy var containerView: UIView = {
+        let view = UIView()
+        view.backgroundColor = UIColor.clearColor()
+        return view
+        }()
+
+    lazy var tableView: UITableView = {
+        let view = UITableView()
+        view.dataSource = self
+        view.delegate = self
+        view.rowHeight = 60
+        view.scrollEnabled = false
+
+        view.registerClass(ConversationMoreDetailCell.self, forCellReuseIdentifier: "ConversationMoreDetailCell")
+        view.registerClass(ConversationMoreCheckCell.self, forCellReuseIdentifier: "ConversationMoreCheckCell")
+        view.registerClass(ConversationMoreColorTitleCell.self, forCellReuseIdentifier: "ConversationMoreColorTitleCell")
+        return view
+        }()
+
+    var tableViewBottomConstraint: NSLayoutConstraint?
+
+    func showInView(view: UIView) {
+
+        frame = view.bounds
+
+        view.addSubview(self)
+
+        layoutIfNeeded()
+
+        containerView.alpha = 1
+
+        UIView.animateWithDuration(0.2, delay: 0.0, options: .CurveEaseIn, animations: { _ in
+            self.containerView.backgroundColor = UIColor.blackColor().colorWithAlphaComponent(0.3)
+
+        }, completion: { _ in
+        })
+
+        UIView.animateWithDuration(0.2, delay: 0.1, options: .CurveEaseOut, animations: { _ in
+            self.tableViewBottomConstraint?.constant = 0
+
+            self.layoutIfNeeded()
+
+        }, completion: { _ in
+        })
+    }
+
+    func hide() {
+
+        UIView.animateWithDuration(0.2, delay: 0.0, options: .CurveEaseIn, animations: { _ in
+            self.tableViewBottomConstraint?.constant = self.totalHeight
+
+            self.layoutIfNeeded()
+
+        }, completion: { _ in
+        })
+
+        UIView.animateWithDuration(0.2, delay: 0.1, options: .CurveEaseOut, animations: { _ in
+            self.containerView.backgroundColor = UIColor.clearColor()
+
+        }, completion: { _ in
+            self.removeFromSuperview()
+        })
+    }
+
+    func hideAndDo(afterHideAction: (() -> Void)?) {
+
+        UIView.animateWithDuration(0.2, delay: 0.0, options: .CurveLinear, animations: { _ in
+            self.containerView.alpha = 0
+
+            self.tableViewBottomConstraint?.constant = self.totalHeight
+
+            self.layoutIfNeeded()
+
+        }, completion: { finished in
+            self.removeFromSuperview()
+        })
+
+        delay(0.1) {
+            afterHideAction?()
+        }
+    }
+
+    var isFirstTimeBeenAddAsSubview = true
+
+    override func didMoveToSuperview() {
+        super.didMoveToSuperview()
+
+        if isFirstTimeBeenAddAsSubview {
+            isFirstTimeBeenAddAsSubview = false
+
+            makeUI()
+
+//            let tap = UITapGestureRecognizer(target: self, action: "hide")
+//            containerView.addGestureRecognizer(tap)
+//
+//            tap.cancelsTouchesInView = true
+//            tap.delegate = self
+        }
+    }
+
+    func makeUI() {
+
+        addSubview(containerView)
+        containerView.translatesAutoresizingMaskIntoConstraints = false
+
+        containerView.addSubview(tableView)
+        tableView.translatesAutoresizingMaskIntoConstraints = false
+
+        let viewsDictionary = [
+            "containerView": containerView,
+            "tableView": tableView,
+        ]
+
+        // layout for containerView
+
+        let containerViewConstraintsH = NSLayoutConstraint.constraintsWithVisualFormat("H:|[containerView]|", options: NSLayoutFormatOptions(rawValue: 0), metrics: nil, views: viewsDictionary)
+        let containerViewConstraintsV = NSLayoutConstraint.constraintsWithVisualFormat("V:|[containerView]|", options: NSLayoutFormatOptions(rawValue: 0), metrics: nil, views: viewsDictionary)
+
+        NSLayoutConstraint.activateConstraints(containerViewConstraintsH)
+        NSLayoutConstraint.activateConstraints(containerViewConstraintsV)
+
+        // layout for tableView
+
+        let tableViewConstraintsH = NSLayoutConstraint.constraintsWithVisualFormat("H:|[tableView]|", options: NSLayoutFormatOptions(rawValue: 0), metrics: nil, views: viewsDictionary)
+
+        let tableViewBottomConstraint = NSLayoutConstraint(item: tableView, attribute: .Bottom, relatedBy: .Equal, toItem: containerView, attribute: .Bottom, multiplier: 1.0, constant: self.totalHeight)
+
+        self.tableViewBottomConstraint = tableViewBottomConstraint
+        
+        let tableViewHeightConstraint = NSLayoutConstraint(item: tableView, attribute: .Height, relatedBy: .Equal, toItem: nil, attribute: .NotAnAttribute, multiplier: 1.0, constant: self.totalHeight)
+        
+        NSLayoutConstraint.activateConstraints(tableViewConstraintsH)
+        NSLayoutConstraint.activateConstraints([tableViewBottomConstraint, tableViewHeightConstraint])
+    }
+}
+
+extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
+
+    enum Row: Int {
+        case PhotoGallery = 0
+        case PickPhotos
+        case Location
+        case Cancel
+    }
+
+    func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+        return 1
+    }
+
+    func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 1
+    }
+
+    func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+
+        return UITableViewCell()
+    }
+    
+    func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+    }
+}
+

From bffebf0e36c5bc05d079d3d452837673c94cb98d Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Fri, 16 Oct 2015 19:10:12 +0800
Subject: [PATCH 02/25] add TitleCell

---
 Yep.xcodeproj/project.pbxproj                 | 16 +++++++++
 Yep/Views/Cells/Title/TitleCell.swift         | 26 ++++++++++++++
 Yep/Views/Cells/Title/TitleCell.xib           | 35 +++++++++++++++++++
 .../MoreMessageTypesView.swift                | 25 ++++++++++---
 4 files changed, 97 insertions(+), 5 deletions(-)
 create mode 100644 Yep/Views/Cells/Title/TitleCell.swift
 create mode 100644 Yep/Views/Cells/Title/TitleCell.xib

diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj
index 128b8b20..6864b751 100644
--- a/Yep.xcodeproj/project.pbxproj
+++ b/Yep.xcodeproj/project.pbxproj
@@ -90,6 +90,8 @@
 		502AE5541AB93215005BD199 /* ProfileFooterCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 502AE5521AB93215005BD199 /* ProfileFooterCell.xib */; };
 		502AE5581AB932D5005BD199 /* ProfileSectionHeaderReusableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 502AE5561AB932D5005BD199 /* ProfileSectionHeaderReusableView.swift */; };
 		502AE5591AB932D5005BD199 /* ProfileSectionHeaderReusableView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 502AE5571AB932D5005BD199 /* ProfileSectionHeaderReusableView.xib */; };
+		502B605A1BD1102B00D9C17E /* TitleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 502B60581BD1102B00D9C17E /* TitleCell.swift */; settings = {ASSET_TAGS = (); }; };
+		502B605B1BD1102B00D9C17E /* TitleCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 502B60591BD1102B00D9C17E /* TitleCell.xib */; settings = {ASSET_TAGS = (); }; };
 		503315971AC1017E0008A209 /* ChatLeftTextCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 503315951AC1017E0008A209 /* ChatLeftTextCell.swift */; };
 		503315981AC1017E0008A209 /* ChatLeftTextCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 503315961AC1017E0008A209 /* ChatLeftTextCell.xib */; };
 		5033159C1AC101C80008A209 /* ChatRightTextCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5033159A1AC101C80008A209 /* ChatRightTextCell.swift */; };
@@ -387,6 +389,8 @@
 		502AE5521AB93215005BD199 /* ProfileFooterCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = ProfileFooterCell.xib; path = Views/Cells/ProfileFooter/ProfileFooterCell.xib; sourceTree = "<group>"; };
 		502AE5561AB932D5005BD199 /* ProfileSectionHeaderReusableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ProfileSectionHeaderReusableView.swift; path = Views/ReusableViews/ProfileSectionHeader/ProfileSectionHeaderReusableView.swift; sourceTree = "<group>"; };
 		502AE5571AB932D5005BD199 /* ProfileSectionHeaderReusableView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = ProfileSectionHeaderReusableView.xib; path = Views/ReusableViews/ProfileSectionHeader/ProfileSectionHeaderReusableView.xib; sourceTree = "<group>"; };
+		502B60581BD1102B00D9C17E /* TitleCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TitleCell.swift; path = Views/Cells/Title/TitleCell.swift; sourceTree = "<group>"; };
+		502B60591BD1102B00D9C17E /* TitleCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = TitleCell.xib; path = Views/Cells/Title/TitleCell.xib; sourceTree = "<group>"; };
 		503315951AC1017E0008A209 /* ChatLeftTextCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ChatLeftTextCell.swift; path = Views/Cells/ChatLeftText/ChatLeftTextCell.swift; sourceTree = "<group>"; };
 		503315961AC1017E0008A209 /* ChatLeftTextCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = ChatLeftTextCell.xib; path = Views/Cells/ChatLeftText/ChatLeftTextCell.xib; sourceTree = "<group>"; };
 		5033159A1AC101C80008A209 /* ChatRightTextCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ChatRightTextCell.swift; path = Views/Cells/ChatRightText/ChatRightTextCell.swift; sourceTree = "<group>"; };
@@ -1040,6 +1044,7 @@
 				501138331BCB62A70055A014 /* FeedConversation */,
 				6A82150A1BCBE8F40011F36C /* DiscoverSkill */,
 				50535D251BCE4A0A002FE1A4 /* Photo */,
+				502B605C1BD1102F00D9C17E /* Title */,
 			);
 			name = Cells;
 			sourceTree = "<group>";
@@ -1202,6 +1207,15 @@
 			name = ProfileSectionHeader;
 			sourceTree = "<group>";
 		};
+		502B605C1BD1102F00D9C17E /* Title */ = {
+			isa = PBXGroup;
+			children = (
+				502B60581BD1102B00D9C17E /* TitleCell.swift */,
+				502B60591BD1102B00D9C17E /* TitleCell.xib */,
+			);
+			name = Title;
+			sourceTree = "<group>";
+		};
 		503315991AC101830008A209 /* ChatLeftText */ = {
 			isa = PBXGroup;
 			children = (
@@ -2146,6 +2160,7 @@
 				501138321BCB62A20055A014 /* FeedConversationCell.xib in Resources */,
 				848806B41B7B4E2E000C5424 /* Show.storyboard in Resources */,
 				0AD7EA771AC3EEB000617758 /* PushConfig.plist in Resources */,
+				502B605B1BD1102B00D9C17E /* TitleCell.xib in Resources */,
 				5064F65A1B0B14420089FAD4 /* AddFriendMoreCell.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2407,6 +2422,7 @@
 				6A5632931BC911CB00397B53 /* DiscoverNormalUserCell.swift in Sources */,
 				5053AD5A1AF83B4200B3CBFA /* ChatLeftLocationCell.swift in Sources */,
 				50A640E91B6F45FA0050E4A3 /* DoNotDisturbPeriodCell.swift in Sources */,
+				502B605A1BD1102B00D9C17E /* TitleCell.swift in Sources */,
 				840CD23C1B7B59D5000D2680 /* ShowStepViewController.swift in Sources */,
 				508F8FD01B01D04400461B0B /* GithubRepoCell.swift in Sources */,
 				50F2B97B1B2EEAF800F840CC /* NavigationTitleLabel.swift in Sources */,
diff --git a/Yep/Views/Cells/Title/TitleCell.swift b/Yep/Views/Cells/Title/TitleCell.swift
new file mode 100644
index 00000000..e5fbd35c
--- /dev/null
+++ b/Yep/Views/Cells/Title/TitleCell.swift
@@ -0,0 +1,26 @@
+//
+//  TitleCell.swift
+//  Yep
+//
+//  Created by nixzhu on 15/10/16.
+//  Copyright © 2015年 Catch Inc. All rights reserved.
+//
+
+import UIKit
+
+class TitleCell: UITableViewCell {
+
+    @IBOutlet weak var singleTitleLabel: UILabel!
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+    override func setSelected(selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+}
+
diff --git a/Yep/Views/Cells/Title/TitleCell.xib b/Yep/Views/Cells/Title/TitleCell.xib
new file mode 100644
index 00000000..7048bd61
--- /dev/null
+++ b/Yep/Views/Cells/Title/TitleCell.xib
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+    <dependencies>
+        <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"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TitleCell" id="KGk-i7-Jjw" customClass="TitleCell" customModule="Yep" customModuleProvider="target">
+            <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.5"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PSq-Uu-HCz">
+                        <rect key="frame" x="10" y="11.5" width="300" 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>
+                <constraints>
+                    <constraint firstItem="PSq-Uu-HCz" firstAttribute="centerX" secondItem="H2p-sc-9uM" secondAttribute="centerX" id="0Yn-oK-RCs"/>
+                    <constraint firstItem="PSq-Uu-HCz" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="10" id="HkJ-Tg-qxn"/>
+                    <constraint firstItem="PSq-Uu-HCz" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="c5R-vW-cfB"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="singleTitleLabel" destination="PSq-Uu-HCz" id="nwv-qe-6hx"/>
+            </connections>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
index 0edec3fb..e22cd864 100644
--- a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
+++ b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
@@ -18,6 +18,8 @@ class MoreMessageTypesView: UIView {
         return view
         }()
 
+    let titleCellID = "TitleCell"
+
     lazy var tableView: UITableView = {
         let view = UITableView()
         view.dataSource = self
@@ -25,9 +27,7 @@ class MoreMessageTypesView: UIView {
         view.rowHeight = 60
         view.scrollEnabled = false
 
-        view.registerClass(ConversationMoreDetailCell.self, forCellReuseIdentifier: "ConversationMoreDetailCell")
-        view.registerClass(ConversationMoreCheckCell.self, forCellReuseIdentifier: "ConversationMoreCheckCell")
-        view.registerClass(ConversationMoreColorTitleCell.self, forCellReuseIdentifier: "ConversationMoreColorTitleCell")
+        view.registerNib(UINib(nibName: self.titleCellID, bundle: nil), forCellReuseIdentifier: self.titleCellID)
         return view
         }()
 
@@ -155,6 +155,19 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
         case PickPhotos
         case Location
         case Cancel
+
+        var normalTitle: String {
+            switch self {
+            case .PhotoGallery:
+                return ""
+            case .PickPhotos:
+                return NSLocalizedString("Pick Photos", comment: "")
+            case .Location:
+                return NSLocalizedString("Location", comment: "")
+            case .Cancel:
+                return NSLocalizedString("Cancel", comment: "")
+            }
+        }
     }
 
     func numberOfSectionsInTableView(tableView: UITableView) -> Int {
@@ -162,12 +175,14 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
     }
 
     func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 1
+        return 4
     }
 
     func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
 
-        return UITableViewCell()
+        let cell = tableView.dequeueReusableCellWithIdentifier(titleCellID) as! TitleCell
+        cell.singleTitleLabel.text = Row(rawValue: indexPath.row)?.normalTitle
+        return cell
     }
     
     func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {

From 66fb93bf7c882acf9147b22f31ef1ce26e49bee9 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Fri, 16 Oct 2015 19:19:20 +0800
Subject: [PATCH 03/25] add QuickPickPhotosCell

---
 Yep.xcodeproj/project.pbxproj                 | 16 ++++++++
 .../QuickPickPhotos/QuickPickPhotosCell.swift | 26 ++++++++++++
 .../QuickPickPhotos/QuickPickPhotosCell.xib   | 40 +++++++++++++++++++
 .../MoreMessageTypesView.swift                | 18 +++++++--
 4 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
 create mode 100644 Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.xib

diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj
index 6864b751..9a5e1ed7 100644
--- a/Yep.xcodeproj/project.pbxproj
+++ b/Yep.xcodeproj/project.pbxproj
@@ -92,6 +92,8 @@
 		502AE5591AB932D5005BD199 /* ProfileSectionHeaderReusableView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 502AE5571AB932D5005BD199 /* ProfileSectionHeaderReusableView.xib */; };
 		502B605A1BD1102B00D9C17E /* TitleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 502B60581BD1102B00D9C17E /* TitleCell.swift */; settings = {ASSET_TAGS = (); }; };
 		502B605B1BD1102B00D9C17E /* TitleCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 502B60591BD1102B00D9C17E /* TitleCell.xib */; settings = {ASSET_TAGS = (); }; };
+		502B605F1BD112E500D9C17E /* QuickPickPhotosCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 502B605D1BD112E500D9C17E /* QuickPickPhotosCell.swift */; settings = {ASSET_TAGS = (); }; };
+		502B60601BD112E500D9C17E /* QuickPickPhotosCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 502B605E1BD112E500D9C17E /* QuickPickPhotosCell.xib */; settings = {ASSET_TAGS = (); }; };
 		503315971AC1017E0008A209 /* ChatLeftTextCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 503315951AC1017E0008A209 /* ChatLeftTextCell.swift */; };
 		503315981AC1017E0008A209 /* ChatLeftTextCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 503315961AC1017E0008A209 /* ChatLeftTextCell.xib */; };
 		5033159C1AC101C80008A209 /* ChatRightTextCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5033159A1AC101C80008A209 /* ChatRightTextCell.swift */; };
@@ -391,6 +393,8 @@
 		502AE5571AB932D5005BD199 /* ProfileSectionHeaderReusableView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = ProfileSectionHeaderReusableView.xib; path = Views/ReusableViews/ProfileSectionHeader/ProfileSectionHeaderReusableView.xib; sourceTree = "<group>"; };
 		502B60581BD1102B00D9C17E /* TitleCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TitleCell.swift; path = Views/Cells/Title/TitleCell.swift; sourceTree = "<group>"; };
 		502B60591BD1102B00D9C17E /* TitleCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = TitleCell.xib; path = Views/Cells/Title/TitleCell.xib; sourceTree = "<group>"; };
+		502B605D1BD112E500D9C17E /* QuickPickPhotosCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = QuickPickPhotosCell.swift; path = Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift; sourceTree = "<group>"; };
+		502B605E1BD112E500D9C17E /* QuickPickPhotosCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = QuickPickPhotosCell.xib; path = Views/Cells/QuickPickPhotos/QuickPickPhotosCell.xib; sourceTree = "<group>"; };
 		503315951AC1017E0008A209 /* ChatLeftTextCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ChatLeftTextCell.swift; path = Views/Cells/ChatLeftText/ChatLeftTextCell.swift; sourceTree = "<group>"; };
 		503315961AC1017E0008A209 /* ChatLeftTextCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = ChatLeftTextCell.xib; path = Views/Cells/ChatLeftText/ChatLeftTextCell.xib; sourceTree = "<group>"; };
 		5033159A1AC101C80008A209 /* ChatRightTextCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ChatRightTextCell.swift; path = Views/Cells/ChatRightText/ChatRightTextCell.swift; sourceTree = "<group>"; };
@@ -1045,6 +1049,7 @@
 				6A82150A1BCBE8F40011F36C /* DiscoverSkill */,
 				50535D251BCE4A0A002FE1A4 /* Photo */,
 				502B605C1BD1102F00D9C17E /* Title */,
+				502B60611BD112EA00D9C17E /* QuickPickPhotos */,
 			);
 			name = Cells;
 			sourceTree = "<group>";
@@ -1216,6 +1221,15 @@
 			name = Title;
 			sourceTree = "<group>";
 		};
+		502B60611BD112EA00D9C17E /* QuickPickPhotos */ = {
+			isa = PBXGroup;
+			children = (
+				502B605D1BD112E500D9C17E /* QuickPickPhotosCell.swift */,
+				502B605E1BD112E500D9C17E /* QuickPickPhotosCell.xib */,
+			);
+			name = QuickPickPhotos;
+			sourceTree = "<group>";
+		};
 		503315991AC101830008A209 /* ChatLeftText */ = {
 			isa = PBXGroup;
 			children = (
@@ -2148,6 +2162,7 @@
 				0A8F54B81AB67D11004AD60E /* Images.xcassets in Resources */,
 				50EB8CC51AE89F12001AC1EE /* ChatRightVideoCell.xib in Resources */,
 				502AE5191AB70D72005BD199 /* Intro.storyboard in Resources */,
+				502B60601BD112E500D9C17E /* QuickPickPhotosCell.xib in Resources */,
 				504BDC151B4528A500DBD35D /* Badges.xcassets in Resources */,
 				50F5AF961BBBCDA30033C9BC /* FeedMediaAddCell.xib in Resources */,
 				50894D081AEDFDA2000981AF /* EditProfileMoreInfoCell.xib in Resources */,
@@ -2320,6 +2335,7 @@
 				505EC81C1ADFBE1B001D27E0 /* SkillSelectionCell.swift in Sources */,
 				5023DE591AB6DBC100B3EE96 /* UIImage+Yep.swift in Sources */,
 				508F8FD41B01E3D100461B0B /* SocialWorkDribbbleViewController.swift in Sources */,
+				502B605F1BD112E500D9C17E /* QuickPickPhotosCell.swift in Sources */,
 				50AFBF5F1BB4F332007D19DA /* FeedsViewController.swift in Sources */,
 				50EB8CBF1AE89ED8001AC1EE /* ChatLeftVideoCell.swift in Sources */,
 				502AE5331AB86020005BD199 /* RegisterVerifyMobileViewController.swift in Sources */,
diff --git a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
new file mode 100644
index 00000000..a133c2b0
--- /dev/null
+++ b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
@@ -0,0 +1,26 @@
+//
+//  QuickPickPhotosCell.swift
+//  Yep
+//
+//  Created by nixzhu on 15/10/16.
+//  Copyright © 2015年 Catch Inc. All rights reserved.
+//
+
+import UIKit
+
+class QuickPickPhotosCell: UITableViewCell {
+
+    @IBOutlet weak var photosCollectionView: UICollectionView!
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+    override func setSelected(selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+    
+}
diff --git a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.xib b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.xib
new file mode 100644
index 00000000..25320bbb
--- /dev/null
+++ b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.xib
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+    <dependencies>
+        <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"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="QuickPickPhotosCell" rowHeight="88" id="KGk-i7-Jjw" customClass="QuickPickPhotosCell" customModule="Yep" customModuleProvider="target">
+            <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="87.5"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="95w-sj-Pxi">
+                        <rect key="frame" x="0.0" y="15" width="320" height="57.5"/>
+                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="axC-xs-FG9">
+                            <size key="itemSize" width="50" height="50"/>
+                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                            <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                        </collectionViewFlowLayout>
+                    </collectionView>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="95w-sj-Pxi" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="3SC-eg-mje"/>
+                    <constraint firstItem="95w-sj-Pxi" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="15" id="HBP-ep-UOY"/>
+                    <constraint firstAttribute="trailing" secondItem="95w-sj-Pxi" secondAttribute="trailing" id="NLc-t9-7eq"/>
+                    <constraint firstAttribute="bottom" secondItem="95w-sj-Pxi" secondAttribute="bottom" constant="15" id="pl8-YR-i4m"/>
+                </constraints>
+            </tableViewCellContentView>
+            <connections>
+                <outlet property="photosCollectionView" destination="95w-sj-Pxi" id="95L-9S-3CB"/>
+            </connections>
+            <point key="canvasLocation" x="242" y="176"/>
+        </tableViewCell>
+    </objects>
+</document>
diff --git a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
index e22cd864..0620d313 100644
--- a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
+++ b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
@@ -19,6 +19,7 @@ class MoreMessageTypesView: UIView {
         }()
 
     let titleCellID = "TitleCell"
+    let quickPickPhotosCellID = "QuickPickPhotosCell"
 
     lazy var tableView: UITableView = {
         let view = UITableView()
@@ -27,6 +28,7 @@ class MoreMessageTypesView: UIView {
         view.rowHeight = 60
         view.scrollEnabled = false
 
+        view.registerNib(UINib(nibName: self.quickPickPhotosCellID, bundle: nil), forCellReuseIdentifier: self.quickPickPhotosCellID)
         view.registerNib(UINib(nibName: self.titleCellID, bundle: nil), forCellReuseIdentifier: self.titleCellID)
         return view
         }()
@@ -180,9 +182,19 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
 
     func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
 
-        let cell = tableView.dequeueReusableCellWithIdentifier(titleCellID) as! TitleCell
-        cell.singleTitleLabel.text = Row(rawValue: indexPath.row)?.normalTitle
-        return cell
+        if let row = Row(rawValue: indexPath.row) {
+            if case .PhotoGallery = row {
+                let cell = tableView.dequeueReusableCellWithIdentifier(quickPickPhotosCellID) as! QuickPickPhotosCell
+                return cell
+
+            } else {
+                let cell = tableView.dequeueReusableCellWithIdentifier(titleCellID) as! TitleCell
+                cell.singleTitleLabel.text = row.normalTitle
+                return cell
+            }
+        }
+        
+        return UITableViewCell()
     }
     
     func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {

From be168e35faca7fb570961de6d34d086a624ad157 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Fri, 16 Oct 2015 19:43:55 +0800
Subject: [PATCH 04/25] height

---
 .../MoreMessageTypes/MoreMessageTypesView.swift | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
index 0620d313..5eda430c 100644
--- a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
+++ b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
@@ -10,7 +10,7 @@ import UIKit
 
 class MoreMessageTypesView: UIView {
 
-    let totalHeight: CGFloat = 60 * 5
+    let totalHeight: CGFloat = 100 + 60 * 3
 
     lazy var containerView: UIView = {
         let view = UIView()
@@ -196,7 +196,20 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
         
         return UITableViewCell()
     }
-    
+
+    func tableView(tableView: UITableView, heightForRowAtIndexPath indexPath: NSIndexPath) -> CGFloat {
+        if let row = Row(rawValue: indexPath.row) {
+            if case .PhotoGallery = row {
+                return 100
+
+            } else {
+                return 60
+            }
+        }
+
+        return 0
+    }
+
     func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
     }
 }

From 3e33895e170b4d707a5b1af169da8e5638c919ea Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Fri, 16 Oct 2015 19:53:05 +0800
Subject: [PATCH 05/25] fill QuickPickPhotosCell with photos

---
 .../QuickPickPhotos/QuickPickPhotosCell.swift | 57 ++++++++++++++++++-
 .../QuickPickPhotos/QuickPickPhotosCell.xib   |  2 +-
 2 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
index a133c2b0..7fa41373 100644
--- a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
+++ b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
@@ -7,14 +7,36 @@
 //
 
 import UIKit
+import Photos
 
 class QuickPickPhotosCell: UITableViewCell {
 
     @IBOutlet weak var photosCollectionView: UICollectionView!
-    
+
+    var images: PHFetchResult!
+    let imageManager = PHCachingImageManager()
+    var imageCacheController: ImageCacheController!
+
+    var pickedImageSet = Set<PHAsset>()
+    var completion: ((images: [UIImage], imageAssetSet: Set<PHAsset>) -> Void)?
+
+    let photoCellID = "PhotoCell"
+
     override func awakeFromNib() {
         super.awakeFromNib()
-        // Initialization code
+
+        photosCollectionView.registerNib(UINib(nibName: photoCellID, bundle: nil), forCellWithReuseIdentifier: photoCellID)
+        photosCollectionView.dataSource = self
+        photosCollectionView.delegate = self
+
+        if let layout = photosCollectionView.collectionViewLayout as? UICollectionViewFlowLayout {
+            layout.itemSize = CGSize(width: 70, height: 70)
+            layout.minimumInteritemSpacing = 10
+            layout.sectionInset = UIEdgeInsetsZero
+        }
+
+        images = PHAsset.fetchAssetsWithMediaType(.Image, options: nil)
+        imageCacheController = ImageCacheController(imageManager: imageManager, images: images, preheatSize: 1)
     }
 
     override func setSelected(selected: Bool, animated: Bool) {
@@ -22,5 +44,34 @@ class QuickPickPhotosCell: UITableViewCell {
 
         // Configure the view for the selected state
     }
-    
 }
+
+extension QuickPickPhotosCell: UICollectionViewDataSource, UICollectionViewDelegate {
+
+    func numberOfSectionsInCollectionView(collectionView: UICollectionView) -> Int {
+        return 1
+    }
+
+    func collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return images.count
+    }
+
+    func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {
+
+        let cell = collectionView.dequeueReusableCellWithReuseIdentifier(photoCellID, forIndexPath: indexPath) as! PhotoCell
+        return cell
+    }
+
+    func collectionView(collectionView: UICollectionView, willDisplayCell cell: UICollectionViewCell, forItemAtIndexPath indexPath: NSIndexPath) {
+
+        if let cell = cell as? PhotoCell {
+            cell.imageManager = imageManager
+
+            if let imageAsset = images[indexPath.item] as? PHAsset {
+                cell.imageAsset = imageAsset
+                cell.photoPickedImageView.hidden = !pickedImageSet.contains(imageAsset)
+            }
+        }
+    }
+}
+
diff --git a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.xib b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.xib
index 25320bbb..cecde387 100644
--- a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.xib
+++ b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.xib
@@ -16,7 +16,7 @@
                 <subviews>
                     <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="95w-sj-Pxi">
                         <rect key="frame" x="0.0" y="15" width="320" height="57.5"/>
-                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="axC-xs-FG9">
+                        <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="10" minimumInteritemSpacing="10" id="axC-xs-FG9">
                             <size key="itemSize" width="50" height="50"/>
                             <size key="headerReferenceSize" width="0.0" height="0.0"/>
                             <size key="footerReferenceSize" width="0.0" height="0.0"/>

From e8fd99e61f6c98b0b5fe358639f950d17d899ac4 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Fri, 16 Oct 2015 20:04:46 +0800
Subject: [PATCH 06/25] tap hide

---
 .../MoreMessageTypesView.swift                | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
index 5eda430c..f67ed7d3 100644
--- a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
+++ b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
@@ -106,11 +106,11 @@ class MoreMessageTypesView: UIView {
 
             makeUI()
 
-//            let tap = UITapGestureRecognizer(target: self, action: "hide")
-//            containerView.addGestureRecognizer(tap)
-//
-//            tap.cancelsTouchesInView = true
-//            tap.delegate = self
+            let tap = UITapGestureRecognizer(target: self, action: "hide")
+            containerView.addGestureRecognizer(tap)
+
+            tap.cancelsTouchesInView = true
+            tap.delegate = self
         }
     }
 
@@ -150,6 +150,22 @@ class MoreMessageTypesView: UIView {
     }
 }
 
+// MARK: - UIGestureRecognizerDelegate
+
+extension MoreMessageTypesView: UIGestureRecognizerDelegate {
+
+    func gestureRecognizer(gestureRecognizer: UIGestureRecognizer, shouldReceiveTouch touch: UITouch) -> Bool {
+
+        if touch.view != containerView {
+            return false
+        }
+
+        return true
+    }
+}
+
+// MARK: - UITableViewDataSource, UITableViewDelegate
+
 extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
 
     enum Row: Int {
@@ -213,4 +229,3 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
     func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
     }
 }
-

From 3d1521cf171a6ac1c229c53517a912daab084d62 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Fri, 16 Oct 2015 20:14:02 +0800
Subject: [PATCH 07/25] add CameraCell

---
 Yep.xcodeproj/project.pbxproj                 | 16 +++++++++
 Yep/Views/Cells/Camera/CameraCell.swift       | 18 ++++++++++
 Yep/Views/Cells/Camera/CameraCell.xib         | 33 +++++++++++++++++++
 .../QuickPickPhotos/QuickPickPhotosCell.swift | 28 +++++++++++++---
 .../MoreMessageTypesView.swift                |  1 +
 5 files changed, 92 insertions(+), 4 deletions(-)
 create mode 100644 Yep/Views/Cells/Camera/CameraCell.swift
 create mode 100644 Yep/Views/Cells/Camera/CameraCell.xib

diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj
index 9a5e1ed7..019fec80 100644
--- a/Yep.xcodeproj/project.pbxproj
+++ b/Yep.xcodeproj/project.pbxproj
@@ -94,6 +94,8 @@
 		502B605B1BD1102B00D9C17E /* TitleCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 502B60591BD1102B00D9C17E /* TitleCell.xib */; settings = {ASSET_TAGS = (); }; };
 		502B605F1BD112E500D9C17E /* QuickPickPhotosCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 502B605D1BD112E500D9C17E /* QuickPickPhotosCell.swift */; settings = {ASSET_TAGS = (); }; };
 		502B60601BD112E500D9C17E /* QuickPickPhotosCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 502B605E1BD112E500D9C17E /* QuickPickPhotosCell.xib */; settings = {ASSET_TAGS = (); }; };
+		502B60641BD1208E00D9C17E /* CameraCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 502B60621BD1208E00D9C17E /* CameraCell.swift */; settings = {ASSET_TAGS = (); }; };
+		502B60651BD1208E00D9C17E /* CameraCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 502B60631BD1208E00D9C17E /* CameraCell.xib */; settings = {ASSET_TAGS = (); }; };
 		503315971AC1017E0008A209 /* ChatLeftTextCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 503315951AC1017E0008A209 /* ChatLeftTextCell.swift */; };
 		503315981AC1017E0008A209 /* ChatLeftTextCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 503315961AC1017E0008A209 /* ChatLeftTextCell.xib */; };
 		5033159C1AC101C80008A209 /* ChatRightTextCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5033159A1AC101C80008A209 /* ChatRightTextCell.swift */; };
@@ -395,6 +397,8 @@
 		502B60591BD1102B00D9C17E /* TitleCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = TitleCell.xib; path = Views/Cells/Title/TitleCell.xib; sourceTree = "<group>"; };
 		502B605D1BD112E500D9C17E /* QuickPickPhotosCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = QuickPickPhotosCell.swift; path = Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift; sourceTree = "<group>"; };
 		502B605E1BD112E500D9C17E /* QuickPickPhotosCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = QuickPickPhotosCell.xib; path = Views/Cells/QuickPickPhotos/QuickPickPhotosCell.xib; sourceTree = "<group>"; };
+		502B60621BD1208E00D9C17E /* CameraCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CameraCell.swift; path = Views/Cells/Camera/CameraCell.swift; sourceTree = "<group>"; };
+		502B60631BD1208E00D9C17E /* CameraCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = CameraCell.xib; path = Views/Cells/Camera/CameraCell.xib; sourceTree = "<group>"; };
 		503315951AC1017E0008A209 /* ChatLeftTextCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ChatLeftTextCell.swift; path = Views/Cells/ChatLeftText/ChatLeftTextCell.swift; sourceTree = "<group>"; };
 		503315961AC1017E0008A209 /* ChatLeftTextCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = ChatLeftTextCell.xib; path = Views/Cells/ChatLeftText/ChatLeftTextCell.xib; sourceTree = "<group>"; };
 		5033159A1AC101C80008A209 /* ChatRightTextCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ChatRightTextCell.swift; path = Views/Cells/ChatRightText/ChatRightTextCell.swift; sourceTree = "<group>"; };
@@ -1050,6 +1054,7 @@
 				50535D251BCE4A0A002FE1A4 /* Photo */,
 				502B605C1BD1102F00D9C17E /* Title */,
 				502B60611BD112EA00D9C17E /* QuickPickPhotos */,
+				502B60661BD1209300D9C17E /* Camera */,
 			);
 			name = Cells;
 			sourceTree = "<group>";
@@ -1230,6 +1235,15 @@
 			name = QuickPickPhotos;
 			sourceTree = "<group>";
 		};
+		502B60661BD1209300D9C17E /* Camera */ = {
+			isa = PBXGroup;
+			children = (
+				502B60621BD1208E00D9C17E /* CameraCell.swift */,
+				502B60631BD1208E00D9C17E /* CameraCell.xib */,
+			);
+			name = Camera;
+			sourceTree = "<group>";
+		};
 		503315991AC101830008A209 /* ChatLeftText */ = {
 			isa = PBXGroup;
 			children = (
@@ -2155,6 +2169,7 @@
 				502AE54F1AB93175005BD199 /* ProfileHeaderCell.xib in Resources */,
 				50F5AF9A1BBBD02A0033C9BC /* FeedMediaCell.xib in Resources */,
 				50A640EA1B6F45FA0050E4A3 /* DoNotDisturbPeriodCell.xib in Resources */,
+				502B60651BD1208E00D9C17E /* CameraCell.xib in Resources */,
 				0A8F54BB1AB67D11004AD60E /* LaunchScreen.xib in Resources */,
 				5053AD511AF82A1700B3CBFA /* PickLocationCell.xib in Resources */,
 				5011382D1BCB5E150055A014 /* FeedConversationDockCell.xib in Resources */,
@@ -2403,6 +2418,7 @@
 				50E1D7291B870D7500D90A82 /* NSParagraphStyle+Yep.swift in Sources */,
 				5023DE561AB6CA1000B3EE96 /* AvatarCache.swift in Sources */,
 				5023DE371AB6979600B3EE96 /* ConversationCell.swift in Sources */,
+				502B60641BD1208E00D9C17E /* CameraCell.swift in Sources */,
 				502AE5351AB8649F005BD199 /* LoginByMobileViewController.swift in Sources */,
 				506BB7F91AE5069500C1A2A0 /* RegisterPickSkillsSelectSkillsTransitionManager.swift in Sources */,
 				50B8E6181B41340A00C17EA1 /* MessageLoadingProgressView.swift in Sources */,
diff --git a/Yep/Views/Cells/Camera/CameraCell.swift b/Yep/Views/Cells/Camera/CameraCell.swift
new file mode 100644
index 00000000..155878a7
--- /dev/null
+++ b/Yep/Views/Cells/Camera/CameraCell.swift
@@ -0,0 +1,18 @@
+//
+//  CameraCell.swift
+//  Yep
+//
+//  Created by nixzhu on 15/10/16.
+//  Copyright © 2015年 Catch Inc. All rights reserved.
+//
+
+import UIKit
+
+class CameraCell: UICollectionViewCell {
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+}
diff --git a/Yep/Views/Cells/Camera/CameraCell.xib b/Yep/Views/Cells/Camera/CameraCell.xib
new file mode 100644
index 00000000..1a907de4
--- /dev/null
+++ b/Yep/Views/Cells/Camera/CameraCell.xib
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+    <dependencies>
+        <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="CameraCell" id="gTV-IL-0wX" customClass="CameraCell" customModule="Yep" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
+                <subviews>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_more_take_photo" translatesAutoresizingMaskIntoConstraints="NO" id="9H2-Nb-pKx">
+                        <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
+                    </imageView>
+                </subviews>
+                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+            </view>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="9H2-Nb-pKx" secondAttribute="trailing" id="Ebt-FV-r5v"/>
+                <constraint firstItem="9H2-Nb-pKx" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="HKc-Mu-Gug"/>
+                <constraint firstAttribute="bottom" secondItem="9H2-Nb-pKx" secondAttribute="bottom" id="c9B-Th-ydg"/>
+                <constraint firstItem="9H2-Nb-pKx" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="u3H-nX-AMl"/>
+            </constraints>
+        </collectionViewCell>
+    </objects>
+    <resources>
+        <image name="icon_more_take_photo" width="70" height="50"/>
+    </resources>
+</document>
diff --git a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
index 7fa41373..69a6e35c 100644
--- a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
+++ b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
@@ -20,11 +20,13 @@ class QuickPickPhotosCell: UITableViewCell {
     var pickedImageSet = Set<PHAsset>()
     var completion: ((images: [UIImage], imageAssetSet: Set<PHAsset>) -> Void)?
 
+    let cameraCellID = "CameraCell"
     let photoCellID = "PhotoCell"
 
     override func awakeFromNib() {
         super.awakeFromNib()
 
+        photosCollectionView.registerNib(UINib(nibName: cameraCellID, bundle: nil), forCellWithReuseIdentifier: cameraCellID)
         photosCollectionView.registerNib(UINib(nibName: photoCellID, bundle: nil), forCellWithReuseIdentifier: photoCellID)
         photosCollectionView.dataSource = self
         photosCollectionView.delegate = self
@@ -49,17 +51,35 @@ class QuickPickPhotosCell: UITableViewCell {
 extension QuickPickPhotosCell: UICollectionViewDataSource, UICollectionViewDelegate {
 
     func numberOfSectionsInCollectionView(collectionView: UICollectionView) -> Int {
-        return 1
+        return 2
     }
 
     func collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return images.count
+        switch section {
+        case 0:
+            return 1
+        case 1:
+            return images.count
+        default:
+            return 0
+        }
     }
 
     func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {
 
-        let cell = collectionView.dequeueReusableCellWithReuseIdentifier(photoCellID, forIndexPath: indexPath) as! PhotoCell
-        return cell
+        switch indexPath.section {
+
+        case 0:
+            let cell = collectionView.dequeueReusableCellWithReuseIdentifier(cameraCellID, forIndexPath: indexPath) as! CameraCell
+            return cell
+
+        case 1:
+            let cell = collectionView.dequeueReusableCellWithReuseIdentifier(photoCellID, forIndexPath: indexPath) as! PhotoCell
+            return cell
+
+        default:
+            return UICollectionViewCell()
+        }
     }
 
     func collectionView(collectionView: UICollectionView, willDisplayCell cell: UICollectionViewCell, forItemAtIndexPath indexPath: NSIndexPath) {
diff --git a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
index f67ed7d3..333e2088 100644
--- a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
+++ b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
@@ -169,6 +169,7 @@ extension MoreMessageTypesView: UIGestureRecognizerDelegate {
 extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
 
     enum Row: Int {
+
         case PhotoGallery = 0
         case PickPhotos
         case Location

From a40ae3580c66115b36cad922dc883407f9ab1b5b Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Fri, 16 Oct 2015 20:25:08 +0800
Subject: [PATCH 08/25] pickLocationAction

---
 .../ConversationViewController.swift           |  8 +++++++-
 .../MoreMessageTypesView.swift                 | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index be7b1ab7..58dad2bf 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -148,7 +148,13 @@ class ConversationViewController: BaseViewController {
 
     lazy var moreView: ConversationMoreView = ConversationMoreView()
 
-    lazy var moreMessageTypesView: MoreMessageTypesView = MoreMessageTypesView()
+    lazy var moreMessageTypesView: MoreMessageTypesView = {
+        let view =  MoreMessageTypesView()
+        view.pickLocationAction = { [weak self] in
+            self?.performSegueWithIdentifier("presentPickLocation", sender: nil)
+        }
+        return view
+        }()
 
     lazy var pullToRefreshView: PullToRefreshView = {
 
diff --git a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
index 333e2088..42681af6 100644
--- a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
+++ b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
@@ -33,6 +33,10 @@ class MoreMessageTypesView: UIView {
         return view
         }()
 
+
+    var pickLocationAction: (() -> Void)?
+
+
     var tableViewBottomConstraint: NSLayoutConstraint?
 
     func showInView(view: UIView) {
@@ -228,5 +232,19 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
     }
 
     func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+
+        tableView.deselectRowAtIndexPath(indexPath, animated: true)
+        
+        if let row = Row(rawValue: indexPath.row) {
+            switch row {
+            case .Location:
+                hideAndDo {
+                    pickLocationAction?()
+                }
+            default:
+                break
+            }
+        }
     }
 }
+

From d2a95cc91fe33b9b674fd34681492f70f129e090 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Fri, 16 Oct 2015 20:28:43 +0800
Subject: [PATCH 09/25] cancel

---
 Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
index 42681af6..3768a03a 100644
--- a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
+++ b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
@@ -234,13 +234,15 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
     func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
 
         tableView.deselectRowAtIndexPath(indexPath, animated: true)
-        
+
         if let row = Row(rawValue: indexPath.row) {
             switch row {
             case .Location:
                 hideAndDo {
                     pickLocationAction?()
                 }
+            case .Cancel:
+                hide()
             default:
                 break
             }

From af59844ef5bbce79e68f5583eecf46d25b53af82 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Fri, 16 Oct 2015 20:33:26 +0800
Subject: [PATCH 10/25] choosePhotoAction

---
 .../ConversationViewController.swift          | 19 +++++++++++++++++++
 .../MoreMessageTypesView.swift                |  6 +++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index 58dad2bf..0c8e90e7 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -149,10 +149,29 @@ class ConversationViewController: BaseViewController {
     lazy var moreView: ConversationMoreView = ConversationMoreView()
 
     lazy var moreMessageTypesView: MoreMessageTypesView = {
+
         let view =  MoreMessageTypesView()
+
         view.pickLocationAction = { [weak self] in
             self?.performSegueWithIdentifier("presentPickLocation", sender: nil)
         }
+
+        view.choosePhotoAction = { [weak self] in
+
+            let openCameraRoll: ProposerAction = { [weak self] in
+                if UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceType.PhotoLibrary){
+                    if let strongSelf = self {
+                        strongSelf.imagePicker.sourceType = .PhotoLibrary
+                        strongSelf.presentViewController(strongSelf.imagePicker, animated: true, completion: nil)
+                    }
+                }
+            }
+
+            proposeToAccess(.Photos, agreed: openCameraRoll, rejected: {
+                self?.alertCanNotAccessCameraRoll()
+            })
+        }
+
         return view
         }()
 
diff --git a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
index 3768a03a..ee09d850 100644
--- a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
+++ b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
@@ -34,9 +34,9 @@ class MoreMessageTypesView: UIView {
         }()
 
 
+    var choosePhotoAction: (() -> Void)?
     var pickLocationAction: (() -> Void)?
 
-
     var tableViewBottomConstraint: NSLayoutConstraint?
 
     func showInView(view: UIView) {
@@ -237,6 +237,10 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
 
         if let row = Row(rawValue: indexPath.row) {
             switch row {
+            case .PickPhotos:
+                hideAndDo {
+                    choosePhotoAction?()
+                }
             case .Location:
                 hideAndDo {
                     pickLocationAction?()

From 9b5632f7c1350a06a794bab3d98f438520c8be65 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 19 Oct 2015 10:57:15 +0800
Subject: [PATCH 11/25] takePhotoAction

---
 .../ConversationViewController.swift          | 20 +++++++++++++++++--
 .../QuickPickPhotos/QuickPickPhotosCell.swift | 17 ++++++++++++++++
 .../MoreMessageTypesView.swift                |  9 ++++++++-
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index 0c8e90e7..106f0602 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -152,8 +152,20 @@ class ConversationViewController: BaseViewController {
 
         let view =  MoreMessageTypesView()
 
-        view.pickLocationAction = { [weak self] in
-            self?.performSegueWithIdentifier("presentPickLocation", sender: nil)
+        view.takePhotoAction = { [weak self] in
+
+            let openCamera: ProposerAction = { [weak self] in
+                if UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceType.Camera) {
+                    if let strongSelf = self {
+                        strongSelf.imagePicker.sourceType = .Camera
+                        strongSelf.presentViewController(strongSelf.imagePicker, animated: true, completion: nil)
+                    }
+                }
+            }
+
+            proposeToAccess(.Camera, agreed: openCamera, rejected: {
+                self?.alertCanNotOpenCamera()
+            })
         }
 
         view.choosePhotoAction = { [weak self] in
@@ -172,6 +184,10 @@ class ConversationViewController: BaseViewController {
             })
         }
 
+        view.pickLocationAction = { [weak self] in
+            self?.performSegueWithIdentifier("presentPickLocation", sender: nil)
+        }
+
         return view
         }()
 
diff --git a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
index 69a6e35c..1fc27bda 100644
--- a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
+++ b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
@@ -13,6 +13,8 @@ class QuickPickPhotosCell: UITableViewCell {
 
     @IBOutlet weak var photosCollectionView: UICollectionView!
 
+    var takePhotoAction: (() -> Void)?
+
     var images: PHFetchResult!
     let imageManager = PHCachingImageManager()
     var imageCacheController: ImageCacheController!
@@ -93,5 +95,20 @@ extension QuickPickPhotosCell: UICollectionViewDataSource, UICollectionViewDeleg
             }
         }
     }
+
+    func collectionView(collectionView: UICollectionView, didSelectItemAtIndexPath indexPath: NSIndexPath) {
+
+        switch indexPath.section {
+
+        case 0:
+            takePhotoAction?()
+
+        case 1:
+            break
+
+        default:
+            break
+        }
+    }
 }
 
diff --git a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
index ee09d850..0be41688 100644
--- a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
+++ b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
@@ -33,7 +33,7 @@ class MoreMessageTypesView: UIView {
         return view
         }()
 
-
+    var takePhotoAction: (() -> Void)?
     var choosePhotoAction: (() -> Void)?
     var pickLocationAction: (() -> Void)?
 
@@ -206,6 +206,13 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
         if let row = Row(rawValue: indexPath.row) {
             if case .PhotoGallery = row {
                 let cell = tableView.dequeueReusableCellWithIdentifier(quickPickPhotosCellID) as! QuickPickPhotosCell
+
+                cell.takePhotoAction = { [weak self] in
+                    self?.hideAndDo {
+                        self?.takePhotoAction?()
+                    }
+                }
+
                 return cell
 
             } else {

From 60e5251144a16384793de759f60572499dc90167 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 19 Oct 2015 11:24:28 +0800
Subject: [PATCH 12/25] logic of quick pickedPhotosAction

---
 .../QuickPickPhotos/QuickPickPhotosCell.swift | 21 +++++++++++++--
 .../MoreMessageTypesView.swift                | 26 +++++++++++++++++--
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
index 1fc27bda..1ccb046d 100644
--- a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
+++ b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
@@ -15,11 +15,17 @@ class QuickPickPhotosCell: UITableViewCell {
 
     var takePhotoAction: (() -> Void)?
 
+    var pickedPhotosAction: (Set<PHAsset> -> Void)?
+
     var images: PHFetchResult!
     let imageManager = PHCachingImageManager()
     var imageCacheController: ImageCacheController!
 
-    var pickedImageSet = Set<PHAsset>()
+    var pickedImageSet = Set<PHAsset>() {
+        didSet {
+            pickedPhotosAction?(pickedImageSet)
+        }
+    }
     var completion: ((images: [UIImage], imageAssetSet: Set<PHAsset>) -> Void)?
 
     let cameraCellID = "CameraCell"
@@ -104,7 +110,18 @@ extension QuickPickPhotosCell: UICollectionViewDataSource, UICollectionViewDeleg
             takePhotoAction?()
 
         case 1:
-            break
+            if let imageAsset = images[indexPath.item] as? PHAsset {
+
+                if pickedImageSet.contains(imageAsset) {
+                    pickedImageSet.remove(imageAsset)
+
+                } else {
+                    pickedImageSet.insert(imageAsset)
+                }
+
+                let cell = collectionView.cellForItemAtIndexPath(indexPath) as! PhotoCell
+                cell.photoPickedImageView.hidden = !pickedImageSet.contains(imageAsset)
+            }
 
         default:
             break
diff --git a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
index 0be41688..d4080281 100644
--- a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
+++ b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Photos
 
 class MoreMessageTypesView: UIView {
 
@@ -37,6 +38,12 @@ class MoreMessageTypesView: UIView {
     var choosePhotoAction: (() -> Void)?
     var pickLocationAction: (() -> Void)?
 
+    var quickPickedImageSet = Set<PHAsset>() {
+        didSet {
+            tableView.reloadRowsAtIndexPaths([NSIndexPath(forRow: Row.PickPhotos.rawValue, inSection: 0)], withRowAnimation: .None)
+        }
+    }
+
     var tableViewBottomConstraint: NSLayoutConstraint?
 
     func showInView(view: UIView) {
@@ -213,11 +220,22 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
                     }
                 }
 
+                cell.pickedPhotosAction = { [weak self] pickedImageSet in
+                    self?.quickPickedImageSet = pickedImageSet
+                }
+
                 return cell
 
             } else {
                 let cell = tableView.dequeueReusableCellWithIdentifier(titleCellID) as! TitleCell
                 cell.singleTitleLabel.text = row.normalTitle
+
+                if case .PickPhotos = row {
+                    if !quickPickedImageSet.isEmpty {
+                        cell.singleTitleLabel.text = String(format: NSLocalizedString("Send Photos (%d)", comment: ""), quickPickedImageSet.count)
+                    }
+                }
+
                 return cell
             }
         }
@@ -245,8 +263,12 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
         if let row = Row(rawValue: indexPath.row) {
             switch row {
             case .PickPhotos:
-                hideAndDo {
-                    choosePhotoAction?()
+                if !quickPickedImageSet.isEmpty {
+
+                } else {
+                    hideAndDo {
+                        choosePhotoAction?()
+                    }
                 }
             case .Location:
                 hideAndDo {

From 28dd2b3ae0c9a1d1a3f301850397d5726e969f70 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 19 Oct 2015 11:36:30 +0800
Subject: [PATCH 13/25] sendImageAction for quick picked photos

---
 .../ConversationViewController.swift          |  4 ++
 .../MoreMessageTypesView.swift                | 48 +++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index 106f0602..8d901852 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -152,6 +152,10 @@ class ConversationViewController: BaseViewController {
 
         let view =  MoreMessageTypesView()
 
+        view.sendImageAction = { [weak self] image in
+            self?.sendImage(image)
+        }
+
         view.takePhotoAction = { [weak self] in
 
             let openCamera: ProposerAction = { [weak self] in
diff --git a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
index d4080281..36d11262 100644
--- a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
+++ b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
@@ -37,6 +37,7 @@ class MoreMessageTypesView: UIView {
     var takePhotoAction: (() -> Void)?
     var choosePhotoAction: (() -> Void)?
     var pickLocationAction: (() -> Void)?
+    var sendImageAction: (UIImage -> Void)?
 
     var quickPickedImageSet = Set<PHAsset>() {
         didSet {
@@ -265,6 +266,53 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
             case .PickPhotos:
                 if !quickPickedImageSet.isEmpty {
 
+                    var images = [UIImage]()
+
+                    let options = PHImageRequestOptions()
+                    options.synchronous = true
+
+                    let imageManager = PHCachingImageManager()
+                    for imageAsset in quickPickedImageSet {
+
+                        let maxSize: CGFloat = 512
+
+                        let pixelWidth = CGFloat(imageAsset.pixelWidth)
+                        let pixelHeight = CGFloat(imageAsset.pixelHeight)
+
+                        //println("pixelWidth: \(pixelWidth)")
+                        //println("pixelHeight: \(pixelHeight)")
+
+                        let targetSize: CGSize
+
+                        if pixelWidth > pixelHeight {
+                            let width = maxSize
+                            let height = floor(maxSize * (pixelHeight / pixelWidth))
+                            targetSize = CGSize(width: width, height: height)
+
+                        } else {
+                            let height = maxSize
+                            let width = floor(maxSize * (pixelWidth / pixelHeight))
+                            targetSize = CGSize(width: width, height: height)
+                        }
+                        
+                        //println("targetSize: \(targetSize)")
+                        
+                        imageManager.requestImageForAsset(imageAsset, targetSize: targetSize, contentMode: .AspectFill, options: options) { image, info in
+                            if let image = image {
+                                println("image.size: \(image.size)")
+                                images.append(image)
+                            }
+                        }
+                    }
+
+                    images.forEach {
+                        sendImageAction?($0)
+                    }
+
+                    quickPickedImageSet.removeAll()
+
+                    hide()
+
                 } else {
                     hideAndDo {
                         choosePhotoAction?()

From ad08d648357f1bf18d13a700536acfe86682b1df Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 19 Oct 2015 11:42:24 +0800
Subject: [PATCH 14/25] newest photo on top

---
 .../PickPhotos/PickPhotosViewController.swift               | 6 +++++-
 Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift   | 6 +++++-
 Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift       | 4 ++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Yep/ViewControllers/PickPhotos/PickPhotosViewController.swift b/Yep/ViewControllers/PickPhotos/PickPhotosViewController.swift
index 4b8ae0e6..ab6d81f1 100644
--- a/Yep/ViewControllers/PickPhotos/PickPhotosViewController.swift
+++ b/Yep/ViewControllers/PickPhotos/PickPhotosViewController.swift
@@ -45,7 +45,11 @@ class PickPhotosViewController: UICollectionViewController, PHPhotoLibraryChange
             layout.sectionInset = UIEdgeInsets(top: gap, left: gap, bottom: gap, right: gap)
         }
 
-        images = PHAsset.fetchAssetsWithMediaType(.Image, options: nil)
+        let options = PHFetchOptions()
+        options.sortDescriptors = [
+            NSSortDescriptor(key: "creationDate", ascending: false)
+        ]
+        images = PHAsset.fetchAssetsWithMediaType(.Image, options: options)
         imageCacheController = ImageCacheController(imageManager: imageManager, images: images, preheatSize: 1)
 
         PHPhotoLibrary.sharedPhotoLibrary().registerChangeObserver(self)
diff --git a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
index 1ccb046d..afbfc8b1 100644
--- a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
+++ b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
@@ -45,7 +45,11 @@ class QuickPickPhotosCell: UITableViewCell {
             layout.sectionInset = UIEdgeInsetsZero
         }
 
-        images = PHAsset.fetchAssetsWithMediaType(.Image, options: nil)
+        let options = PHFetchOptions()
+        options.sortDescriptors = [
+            NSSortDescriptor(key: "creationDate", ascending: false)
+        ]
+        images = PHAsset.fetchAssetsWithMediaType(.Image, options: options)
         imageCacheController = ImageCacheController(imageManager: imageManager, images: images, preheatSize: 1)
     }
 
diff --git a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
index 36d11262..764201a9 100644
--- a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
+++ b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
@@ -263,6 +263,7 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
 
         if let row = Row(rawValue: indexPath.row) {
             switch row {
+
             case .PickPhotos:
                 if !quickPickedImageSet.isEmpty {
 
@@ -318,12 +319,15 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
                         choosePhotoAction?()
                     }
                 }
+
             case .Location:
                 hideAndDo {
                     pickLocationAction?()
                 }
+
             case .Cancel:
                 hide()
+
             default:
                 break
             }

From cd8ec45ddb010b86dfcd0ea3e1d7f27a6934a3fc Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 19 Oct 2015 11:45:52 +0800
Subject: [PATCH 15/25] QuickPickPhotosCell detail

---
 Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
index afbfc8b1..208c8640 100644
--- a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
+++ b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
@@ -34,6 +34,7 @@ class QuickPickPhotosCell: UITableViewCell {
     override func awakeFromNib() {
         super.awakeFromNib()
 
+        photosCollectionView.backgroundColor = UIColor.clearColor()
         photosCollectionView.registerNib(UINib(nibName: cameraCellID, bundle: nil), forCellWithReuseIdentifier: cameraCellID)
         photosCollectionView.registerNib(UINib(nibName: photoCellID, bundle: nil), forCellWithReuseIdentifier: photoCellID)
         photosCollectionView.dataSource = self
@@ -42,7 +43,7 @@ class QuickPickPhotosCell: UITableViewCell {
         if let layout = photosCollectionView.collectionViewLayout as? UICollectionViewFlowLayout {
             layout.itemSize = CGSize(width: 70, height: 70)
             layout.minimumInteritemSpacing = 10
-            layout.sectionInset = UIEdgeInsetsZero
+            layout.sectionInset = UIEdgeInsets(top: 0, left: 15, bottom: 0, right: 0)
         }
 
         let options = PHFetchOptions()

From c36ac3964fa4c06ec237d14baaa4c10f83ecc476 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 19 Oct 2015 11:55:27 +0800
Subject: [PATCH 16/25] color & image

---
 .../icon_quick_camera.imageset/Contents.json     |  12 ++++++++++++
 .../icon_quick_camera.pdf                        | Bin 0 -> 4277 bytes
 Yep/Views/Cells/Camera/CameraCell.swift          |   5 +++--
 Yep/Views/Cells/Camera/CameraCell.xib            |   4 ++--
 .../QuickPickPhotos/QuickPickPhotosCell.swift    |   4 +++-
 Yep/Views/Cells/Title/TitleCell.swift            |   6 ++++++
 .../MoreMessageTypes/MoreMessageTypesView.swift  |   3 +++
 7 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 Yep/Images.xcassets/icon_quick_camera.imageset/Contents.json
 create mode 100644 Yep/Images.xcassets/icon_quick_camera.imageset/icon_quick_camera.pdf

diff --git a/Yep/Images.xcassets/icon_quick_camera.imageset/Contents.json b/Yep/Images.xcassets/icon_quick_camera.imageset/Contents.json
new file mode 100644
index 00000000..86b39c35
--- /dev/null
+++ b/Yep/Images.xcassets/icon_quick_camera.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_quick_camera.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Yep/Images.xcassets/icon_quick_camera.imageset/icon_quick_camera.pdf b/Yep/Images.xcassets/icon_quick_camera.imageset/icon_quick_camera.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..cd01c6acec9c00ff48db226f504659cbd9be9105
GIT binary patch
literal 4277
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
E01LHH=l}o!

literal 0
HcmV?d00001

diff --git a/Yep/Views/Cells/Camera/CameraCell.swift b/Yep/Views/Cells/Camera/CameraCell.swift
index 155878a7..c268015f 100644
--- a/Yep/Views/Cells/Camera/CameraCell.swift
+++ b/Yep/Views/Cells/Camera/CameraCell.swift
@@ -12,7 +12,8 @@ class CameraCell: UICollectionViewCell {
 
     override func awakeFromNib() {
         super.awakeFromNib()
-        // Initialization code
-    }
 
+        contentView.backgroundColor = UIColor.yepTintColor()
+    }
 }
+
diff --git a/Yep/Views/Cells/Camera/CameraCell.xib b/Yep/Views/Cells/Camera/CameraCell.xib
index 1a907de4..d249c13c 100644
--- a/Yep/Views/Cells/Camera/CameraCell.xib
+++ b/Yep/Views/Cells/Camera/CameraCell.xib
@@ -13,7 +13,7 @@
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                 <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
                 <subviews>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_more_take_photo" translatesAutoresizingMaskIntoConstraints="NO" id="9H2-Nb-pKx">
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_quick_camera" translatesAutoresizingMaskIntoConstraints="NO" id="9H2-Nb-pKx">
                         <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
                     </imageView>
                 </subviews>
@@ -28,6 +28,6 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="icon_more_take_photo" width="70" height="50"/>
+        <image name="icon_quick_camera" width="70" height="50"/>
     </resources>
 </document>
diff --git a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
index 208c8640..efc39561 100644
--- a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
+++ b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
@@ -43,7 +43,9 @@ class QuickPickPhotosCell: UITableViewCell {
         if let layout = photosCollectionView.collectionViewLayout as? UICollectionViewFlowLayout {
             layout.itemSize = CGSize(width: 70, height: 70)
             layout.minimumInteritemSpacing = 10
-            layout.sectionInset = UIEdgeInsets(top: 0, left: 15, bottom: 0, right: 0)
+            layout.sectionInset = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 0)
+
+            photosCollectionView.contentInset = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0)
         }
 
         let options = PHFetchOptions()
diff --git a/Yep/Views/Cells/Title/TitleCell.swift b/Yep/Views/Cells/Title/TitleCell.swift
index e5fbd35c..cd2a545a 100644
--- a/Yep/Views/Cells/Title/TitleCell.swift
+++ b/Yep/Views/Cells/Title/TitleCell.swift
@@ -12,6 +12,12 @@ class TitleCell: UITableViewCell {
 
     @IBOutlet weak var singleTitleLabel: UILabel!
 
+    var boldEnabled = false {
+        didSet {
+            singleTitleLabel.font = boldEnabled ? UIFont.boldSystemFontOfSize(17) : UIFont.systemFontOfSize(17)
+        }
+    }
+
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
diff --git a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
index 764201a9..7b68ebf4 100644
--- a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
+++ b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
@@ -230,10 +230,13 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
             } else {
                 let cell = tableView.dequeueReusableCellWithIdentifier(titleCellID) as! TitleCell
                 cell.singleTitleLabel.text = row.normalTitle
+                cell.boldEnabled = false
+                cell.singleTitleLabel.textColor = UIColor.yepTintColor()
 
                 if case .PickPhotos = row {
                     if !quickPickedImageSet.isEmpty {
                         cell.singleTitleLabel.text = String(format: NSLocalizedString("Send Photos (%d)", comment: ""), quickPickedImageSet.count)
+                        cell.boldEnabled = true
                     }
                 }
 

From 885c7476f58ea39f95e7d93f15a5466d7a12f5f4 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 19 Oct 2015 12:07:04 +0800
Subject: [PATCH 17/25] remove MoreMessages from MessageToolbarState; sate
 machine logic

---
 .../ConversationViewController.swift          | 38 +++++++++++--------
 Yep/Views/MessageToolbar/MessageToolbar.swift | 22 +++--------
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index 8d901852..362aa96b 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -434,20 +434,20 @@ class ConversationViewController: BaseViewController {
 
             if let strongSelf = self {
 
-                if strongSelf.messageToolbar.state == .MoreMessages {
-                    strongSelf.conversationCollectionView.contentOffset.y -= keyboardHeight //- strongSelf.moreMessageTypesViewDefaultHeight
-                    strongSelf.conversationCollectionView.contentInset.bottom = strongSelf.messageToolbar.frame.height //+ strongSelf.moreMessageTypesViewDefaultHeight
-
-                    //strongSelf.messageToolbarBottomConstraint.constant = strongSelf.moreMessageTypesViewDefaultHeight
-                    strongSelf.view.layoutIfNeeded()
-
-                } else {
+//                if strongSelf.messageToolbar.state == .MoreMessages {
+//                    strongSelf.conversationCollectionView.contentOffset.y -= keyboardHeight //- strongSelf.moreMessageTypesViewDefaultHeight
+//                    strongSelf.conversationCollectionView.contentInset.bottom = strongSelf.messageToolbar.frame.height //+ strongSelf.moreMessageTypesViewDefaultHeight
+//
+//                    //strongSelf.messageToolbarBottomConstraint.constant = strongSelf.moreMessageTypesViewDefaultHeight
+//                    strongSelf.view.layoutIfNeeded()
+//
+//                } else {
                     strongSelf.conversationCollectionView.contentOffset.y -= keyboardHeight
                     strongSelf.conversationCollectionView.contentInset.bottom = strongSelf.messageToolbar.frame.height
 
                     strongSelf.messageToolbarBottomConstraint.constant = 0
                     strongSelf.view.layoutIfNeeded()
-                }
+//                }
             }
         }
 
@@ -519,12 +519,23 @@ class ConversationViewController: BaseViewController {
 
             messageToolbar.conversation = conversation
 
+            messageToolbar.moreMessageTypesAction = { [weak self] in
+
+                if let window = self?.view.window {
+                    self?.moreMessageTypesView.showInView(window)
+
+                    delay(0.2) {
+                        self?.imagePicker.hidesBarsOnTap = false
+                    }
+                }
+            }
             // MARK: MessageToolbar State Transitions
 
             messageToolbar.stateTransitionAction = { [weak self] (messageToolbar, previousState, currentState) in
 
                 if let strongSelf = self {
 
+                    /*
                     switch (previousState, currentState) {
 
                     case (.MoreMessages, .Default): fallthrough
@@ -571,15 +582,12 @@ class ConversationViewController: BaseViewController {
                                 self?.imagePicker.hidesBarsOnTap = false
                             }
                             */
-
-                            if let window = self?.view.window {
-                                self?.moreMessageTypesView.showInView(window)
-                            }
                         }
                     }
+                    */
 
                     switch currentState {
-                    case .BeginTextInput, .MoreMessages:
+                    case .BeginTextInput:
                         self?.tryFoldFeedView()
                     default:
                         break
@@ -2827,7 +2835,7 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi
         
         switch messageToolbar.state {
 
-        case .BeginTextInput, .TextInputing, .MoreMessages:
+        case .BeginTextInput, .TextInputing:
             messageToolbar.state = .Default
 
         default:
diff --git a/Yep/Views/MessageToolbar/MessageToolbar.swift b/Yep/Views/MessageToolbar/MessageToolbar.swift
index 725bd450..4d8bf600 100644
--- a/Yep/Views/MessageToolbar/MessageToolbar.swift
+++ b/Yep/Views/MessageToolbar/MessageToolbar.swift
@@ -9,11 +9,11 @@
 import UIKit
 
 enum MessageToolbarState: Int, CustomStringConvertible {
+
     case Default
     case BeginTextInput
     case TextInputing
     case VoiceRecord
-    case MoreMessages
 
     var description: String {
         switch self {
@@ -25,8 +25,6 @@ enum MessageToolbarState: Int, CustomStringConvertible {
             return "TextInputing"
         case .VoiceRecord:
             return "VoiceRecord"
-        case .MoreMessages:
-            return "MoreMessages"
         }
     }
 }
@@ -113,10 +111,6 @@ class MessageToolbar: UIToolbar {
                 moreButton.tintColor = UIColor.messageToolBarColor()
                 
                 showVoiceButtonAnimation()
-
-            case .MoreMessages:
-                moreButton.setImage(UIImage(named: "item_less"), forState: .Normal)
-                moreButton.tintColor = UIColor.messageToolBarHighlightColor()
             }
 
             updateHeightOfMessageTextView()
@@ -137,7 +131,7 @@ class MessageToolbar: UIToolbar {
 
     var textSendAction: ((messageToolBar: MessageToolbar) -> Void)?
 
-    var toggleMoreMessagesAction: ((messageToolBar: MessageToolbar) -> Void)?
+    var moreMessageTypesAction: (() -> Void)?
 
     var voiceRecordBeginAction: ((messageToolBar: MessageToolbar) -> Void)?
     
@@ -209,7 +203,7 @@ class MessageToolbar: UIToolbar {
         button.setImage(UIImage(named: "item_more"), forState: .Normal)
         button.tintColor = UIColor.messageToolBarColor()
         button.tintAdjustmentMode = .Normal
-        button.addTarget(self, action: "toggleMoreMessages", forControlEvents: UIControlEvents.TouchUpInside)
+        button.addTarget(self, action: "moreMessageTypes", forControlEvents: UIControlEvents.TouchUpInside)
         return button
         }()
 
@@ -394,14 +388,8 @@ class MessageToolbar: UIToolbar {
         }
     }
 
-    func toggleMoreMessages() {
-
-        if state != .MoreMessages {
-            state = .MoreMessages
-
-        } else {
-            state = .Default
-        }
+    func moreMessageTypes() {
+        moreMessageTypesAction?()
     }
 
     func tryVoiceRecordBegin() {

From 8701574e3c16f30a3cca045ed4ce38d03d7ecb25 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 19 Oct 2015 12:13:50 +0800
Subject: [PATCH 18/25] clean code & images

---
 .../Contents.json                             |  12 ---
 .../icon_more_add_contact.pdf                 | Bin 4836 -> 0 bytes
 .../Contents.json                             |  12 ---
 .../icon_more_add_location.pdf                | Bin 4881 -> 0 bytes
 .../Contents.json                             |  12 ---
 .../icon_more_choose_photo.pdf                | Bin 4482 -> 0 bytes
 .../Contents.json                             |  12 ---
 .../icon_more_take_photo.pdf                  | Bin 4501 -> 0 bytes
 .../item_less.imageset/Contents.json          |  15 ----
 .../item_less.imageset/item_less.pdf          | Bin 3949 -> 0 bytes
 .../ConversationViewController.swift          |  72 ++----------------
 11 files changed, 7 insertions(+), 128 deletions(-)
 delete mode 100644 Yep/Images.xcassets/icon_more_add_contact.imageset/Contents.json
 delete mode 100644 Yep/Images.xcassets/icon_more_add_contact.imageset/icon_more_add_contact.pdf
 delete mode 100644 Yep/Images.xcassets/icon_more_add_location.imageset/Contents.json
 delete mode 100644 Yep/Images.xcassets/icon_more_add_location.imageset/icon_more_add_location.pdf
 delete mode 100644 Yep/Images.xcassets/icon_more_choose_photo.imageset/Contents.json
 delete mode 100644 Yep/Images.xcassets/icon_more_choose_photo.imageset/icon_more_choose_photo.pdf
 delete mode 100644 Yep/Images.xcassets/icon_more_take_photo.imageset/Contents.json
 delete mode 100644 Yep/Images.xcassets/icon_more_take_photo.imageset/icon_more_take_photo.pdf
 delete mode 100644 Yep/Images.xcassets/item_less.imageset/Contents.json
 delete mode 100644 Yep/Images.xcassets/item_less.imageset/item_less.pdf

diff --git a/Yep/Images.xcassets/icon_more_add_contact.imageset/Contents.json b/Yep/Images.xcassets/icon_more_add_contact.imageset/Contents.json
deleted file mode 100644
index c9411d94..00000000
--- a/Yep/Images.xcassets/icon_more_add_contact.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "icon_more_add_contact.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Yep/Images.xcassets/icon_more_add_contact.imageset/icon_more_add_contact.pdf b/Yep/Images.xcassets/icon_more_add_contact.imageset/icon_more_add_contact.pdf
deleted file mode 100644
index 3036ca1f0d29fb17291d55910a25820096d88e73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4836
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

diff --git a/Yep/Images.xcassets/icon_more_add_location.imageset/Contents.json b/Yep/Images.xcassets/icon_more_add_location.imageset/Contents.json
deleted file mode 100644
index f74f7242..00000000
--- a/Yep/Images.xcassets/icon_more_add_location.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "icon_more_add_location.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Yep/Images.xcassets/icon_more_add_location.imageset/icon_more_add_location.pdf b/Yep/Images.xcassets/icon_more_add_location.imageset/icon_more_add_location.pdf
deleted file mode 100644
index 13998c926d209e7da21b7d1b57874fd702515848..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4881
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

diff --git a/Yep/Images.xcassets/icon_more_choose_photo.imageset/Contents.json b/Yep/Images.xcassets/icon_more_choose_photo.imageset/Contents.json
deleted file mode 100644
index 5d0190f7..00000000
--- a/Yep/Images.xcassets/icon_more_choose_photo.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "icon_more_choose_photo.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Yep/Images.xcassets/icon_more_choose_photo.imageset/icon_more_choose_photo.pdf b/Yep/Images.xcassets/icon_more_choose_photo.imageset/icon_more_choose_photo.pdf
deleted file mode 100644
index 99396182ab368602e7b6299885a8728b1afba50a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4482
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
IS}MT*1LR+~^#A|>

diff --git a/Yep/Images.xcassets/icon_more_take_photo.imageset/Contents.json b/Yep/Images.xcassets/icon_more_take_photo.imageset/Contents.json
deleted file mode 100644
index 8d0db4bf..00000000
--- a/Yep/Images.xcassets/icon_more_take_photo.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "icon_more_take_photo.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Yep/Images.xcassets/icon_more_take_photo.imageset/icon_more_take_photo.pdf b/Yep/Images.xcassets/icon_more_take_photo.imageset/icon_more_take_photo.pdf
deleted file mode 100644
index 3a1b9c6c364d9bf200d6af621cd9cbeb34d1a8d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4501
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

diff --git a/Yep/Images.xcassets/item_less.imageset/Contents.json b/Yep/Images.xcassets/item_less.imageset/Contents.json
deleted file mode 100644
index 73b5368e..00000000
--- a/Yep/Images.xcassets/item_less.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "item_less.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}
\ No newline at end of file
diff --git a/Yep/Images.xcassets/item_less.imageset/item_less.pdf b/Yep/Images.xcassets/item_less.imageset/item_less.pdf
deleted file mode 100644
index fce333f43cb0a25d21d49dc9ce488e0cb37cd1c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3949
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

diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index 362aa96b..2c1cb03c 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -434,20 +434,11 @@ class ConversationViewController: BaseViewController {
 
             if let strongSelf = self {
 
-//                if strongSelf.messageToolbar.state == .MoreMessages {
-//                    strongSelf.conversationCollectionView.contentOffset.y -= keyboardHeight //- strongSelf.moreMessageTypesViewDefaultHeight
-//                    strongSelf.conversationCollectionView.contentInset.bottom = strongSelf.messageToolbar.frame.height //+ strongSelf.moreMessageTypesViewDefaultHeight
-//
-//                    //strongSelf.messageToolbarBottomConstraint.constant = strongSelf.moreMessageTypesViewDefaultHeight
-//                    strongSelf.view.layoutIfNeeded()
-//
-//                } else {
-                    strongSelf.conversationCollectionView.contentOffset.y -= keyboardHeight
-                    strongSelf.conversationCollectionView.contentInset.bottom = strongSelf.messageToolbar.frame.height
+                strongSelf.conversationCollectionView.contentOffset.y -= keyboardHeight
+                strongSelf.conversationCollectionView.contentInset.bottom = strongSelf.messageToolbar.frame.height
 
-                    strongSelf.messageToolbarBottomConstraint.constant = 0
-                    strongSelf.view.layoutIfNeeded()
-//                }
+                strongSelf.messageToolbarBottomConstraint.constant = 0
+                strongSelf.view.layoutIfNeeded()
             }
         }
 
@@ -519,6 +510,8 @@ class ConversationViewController: BaseViewController {
 
             messageToolbar.conversation = conversation
 
+            // MARK: MessageToolbar MoreMessageTypes
+
             messageToolbar.moreMessageTypesAction = { [weak self] in
 
                 if let window = self?.view.window {
@@ -529,63 +522,12 @@ class ConversationViewController: BaseViewController {
                     }
                 }
             }
+
             // MARK: MessageToolbar State Transitions
 
             messageToolbar.stateTransitionAction = { [weak self] (messageToolbar, previousState, currentState) in
 
                 if let strongSelf = self {
-
-                    /*
-                    switch (previousState, currentState) {
-
-                    case (.MoreMessages, .Default): fallthrough
-                    case (.MoreMessages, .VoiceRecord):
-
-                        dispatch_async(dispatch_get_main_queue()) { [weak self] in
-
-                            UIView.animateWithDuration(0.2, delay: 0.0, options: .CurveEaseInOut, animations: { _ in
-
-                                //strongSelf.conversationCollectionView.contentOffset.y -= strongSelf.moreMessageTypesViewDefaultHeight
-                                strongSelf.conversationCollectionView.contentInset.bottom = strongSelf.messageToolbar.frame.height
-
-                                strongSelf.messageToolbarBottomConstraint.constant = 0
-                                strongSelf.view.layoutIfNeeded()
-
-                            }, completion: { finished in
-                            })
-                        }
-
-                    default:
-
-                        if currentState == .MoreMessages {
-
-                            /*
-                            if previousState != .BeginTextInput && previousState != .TextInputing {
-
-                                dispatch_async(dispatch_get_main_queue()) { [weak self] in
-
-                                    UIView.animateWithDuration(0.2, delay: 0.0, options: .CurveEaseInOut, animations: { _ in
-
-                                        strongSelf.conversationCollectionView.contentOffset.y += strongSelf.moreMessageTypesViewDefaultHeight
-                                        strongSelf.conversationCollectionView.contentInset.bottom = strongSelf.messageToolbar.frame.height + strongSelf.moreMessageTypesViewDefaultHeight
-
-                                        strongSelf.messageToolbarBottomConstraint.constant = strongSelf.moreMessageTypesViewDefaultHeight
-                                        strongSelf.view.layoutIfNeeded()
-
-                                    }, completion: { finished in
-                                    })
-                                }
-                            }
-
-                            // touch to create (if need) for faster appear
-                            delay(0.2) {
-                                self?.imagePicker.hidesBarsOnTap = false
-                            }
-                            */
-                        }
-                    }
-                    */
-
                     switch currentState {
                     case .BeginTextInput:
                         self?.tryFoldFeedView()

From d687f0564eebc6f52b3242ee475244fd6005dcf1 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 19 Oct 2015 12:30:24 +0800
Subject: [PATCH 19/25] use proposeToAccess in QuickPickPhotosCell

---
 .../ConversationViewController.swift          | 47 ++-----------------
 .../QuickPickPhotos/QuickPickPhotosCell.swift | 35 +++++++++-----
 .../MoreMessageTypesView.swift                |  5 ++
 3 files changed, 33 insertions(+), 54 deletions(-)

diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index 2c1cb03c..70e3e231 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -152,6 +152,10 @@ class ConversationViewController: BaseViewController {
 
         let view =  MoreMessageTypesView()
 
+        view.alertCanNotAccessCameraRollAction = { [weak self] in
+            self?.alertCanNotAccessCameraRoll()
+        }
+
         view.sendImageAction = { [weak self] image in
             self?.sendImage(image)
         }
@@ -866,49 +870,6 @@ class ConversationViewController: BaseViewController {
 
                 self?.swipeUpPromptLabel.text = text
             }
-
-            // MARK: More Message Types
-
-            /*
-            choosePhotoButton.title = NSLocalizedString("Choose photo", comment: "")
-            choosePhotoButton.tapAction = { [weak self] in
-
-                let openCameraRoll: ProposerAction = { [weak self] in
-                    if UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceType.PhotoLibrary){
-                        if let strongSelf = self {
-                            strongSelf.imagePicker.sourceType = .PhotoLibrary
-                            strongSelf.presentViewController(strongSelf.imagePicker, animated: true, completion: nil)
-                        }
-                    }
-                }
-
-                proposeToAccess(.Photos, agreed: openCameraRoll, rejected: {
-                    self?.alertCanNotAccessCameraRoll()
-                })
-            }
-
-            takePhotoButton.title = NSLocalizedString("Take photo", comment: "")
-            takePhotoButton.tapAction = { [weak self] in
-
-                let openCamera: ProposerAction = { [weak self] in
-                    if UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceType.Camera) {
-                        if let strongSelf = self {
-                            strongSelf.imagePicker.sourceType = .Camera
-                            strongSelf.presentViewController(strongSelf.imagePicker, animated: true, completion: nil)
-                        }
-                    }
-                }
-
-                proposeToAccess(.Camera, agreed: openCamera, rejected: {
-                    self?.alertCanNotOpenCamera()
-                })
-            }
-
-            addLocationButton.title = NSLocalizedString("Share location", comment: "")
-            addLocationButton.tapAction = { [weak self] in
-                self?.performSegueWithIdentifier("presentPickLocation", sender: nil)
-            }
-            */
         }
     }
 
diff --git a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
index efc39561..ca7c7aaa 100644
--- a/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
+++ b/Yep/Views/Cells/QuickPickPhotos/QuickPickPhotosCell.swift
@@ -8,16 +8,17 @@
 
 import UIKit
 import Photos
+import Proposer
 
 class QuickPickPhotosCell: UITableViewCell {
 
     @IBOutlet weak var photosCollectionView: UICollectionView!
 
+    var alertCanNotAccessCameraRollAction: (() -> Void)?
     var takePhotoAction: (() -> Void)?
-
     var pickedPhotosAction: (Set<PHAsset> -> Void)?
 
-    var images: PHFetchResult!
+    var images: PHFetchResult?
     let imageManager = PHCachingImageManager()
     var imageCacheController: ImageCacheController!
 
@@ -48,12 +49,24 @@ class QuickPickPhotosCell: UITableViewCell {
             photosCollectionView.contentInset = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 0)
         }
 
-        let options = PHFetchOptions()
-        options.sortDescriptors = [
-            NSSortDescriptor(key: "creationDate", ascending: false)
-        ]
-        images = PHAsset.fetchAssetsWithMediaType(.Image, options: options)
-        imageCacheController = ImageCacheController(imageManager: imageManager, images: images, preheatSize: 1)
+        proposeToAccess(.Photos, agreed: {
+            dispatch_async(dispatch_get_main_queue()) { [weak self] in
+                if let strongSelf = self {
+                    let options = PHFetchOptions()
+                    options.sortDescriptors = [
+                        NSSortDescriptor(key: "creationDate", ascending: false)
+                    ]
+                    let images = PHAsset.fetchAssetsWithMediaType(.Image, options: options)
+                    strongSelf.images = images
+                    strongSelf.imageCacheController = ImageCacheController(imageManager: strongSelf.imageManager, images: images, preheatSize: 1)
+
+                    strongSelf.photosCollectionView.reloadData()
+                }
+            }
+
+        }, rejected: { [weak self] in
+            self?.alertCanNotAccessCameraRollAction?()
+        })
     }
 
     override func setSelected(selected: Bool, animated: Bool) {
@@ -74,7 +87,7 @@ extension QuickPickPhotosCell: UICollectionViewDataSource, UICollectionViewDeleg
         case 0:
             return 1
         case 1:
-            return images.count
+            return images?.count ?? 0
         default:
             return 0
         }
@@ -102,7 +115,7 @@ extension QuickPickPhotosCell: UICollectionViewDataSource, UICollectionViewDeleg
         if let cell = cell as? PhotoCell {
             cell.imageManager = imageManager
 
-            if let imageAsset = images[indexPath.item] as? PHAsset {
+            if let imageAsset = images?[indexPath.item] as? PHAsset {
                 cell.imageAsset = imageAsset
                 cell.photoPickedImageView.hidden = !pickedImageSet.contains(imageAsset)
             }
@@ -117,7 +130,7 @@ extension QuickPickPhotosCell: UICollectionViewDataSource, UICollectionViewDeleg
             takePhotoAction?()
 
         case 1:
-            if let imageAsset = images[indexPath.item] as? PHAsset {
+            if let imageAsset = images?[indexPath.item] as? PHAsset {
 
                 if pickedImageSet.contains(imageAsset) {
                     pickedImageSet.remove(imageAsset)
diff --git a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
index 7b68ebf4..8773db7d 100644
--- a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
+++ b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
@@ -34,6 +34,7 @@ class MoreMessageTypesView: UIView {
         return view
         }()
 
+    var alertCanNotAccessCameraRollAction: (() -> Void)?
     var takePhotoAction: (() -> Void)?
     var choosePhotoAction: (() -> Void)?
     var pickLocationAction: (() -> Void)?
@@ -215,6 +216,10 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
             if case .PhotoGallery = row {
                 let cell = tableView.dequeueReusableCellWithIdentifier(quickPickPhotosCellID) as! QuickPickPhotosCell
 
+                cell.alertCanNotAccessCameraRollAction = { [weak self] in
+                    self?.alertCanNotAccessCameraRollAction?()
+                }
+
                 cell.takePhotoAction = { [weak self] in
                     self?.hideAndDo {
                         self?.takePhotoAction?()

From aeebc6f3405c1d28f550c0b510dbbffa152cf588 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 19 Oct 2015 12:34:33 +0800
Subject: [PATCH 20/25] clean code in NewFeed

---
 .../NewFeed/NewFeedViewController.swift       | 72 -------------------
 1 file changed, 72 deletions(-)

diff --git a/Yep/ViewControllers/NewFeed/NewFeedViewController.swift b/Yep/ViewControllers/NewFeed/NewFeedViewController.swift
index a0fc8b41..f4efc5ea 100644
--- a/Yep/ViewControllers/NewFeed/NewFeedViewController.swift
+++ b/Yep/ViewControllers/NewFeed/NewFeedViewController.swift
@@ -21,15 +21,6 @@ class NewFeedViewController: UIViewController {
     @IBOutlet weak var messageTextView: UITextView!
     @IBOutlet weak var mediaCollectionView: UICollectionView!
 
-    lazy var imagePicker: UIImagePickerController = {
-        let imagePicker = UIImagePickerController()
-        imagePicker.delegate = self
-        imagePicker.mediaTypes = [kUTTypeImage as String]
-        imagePicker.videoQuality = .TypeMedium
-        imagePicker.allowsEditing = false
-        return imagePicker
-        }()
-
     var imageAssetSet: Set<PHAsset>?
 
     var mediaImages = [UIImage]() {
@@ -96,15 +87,6 @@ class NewFeedViewController: UIViewController {
         }
     }
 
-    override func viewDidAppear(animated: Bool) {
-        super.viewDidAppear(animated)
-
-        // touch to create (if need) for faster appear
-        delay(0.2) { [weak self] in
-            self?.imagePicker.hidesBarsOnTap = false
-        }
-    }
-
     // MARK: Navigation
 
     override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
@@ -265,21 +247,6 @@ extension NewFeedViewController: UICollectionViewDataSource, UICollectionViewDel
         switch indexPath.section {
 
         case 0:
-            /*
-            let openCameraRoll: ProposerAction = { [weak self] in
-                if UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceType.PhotoLibrary) {
-                    if let strongSelf = self {
-                        strongSelf.imagePicker.sourceType = .SavedPhotosAlbum
-                        strongSelf.presentViewController(strongSelf.imagePicker, animated: true, completion: nil)
-                    }
-                }
-            }
-
-            proposeToAccess(.Photos, agreed: openCameraRoll, rejected: { [weak self] in
-                self?.alertCanNotAccessCameraRoll()
-            })
-            */
-
             proposeToAccess(.Photos, agreed: { [weak self] in
                 self?.performSegueWithIdentifier("showPickPhotos", sender: nil)
 
@@ -297,42 +264,3 @@ extension NewFeedViewController: UICollectionViewDataSource, UICollectionViewDel
     }
 }
 
-extension NewFeedViewController: UIImagePickerControllerDelegate, UINavigationControllerDelegate {
-
-    func imagePickerController(picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : AnyObject]) {
-
-        if let mediaType = info[UIImagePickerControllerMediaType] as? String {
-
-            if mediaType == (kUTTypeImage as String) {
-
-                if let image = info[UIImagePickerControllerOriginalImage] as? UIImage {
-
-                    let imageWidth = image.size.width
-                    let imageHeight = image.size.height
-
-                    let fixedImageWidth: CGFloat
-                    let fixedImageHeight: CGFloat
-
-                    if imageWidth > imageHeight {
-                        fixedImageWidth = min(imageWidth, YepConfig.Media.imageWidth)
-                        fixedImageHeight = imageHeight * (fixedImageWidth / imageWidth)
-                    } else {
-                        fixedImageHeight = min(imageHeight, YepConfig.Media.imageHeight)
-                        fixedImageWidth = imageWidth * (fixedImageHeight / imageHeight)
-                    }
-
-                    let fixedSize = CGSize(width: fixedImageWidth, height: fixedImageHeight)
-
-                    // resize to smaller, not need fixRotation
-
-                    if let fixedImage = image.resizeToSize(fixedSize, withInterpolationQuality: CGInterpolationQuality.Medium) {
-                        mediaImages.append(fixedImage)
-                    }
-                }
-            }
-        }
-        
-        dismissViewControllerAnimated(true, completion: nil)
-    }
-}
-

From 0f43b5222afd7401c01494e8829031ca2856ed46 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 19 Oct 2015 13:19:41 +0800
Subject: [PATCH 21/25] fix avatar cache for same user in a row

---
 Yep/Caches/AvatarCache.swift | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/Yep/Caches/AvatarCache.swift b/Yep/Caches/AvatarCache.swift
index 3463bfda..8c7a0810 100644
--- a/Yep/Caches/AvatarCache.swift
+++ b/Yep/Caches/AvatarCache.swift
@@ -128,18 +128,22 @@ class AvatarCache {
         }
     }
 
-    private var avatarCompletionSet = Set<AvatarCompletion>()
+    private var avatarCompletions = [AvatarCompletion]()
 
     private func removeAvatarCompletionsByAvatarURLString(avatarURLString: String) {
-        let avatarCompletions = avatarCompletionSet.filter({ $0.avatarURLString == avatarURLString })
-        avatarCompletions.forEach {
-            avatarCompletionSet.remove($0)
-        }
+
+        let completionsToRemove = avatarCompletions.filter({ $0.avatarURLString == avatarURLString })
+
+        completionsToRemove.forEach({
+            if let index = avatarCompletions.indexOf($0) {
+                avatarCompletions.removeAtIndex(index)
+            }
+        })
     }
 
     private func completeWithImage(image: UIImage, avatarURLString: String) {
 
-        for avatarCompletion in avatarCompletionSet.filter({ $0.avatarURLString == avatarURLString }) {
+        for avatarCompletion in avatarCompletions.filter({ $0.avatarURLString == avatarURLString }) {
 
             dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0)) {
                 let avatar = image.roundImageOfRadius(avatarCompletion.radius)
@@ -203,9 +207,9 @@ class AvatarCache {
                 removeAvatarCompletionsByAvatarURLString(avatarURLString)
 
                 // NOTICE: 默认在主线程添加
-                avatarCompletionSet.insert(avatarCompletion)
+                avatarCompletions.append(avatarCompletion)
 
-                if avatarCompletionSet.filter({ $0.avatarURLString == avatarURLString }).count > 1 {
+                if avatarCompletions.filter({ $0.avatarURLString == avatarURLString }).count > 1 {
                     // 不用做事，等着具有同样 avatarURLString 的 avatarCompletion 帮忙完成
 
                 } else {
@@ -360,9 +364,9 @@ class AvatarCache {
                 removeAvatarCompletionsByAvatarURLString(avatarURLString)
 
                 // NOTICE: 默认在主线程添加
-                avatarCompletionSet.insert(avatarCompletion)
+                avatarCompletions.append(avatarCompletion)
 
-                if avatarCompletionSet.filter({ $0.avatarURLString == avatarURLString }).count > 1 {
+                if avatarCompletions.filter({ $0.avatarURLString == avatarURLString }).count > 1 {
                     // 不用做事，等着具有同样 avatarURLString 的 avatarCompletion 帮忙完成
 
                 } else {

From 77f944dd5b71d3eac7478ce27273bcaef6e81468 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 19 Oct 2015 14:20:35 +0800
Subject: [PATCH 22/25] fix cal of newMessagesCount in
 pulllToRefreshViewDidRefresh

---
 .../Conversation/ConversationViewController.swift               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index 0914fb4f..5ef8333c 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -3002,7 +3002,7 @@ extension ConversationViewController: PullToRefreshViewDelegate {
                         var newMessagesCount = strongSelf.messagesBunchCount
 
                         if (strongSelf.displayedMessagesRange.location - newMessagesCount) < 0 {
-                            newMessagesCount = strongSelf.displayedMessagesRange.location - newMessagesCount
+                            newMessagesCount = strongSelf.displayedMessagesRange.location
                         }
 
                         if newMessagesCount > 0 {

From cda724fdead8a233cd525dba45d133587ceed961 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 19 Oct 2015 14:21:13 +0800
Subject: [PATCH 23/25] fix tryPostNewMessagesReceivedNotification
 withMessageAge in messagesFromRecipient

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

diff --git a/Yep/Services/YepService.swift b/Yep/Services/YepService.swift
index 157cacea..94aa0783 100644
--- a/Yep/Services/YepService.swift
+++ b/Yep/Services/YepService.swift
@@ -1668,7 +1668,7 @@ func messagesFromRecipient(recipient: Recipient, withTimeDirection timeDirection
                 }
             }
 
-            tryPostNewMessagesReceivedNotificationWithMessageIDs(messageIDs, withMessageAge: .New)
+            tryPostNewMessagesReceivedNotificationWithMessageIDs(messageIDs, withMessageAge: timeDirection.messageAge)
         }
 
         return true

From 82cb0379356c292de79d5f60657fea7120d7ea0e Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 19 Oct 2015 14:39:29 +0800
Subject: [PATCH 24/25] show activityIndicator when load messages with
 timeDirection Node

---
 Yep/Base.lproj/Main.storyboard                | 40 +++++++++++--------
 .../ConversationViewController.swift          |  8 ++++
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard
index e7013f09..87432dc4 100644
--- a/Yep/Base.lproj/Main.storyboard
+++ b/Yep/Base.lproj/Main.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="15A284" 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>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
@@ -117,15 +117,20 @@
                                 <animations/>
                                 <items/>
                             </toolbar>
+                            <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="CRx-AN-kmo">
+                                <rect key="frame" x="290" y="140" width="20" height="20"/>
+                            </activityIndicatorView>
                         </subviews>
                         <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="Q0w-sM-iIR" secondAttribute="trailing" id="0ei-y5-SyW"/>
+                            <constraint firstItem="CRx-AN-kmo" firstAttribute="top" secondItem="29r-Cg-jv3" secondAttribute="bottom" constant="120" id="6J8-UR-moy"/>
                             <constraint firstAttribute="bottom" secondItem="o5R-dM-KPW" secondAttribute="bottom" id="9CY-zU-Ezq"/>
                             <constraint firstItem="Q0w-sM-iIR" firstAttribute="leading" secondItem="P6X-OT-hT5" secondAttribute="leading" id="BYY-lE-CF8"/>
                             <constraint firstItem="o5R-dM-KPW" firstAttribute="leading" secondItem="P6X-OT-hT5" secondAttribute="leading" id="BjN-8c-WjM"/>
                             <constraint firstItem="Gu7-gn-2ia" firstAttribute="centerX" secondItem="Q0w-sM-iIR" secondAttribute="centerX" id="MgC-bT-6sX"/>
+                            <constraint firstItem="CRx-AN-kmo" firstAttribute="centerX" secondItem="P6X-OT-hT5" secondAttribute="centerX" id="Qcn-oQ-vYU"/>
                             <constraint firstItem="Gu7-gn-2ia" firstAttribute="width" secondItem="Q0w-sM-iIR" secondAttribute="width" id="Qru-A0-ifW"/>
                             <constraint firstAttribute="bottom" secondItem="Q0w-sM-iIR" secondAttribute="bottom" constant="160" id="Sf8-1u-t01"/>
                             <constraint firstItem="o5R-dM-KPW" firstAttribute="top" secondItem="P6X-OT-hT5" secondAttribute="top" id="d3q-cT-PCM"/>
@@ -134,6 +139,7 @@
                         </constraints>
                     </view>
                     <connections>
+                        <outlet property="activityIndicator" destination="CRx-AN-kmo" id="9hf-3a-cmE"/>
                         <outlet property="conversationCollectionView" destination="o5R-dM-KPW" id="lsW-8A-zmB"/>
                         <outlet property="messageToolbar" destination="Q0w-sM-iIR" id="vmQ-s1-SlQ"/>
                         <outlet property="messageToolbarBottomConstraint" destination="Sf8-1u-t01" id="f02-ze-rKh"/>
@@ -239,13 +245,13 @@
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="k4j-Ub-3bn" customClass="MediaView" customModule="Yep" customModuleProvider="target">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k4j-Ub-3bn" customClass="MediaView" customModule="Yep" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                                 <animations/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <gestureRecognizers/>
                             </view>
-                            <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2Cb-zQ-dUZ" customClass="MediaControlView" customModule="Yep" customModuleProvider="target">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2Cb-zQ-dUZ" customClass="MediaControlView" customModule="Yep" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="520" width="600" height="80"/>
                                 <animations/>
                                 <color key="backgroundColor" red="0.40000000600000002" green="0.80000001190000003" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -824,7 +830,7 @@
                                 <animations/>
                                 <color key="backgroundColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.95686274509803926" alpha="1" colorSpace="calibratedRGB"/>
                                 <view key="tableHeaderView" contentMode="scaleToFill" id="3ZX-Cq-RRV">
-                                    <rect key="frame" x="0.0" y="64" width="600" height="250"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="250"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <subviews>
                                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="kAg-ue-69C" userLabel="Avatar Image View">
@@ -968,7 +974,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IrX-gK-Zkg">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IrX-gK-Zkg">
                                 <rect key="frame" x="0.0" y="100" width="600" height="44"/>
                                 <animations/>
                                 <constraints>
@@ -981,7 +987,7 @@
                                     <action selector="activeFrom" destination="GqQ-V0-aYk" eventType="touchUpInside" id="yIG-DH-kZc"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="flj-e3-cbm">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="flj-e3-cbm">
                                 <rect key="frame" x="0.0" y="144" width="600" height="44"/>
                                 <animations/>
                                 <constraints>
@@ -994,7 +1000,7 @@
                                     <action selector="activeTo" destination="GqQ-V0-aYk" eventType="touchUpInside" id="90e-4a-0ZA"/>
                                 </connections>
                             </button>
-                            <pickerView contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hap-y9-JVX">
+                            <pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hap-y9-JVX">
                                 <rect key="frame" x="0.0" y="384" width="600" height="216"/>
                                 <animations/>
                                 <connections>
@@ -1049,7 +1055,7 @@
                                 </connections>
                             </tableView>
                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="mMi-L2-D7z">
-                                <rect key="frame" x="290" y="184" width="20" height="20"/>
+                                <rect key="frame" x="290" y="140" width="20" height="20"/>
                                 <animations/>
                             </activityIndicatorView>
                         </subviews>
@@ -1098,18 +1104,18 @@
                                 </connections>
                             </tableView>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="yep_icon_solo" translatesAutoresizingMaskIntoConstraints="NO" id="T5N-QV-ray">
-                                <rect key="frame" x="240" y="84" width="120" height="120"/>
+                                <rect key="frame" x="240" y="40" width="120" height="120"/>
                                 <animations/>
                             </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="275.5" y="223" width="50" height="36"/>
+                                <rect key="frame" x="275.5" y="179" width="50" height="36"/>
                                 <animations/>
                                 <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.5" y="267" width="70.5" height="17"/>
+                                <rect key="frame" x="264.5" y="223" width="70.5" height="17"/>
                                 <animations/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.60000002384185791" green="0.60000002384185791" blue="0.60000002384185791" alpha="1" colorSpace="calibratedRGB"/>
@@ -1166,7 +1172,7 @@
                         <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"/>
+                                <rect key="frame" x="0.0" y="22" 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"/>
@@ -1208,14 +1214,14 @@
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="We read every feedback" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pdt-Vd-sD9">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="We read every feedback" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pdt-Vd-sD9">
                                 <rect key="frame" x="208" y="60" width="185" height="20.5"/>
                                 <animations/>
                                 <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>
-                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" misplaced="YES" keyboardDismissMode="onDrag" translatesAutoresizingMaskIntoConstraints="NO" id="fVo-Zl-gHQ" customClass="FeedbackTextView" customModule="Yep" customModuleProvider="target">
+                            <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="120.5" width="600" height="214.5"/>
                                 <animations/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -1258,7 +1264,7 @@
                             <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"/>
+                                        <rect key="frame" x="0.0" y="35" 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"/>
@@ -1287,7 +1293,7 @@
                             <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"/>
+                                        <rect key="frame" x="0.0" y="115" 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"/>
@@ -1792,7 +1798,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="64" width="600" height="230"/>
+                                    <rect key="frame" x="0.0" y="0.0" 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">
diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index 5ef8333c..4be39c59 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -269,6 +269,8 @@ class ConversationViewController: BaseViewController {
 
     @IBOutlet weak var swipeUpView: UIView!
     @IBOutlet weak var swipeUpPromptLabel: UILabel!
+
+    @IBOutlet weak var activityIndicator: UIActivityIndicatorView!
     
     var isTryingShowFriendRequestView = false
 
@@ -466,10 +468,16 @@ class ConversationViewController: BaseViewController {
                         timeDirection = .Future(minMessageID: minMessageID)
                     } else {
                         timeDirection = .None
+
+                        self?.activityIndicator.startAnimating()
                     }
                     
                     messagesFromRecipient(recipient, withTimeDirection: timeDirection, failureHandler: nil, completion: { success in
                         println("messagesFromRecipient: \(success)")
+
+                        dispatch_async(dispatch_get_main_queue()) { [weak self] in
+                            self?.activityIndicator.stopAnimating()
+                        }
                     })
                 }
             }

From 72b8fe25cf05be2bba428c643a20a09bd9d4731d Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 19 Oct 2015 15:01:46 +0800
Subject: [PATCH 25/25] adjust messagesFromRecipient,
 tryPostNewMessagesReceivedNotification when it complete

---
 Yep/Services/YepService.swift                 | 31 +++++++------------
 .../ConversationViewController.swift          | 17 +++++++---
 .../PullToRefresh/PullToRefreshView.swift     |  6 ++--
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/Yep/Services/YepService.swift b/Yep/Services/YepService.swift
index 94aa0783..a41bbf99 100644
--- a/Yep/Services/YepService.swift
+++ b/Yep/Services/YepService.swift
@@ -1630,7 +1630,7 @@ enum TimeDirection {
     }
 }
 
-func messagesFromRecipient(recipient: Recipient, withTimeDirection timeDirection: TimeDirection, failureHandler: ((Reason, String?) -> Void)?, completion: Bool -> Void) {
+func messagesFromRecipient(recipient: Recipient, withTimeDirection timeDirection: TimeDirection, failureHandler: ((Reason, String?) -> Void)?, completion: (messageIDs: [String]) -> Void) {
 
     var requestParameters = [
         "recipient_type": recipient.type.nameForServer,
@@ -1646,32 +1646,25 @@ func messagesFromRecipient(recipient: Recipient, withTimeDirection timeDirection
         break
     }
 
-    let parse: JSONDictionary -> Bool? = { data in
+    let parse: JSONDictionary -> [String]? = { data in
 
-        guard let unreadMessagesData = data["messages"] as? [JSONDictionary] else {
-            return false
+        guard let
+            unreadMessagesData = data["messages"] as? [JSONDictionary],
+            realm = try? Realm() else {
+                return []
         }
 
-        println("messagesFromRecipient: \(recipient), \(unreadMessagesData.count)")
+        //println("messagesFromRecipient: \(recipient), \(unreadMessagesData.count)")
 
-        dispatch_async(dispatch_get_main_queue()) {
+        var messageIDs = [String]()
 
-            guard let realm = try? Realm() else {
-                return
+        for messageInfo in unreadMessagesData {
+            syncMessageWithMessageInfo(messageInfo, messageAge: timeDirection.messageAge, inRealm: realm) { _messageIDs in
+                messageIDs += _messageIDs
             }
-
-            var messageIDs = [String]()
-
-            for messageInfo in unreadMessagesData {
-                syncMessageWithMessageInfo(messageInfo, messageAge: timeDirection.messageAge, inRealm: realm) { _messageIDs in
-                    messageIDs += _messageIDs
-                }
-            }
-
-            tryPostNewMessagesReceivedNotificationWithMessageIDs(messageIDs, withMessageAge: timeDirection.messageAge)
         }
 
-        return true
+        return messageIDs
     }
 
     let resource = authJsonResource(path: "/api/v1/\(recipient.type.nameForServer)/\(recipient.ID)/messages", method: .GET, requestParameters: requestParameters, parse: parse )
diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index 4be39c59..40d604be 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -472,10 +472,13 @@ class ConversationViewController: BaseViewController {
                         self?.activityIndicator.startAnimating()
                     }
                     
-                    messagesFromRecipient(recipient, withTimeDirection: timeDirection, failureHandler: nil, completion: { success in
-                        println("messagesFromRecipient: \(success)")
+                    messagesFromRecipient(recipient, withTimeDirection: timeDirection, failureHandler: nil, completion: { messageIDs in
+                        println("messagesFromRecipient: \(messageIDs.count)")
 
                         dispatch_async(dispatch_get_main_queue()) { [weak self] in
+
+                            tryPostNewMessagesReceivedNotificationWithMessageIDs(messageIDs, withMessageAge: timeDirection.messageAge)
+
                             self?.activityIndicator.stopAnimating()
                         }
                     })
@@ -2989,11 +2992,15 @@ extension ConversationViewController: PullToRefreshViewDelegate {
                     timeDirection = .None
                 }
 
-                messagesFromRecipient(recipient, withTimeDirection: timeDirection, failureHandler: nil, completion: { success in
-                    println("messagesFromRecipient: \(success)")
+                messagesFromRecipient(recipient, withTimeDirection: timeDirection, failureHandler: nil, completion: { messageIDs in
+                    println("messagesFromRecipient: \(messageIDs.count)")
 
                     dispatch_async(dispatch_get_main_queue()) {
-                        pulllToRefreshView.endRefreshingAndDoFurtherAction() {}
+                        pulllToRefreshView.endRefreshingAndDoFurtherAction() {
+                            dispatch_async(dispatch_get_main_queue()) {
+                                tryPostNewMessagesReceivedNotificationWithMessageIDs(messageIDs, withMessageAge: timeDirection.messageAge)
+                            }
+                        }
                     }
                 })
             }
diff --git a/Yep/Views/PullToRefresh/PullToRefreshView.swift b/Yep/Views/PullToRefresh/PullToRefreshView.swift
index 7b10a8e3..a3b930ce 100644
--- a/Yep/Views/PullToRefresh/PullToRefreshView.swift
+++ b/Yep/Views/PullToRefresh/PullToRefreshView.swift
@@ -71,16 +71,18 @@ class PullToRefreshView: UIView {
     // MARK: Actions
 
     func beginRefreshing() {
+
         isRefreshing = true
 
-        UIView.animateWithDuration(0.3, delay: 0, options: .CurveEaseInOut, animations: { () -> Void in
+        UIView.animateWithDuration(0.25, delay: 0, options: .CurveEaseInOut, animations: { () -> Void in
             delegate?.scrollView().contentInset.top += sceneHeight
         }, completion: { (_) -> Void in
         })
     }
 
     func endRefreshingAndDoFurtherAction(furtherAction: () -> Void) {
-        UIView.animateWithDuration(0.3, delay: 0, options: .CurveEaseInOut, animations: { () -> Void in
+
+        UIView.animateWithDuration(0.25, delay: 0, options: .CurveEaseInOut, animations: { () -> Void in
             delegate?.scrollView().contentInset.top -= sceneHeight
 
         }, completion: { (_) -> Void in