From 108be15463bd7312bb45520fbcb8446a08c24b92 Mon Sep 17 00:00:00 2001
From: wooooooong <hjw01234@gmail.com>
Date: Tue, 29 Aug 2017 19:25:33 +0900
Subject: [PATCH] =?UTF-8?q?170829=20#207=20=EC=83=81=EC=84=B8=20=ED=8A=80?=
 =?UTF-8?q?=EC=96=B4=EB=82=98=EA=B0=80=EB=8A=94=20=EA=B2=83=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pyunrihae/pyunrihae/Base.lproj/Main.storyboard   | 12 ++++++------
 .../pyunrihae/ProductDetailViewController.swift      |  2 +-
 .../pyunrihae/ProductReviewTableViewCell.swift       |  4 ++--
 .../pyunrihae/WritingReviewViewController.swift      |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/iOSProject/pyunrihae/pyunrihae/Base.lproj/Main.storyboard b/iOSProject/pyunrihae/pyunrihae/Base.lproj/Main.storyboard
index 18278763..963d0863 100644
--- a/iOSProject/pyunrihae/pyunrihae/Base.lproj/Main.storyboard
+++ b/iOSProject/pyunrihae/pyunrihae/Base.lproj/Main.storyboard
@@ -744,10 +744,10 @@
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" verticalHuggingPriority="248" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JfI-S8-kUQ">
-                                                            <rect key="frame" x="142.5" y="8" width="90" height="90"/>
+                                                            <rect key="frame" x="147.5" y="13" width="80" height="80"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="width" constant="90" id="CnC-N6-Mvc"/>
-                                                                <constraint firstAttribute="height" constant="90" id="mMB-1s-f1U"/>
+                                                                <constraint firstAttribute="width" constant="80" id="CnC-N6-Mvc"/>
+                                                                <constraint firstAttribute="height" constant="80" id="mMB-1s-f1U"/>
                                                             </constraints>
                                                             <connections>
                                                                 <segue destination="VCz-lc-hnn" kind="show" id="fGg-R2-bk1"/>
@@ -834,7 +834,7 @@
                                                         <constraint firstItem="dqo-2X-vDe" firstAttribute="top" secondItem="mqw-Ps-KXU" secondAttribute="bottom" constant="15" id="bCG-km-p7q"/>
                                                         <constraint firstItem="WOt-dN-weK" firstAttribute="leading" secondItem="9Pw-03-jM2" secondAttribute="trailing" constant="10" id="cUb-AB-wnP"/>
                                                         <constraint firstItem="KNy-kz-u4p" firstAttribute="top" secondItem="46E-GN-5Jm" secondAttribute="top" constant="10" id="ctQ-Ji-gJC"/>
-                                                        <constraint firstItem="JfI-S8-kUQ" firstAttribute="top" secondItem="46E-GN-5Jm" secondAttribute="topMargin" id="e2A-Qh-u5n"/>
+                                                        <constraint firstItem="JfI-S8-kUQ" firstAttribute="top" secondItem="46E-GN-5Jm" secondAttribute="topMargin" constant="5" id="e2A-Qh-u5n"/>
                                                         <constraint firstAttribute="trailingMargin" secondItem="mqw-Ps-KXU" secondAttribute="trailing" constant="15" id="hmX-pP-8xg"/>
                                                         <constraint firstAttribute="trailingMargin" secondItem="TTH-cm-D1b" secondAttribute="trailing" constant="15" id="mFV-WZ-8ux"/>
                                                         <constraint firstAttribute="bottom" secondItem="0MK-5P-nnW" secondAttribute="bottom" constant="15" id="mz8-uA-AzF"/>
@@ -1004,11 +1004,11 @@
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="24K-cN-721">
-                                                                    <rect key="frame" x="10" y="125" width="266" height="15"/>
+                                                                    <rect key="frame" x="10" y="125" width="266" height="16"/>
                                                                     <attributedString key="attributedText">
                                                                         <fragment content=" ">
                                                                             <attributes>
