From 522e3715645127a7f129ab64ea1bd40656a5133a Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 7 Sep 2015 15:25:31 +0800
Subject: [PATCH] frame layout of ChatRightAudioCell

---
 .../ChatRightAudio/ChatRightAudioCell.swift   | 38 ++++++++++++++++++-
 .../ChatRightAudio/ChatRightAudioCell.xib     |  9 +++--
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.swift b/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.swift
index 51d8f6c1..7fb78408 100644
--- a/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.swift
+++ b/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.swift
@@ -29,6 +29,8 @@ class ChatRightAudioCell: ChatRightBaseCell {
     }
 
 
+    @IBOutlet weak var audioContainerView: UIView!
+    
     @IBOutlet weak var bubbleImageView: UIImageView!
 
     @IBOutlet weak var sampleView: SampleView!
@@ -40,10 +42,24 @@ class ChatRightAudioCell: ChatRightBaseCell {
 
     typealias AudioBubbleTapAction = () -> Void
     var audioBubbleTapAction: AudioBubbleTapAction?
-    
+
+    func makeUI() {
+
+        let fullWidth = UIScreen.mainScreen().bounds.width
+
+        let halfAvatarSize = YepConfig.chatCellAvatarSize() / 2
+
+        avatarImageView.center = CGPoint(x: fullWidth - halfAvatarSize - YepConfig.chatCellGapBetweenWallAndAvatar(), y: halfAvatarSize)
+    }
+
     override func awakeFromNib() {
         super.awakeFromNib()
 
+        backgroundColor = UIColor.redColor()
+
+        makeUI()
+
+
         bubbleImageView.tintColor = UIColor.rightBubbleTintColor()
 
         sampleView.sampleColor = UIColor.rightWaveColor()
@@ -92,6 +108,17 @@ class ChatRightAudioCell: ChatRightBaseCell {
 
 //                sampleViewWidthConstraint.constant = max(YepConfig.minMessageSampleViewWidth, sampleViewWidthConstraint.constant)
 
+                let width = 60 + CGFloat(audioSamples.count) * (YepConfig.audioSampleWidth() + YepConfig.audioSampleGap()) - YepConfig.audioSampleGap() // 最后最后一个 gap 不要
+
+                audioContainerView.frame = CGRect(x: CGRectGetMinX(avatarImageView.frame) - 5 - width, y: 0, width: width, height: bounds.height)
+
+                dotImageView.center = CGPoint(x: CGRectGetMinX(audioContainerView.frame) - 5, y: CGRectGetMidY(audioContainerView.frame))
+
+                println(dotImageView.frame)
+
+
+
+
                 sampleView.samples = audioSamples
 
                 audioDurationLabel.text = NSString(format: "%.1f\"", audioDuration) as String
@@ -102,6 +129,15 @@ class ChatRightAudioCell: ChatRightBaseCell {
                 sampleView.progress = 0
 
 //                sampleViewWidthConstraint.constant = 15 * (YepConfig.audioSampleWidth() + YepConfig.audioSampleGap())
+
+                let width = 60 + 15 * (YepConfig.audioSampleWidth() + YepConfig.audioSampleGap())
+
+                audioContainerView.frame = CGRect(x: CGRectGetMinX(avatarImageView.frame) - 5 - width, y: 0, width: width, height: bounds.height)
+
+                dotImageView.center = CGPoint(x: CGRectGetMinX(audioContainerView.frame) - 5, y: CGRectGetMidY(audioContainerView.frame))
+
+                println(dotImageView.frame)
+
                 audioDurationLabel.text = ""
             }
 
diff --git a/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.xib b/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.xib
index b3854d1e..cb8b4bb2 100644
--- a/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.xib
+++ b/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.xib
@@ -23,12 +23,12 @@
                         <subviews>
                             <imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="right_tail_bubble" id="IUw-Mk-XlZ" userLabel="Bubble Image View">
                                 <rect key="frame" x="0.0" y="0.0" width="150" height="40"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <animations/>
                             </imageView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="XTQ-XN-AqX" userLabel="Play Button">
                                 <rect key="frame" x="6" y="5" width="30" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/>
                                 <animations/>
                                 <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <state key="normal" image="icon_play">
@@ -37,13 +37,13 @@
                             </button>
                             <view userInteractionEnabled="NO" contentMode="scaleToFill" id="ynj-aF-z4D" userLabel="Wave View" customClass="SampleView" customModule="Yep" customModuleProvider="target">
                                 <rect key="frame" x="41" y="0.0" width="89" height="40"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <animations/>
                                 <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2&quot;" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="alU-Q7-YxY" userLabel="Time Length Label">
                                 <rect key="frame" x="36" y="0.0" width="99" height="40"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <animations/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -64,6 +64,7 @@
             <animations/>
             <size key="customSize" width="316" height="105"/>
             <connections>
+                <outlet property="audioContainerView" destination="knU-A0-FO4" id="Gfe-yh-kkC"/>
                 <outlet property="audioDurationLabel" destination="alU-Q7-YxY" id="2dD-Pg-BJw"/>
                 <outlet property="avatarImageView" destination="76j-Ht-EsY" id="uPV-sw-dlg"/>
                 <outlet property="bubbleImageView" destination="IUw-Mk-XlZ" id="eH5-bH-lrf"/>