Merge pull request #197 from TeamNADA/release1.0/#195

[FIX] #195 - 명함생성 userId 추가 및 미리보기 행간 추가
TeamNADA · Dec 22, 2021 · 90c70d5 · 90c70d5
2 parents 57aa1f8 + 93babed
commit 90c70d5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/CardCreation/CardCreationPreview.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/CardCreation/CardCreationPreview.storyboard
@@ -47,8 +47,8 @@
                                             <action selector="touchBackButton:" destination="Y6W-OH-hqX" eventType="touchUpInside" id="A7U-KW-0Uv"/>
                                         </connections>
                                     </button>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="명함생성" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V9F-GG-Wlr">
-                                        <rect key="frame" x="154.66666666666666" y="14" width="66" height="22"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="명함 생성" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V9F-GG-Wlr">
+                                        <rect key="frame" x="152.33333333333334" y="14" width="70.333333333333343" height="22"/>
                                         <fontDescription key="fontDescription" name="SpoqaHanSansNeo-Bold" family="Spoqa Han Sans Neo" pointSize="18"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>

diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift
@@ -143,19 +143,19 @@ extension BackCardCell {
         UIImage(named: "iconTasteOnFried") : UIImage(named: "iconTasteOffFried")
 
         if !firstTMI.isEmpty {
-            firstTmiLabel.text = "● " + firstTMI
+            firstTmiLabel.text = "•  " + firstTMI
         } else {
             firstTmiLabel.text = firstTMI
         }
 
         if !secondTMI.isEmpty {
-            secondTmiLabel.text = "● " + secondTMI
+            secondTmiLabel.text = "•  " + secondTMI
         } else {
             secondTmiLabel.text = secondTMI
         }
 
         if !thirdTMI.isEmpty {
-            thirdTmiLabel.text = "● " + thirdTMI
+            thirdTmiLabel.text = "•  " + thirdTMI
         } else {
             thirdTmiLabel.text = thirdTMI
         }

diff --git a/NADA-iOS-forRelease/Sources/NetworkModel/Card/CardCreationRequest.swift b/NADA-iOS-forRelease/Sources/NetworkModel/Card/CardCreationRequest.swift
@@ -9,6 +9,7 @@ import Foundation
 
 // MARK: - CardCreation
 struct CardCreationRequest: Codable {
+    let userID: String
     let frontCard: FrontCardDataModel
     let backCard: BackCardDataModel
 }

diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift b/NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift
@@ -62,6 +62,8 @@ extension CardService: TargetType {
 
             var multiPartData: [Moya.MultipartFormData] = []
 
+            let userIDData = request.userID.data(using: .utf8) ?? Data()
+            multiPartData.append(MultipartFormData(provider: .data(userIDData), name: "card.userId"))
             let defaultImageData = Int(request.frontCard.defaultImage).description.data(using: .utf8) ?? Data()
             multiPartData.append(MultipartFormData(provider: .data(defaultImageData), name: "card.defaultImage"))
             let titleData = request.frontCard.title.data(using: .utf8) ?? Data()

diff --git a/...S-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift b/...S-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift
@@ -36,7 +36,10 @@ class CardCreationPreviewViewController: UIViewController {
     }
     @IBAction func touchCompleteButton(_ sender: Any) {
         guard let frontCardDataModel = frontCardDataModel, let backCardDataModel = backCardDataModel else { return }
-        cardCreationRequest = CardCreationRequest(frontCard: frontCardDataModel, backCard: backCardDataModel)
+
+        guard let userID = UserDefaults.standard.string(forKey: Const.UserDefaults.userID) else { return }
+
+        cardCreationRequest = CardCreationRequest(userID: userID, frontCard: frontCardDataModel, backCard: backCardDataModel)
         guard let cardCreationRequest = cardCreationRequest,
               let cardBackgroundImage = cardBackgroundImage else { return }
 
@@ -55,6 +58,13 @@ extension CardCreationPreviewViewController {
 
         noticeLabel.font = .textRegular04
         noticeLabel.textColor = .primary
+
+        let paragraphStyle = NSMutableParagraphStyle()
+        paragraphStyle.lineSpacing = 3
+        paragraphStyle.alignment = .center
+        let attributeString = NSMutableAttributedString(string: noticeLabel?.text ?? "")
+        attributeString.addAttribute(NSAttributedString.Key.paragraphStyle, value: paragraphStyle, range: NSRange(location: 0, length: attributeString.length))
+        noticeLabel.attributedText = attributeString
 
         completeButton.titleLabel?.font = .button01
         // MARK: - #available(iOS 15.0, *)