-                                                                                <font key="NSFont" size="13" name="NanumGothic"/>
+                                                                                <font key="NSFont" size="13" name="AppleSDGothicNeo-Regular"/>
                                                                                 <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
                                                                             </attributes>
                                                                         </fragment>
diff --git a/iOSProject/pyunrihae/pyunrihae/ProductDetailViewController.swift b/iOSProject/pyunrihae/pyunrihae/ProductDetailViewController.swift
index c7e0f313..4530acec 100644
--- a/iOSProject/pyunrihae/pyunrihae/ProductDetailViewController.swift
+++ b/iOSProject/pyunrihae/pyunrihae/ProductDetailViewController.swift
@@ -231,7 +231,7 @@ extension ProductDetailViewController: UITableViewDataSource, UITableViewDelegat
                 var returnHeight : CGFloat = 0.0
                 if reviewList.count > 0 {
                     let row = indexPath.row - 2
-                    let font =  UIFont(name: "AppleSDGothicNeo-Thin", size: 13)
+                    let font =  UIFont(name: "AppleSDGothicNeo-Regular", size: 13)
                     let width = (tableView.superview?.frame.size.width)! - 110
                     let height = Label.heightForView(text: reviewList[row].comment, font: font!, width: width)
                     if reviewList[row].p_image != "" {
diff --git a/iOSProject/pyunrihae/pyunrihae/ProductReviewTableViewCell.swift b/iOSProject/pyunrihae/pyunrihae/ProductReviewTableViewCell.swift
index 021e3d8a..c9b17c01 100644
--- a/iOSProject/pyunrihae/pyunrihae/ProductReviewTableViewCell.swift
+++ b/iOSProject/pyunrihae/pyunrihae/ProductReviewTableViewCell.swift
@@ -74,7 +74,7 @@ class ProductReviewTableViewCell: UITableViewCell {
                 self.uploadedFoodImageBtn.isHidden = false
                 self.uploadedFoodImage.isHidden = false
                 self.detailReviewLabel.isHidden = false
-                self.reviewBoxView.frame.size.height = self.detailReviewLabel.frame.height + 135
+                self.reviewBoxView.frame.size.height = height + 135
                 self.uploadedImageLoading.startAnimating()
                 self.uploadedFoodImage.contentMode = .scaleAspectFill
                 self.uploadedFoodImage.clipsToBounds = true
@@ -89,7 +89,7 @@ class ProductReviewTableViewCell: UITableViewCell {
                     self.reviewBoxView.frame.size.height = 90
                 }else { // 사진만 없는 경우
                     self.detailReviewLabel.isHidden = false
-                    self.reviewBoxView.frame.size.height = self.detailReviewLabel.frame.height + 90
+                    self.reviewBoxView.frame.size.height = height + 90
                     self.commentTopConstraint.constant -= 60
                 }
             }
diff --git a/iOSProject/pyunrihae/pyunrihae/WritingReviewViewController.swift b/iOSProject/pyunrihae/pyunrihae/WritingReviewViewController.swift
index 794d3298..ad09854a 100644
--- a/iOSProject/pyunrihae/pyunrihae/WritingReviewViewController.swift
+++ b/iOSProject/pyunrihae/pyunrihae/WritingReviewViewController.swift
@@ -289,7 +289,7 @@ class WritingReviewViewController: UIViewController, FusumaDelegate{
 extension WritingReviewViewController: UITextViewDelegate {
     func textViewDidBeginEditing(_ textView: UITextView) {
         UIView.animate(withDuration: 1.0, delay: 0.0, usingSpringWithDamping: 3.0, initialSpringVelocity: 3.0, options: UIViewAnimationOptions.curveEaseInOut, animations: ({
-            self.scrollView.frame.origin.y = self.scrollView.contentOffset.y - 350
+            self.scrollView.frame.origin.y = -self.reviewTextView.frame.origin.y
             self.detailReview.frame.size.height = UIScreen.main.bounds.size.height * 3 / 11
         }), completion: nil)
         addedImageView.isHidden = true