Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] #195 - 명함생성 userId 추가 및 미리보기 행간 추가 #197

Merged
merged 3 commits into from
Dec 22, 2021
Merged

[FIX] #195 - 명함생성 userId 추가 및 미리보기 행간 추가 #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7827455
[FIX] #195 - 명함생성 userId 추가 및 미리보기 행간 추가
hyun99999 Dec 21, 2021
ae14f7b
[FIX] #195 - 명함생성 userId 추가 및 미리보기 행간 추가
hyun99999 Dec 22, 2021
93babed
[FIX] #195 - 명함생성 userId 추가 및 미리보기 행간 추가
hyun99999 Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions NADA-iOS-forRelease/Resouces/Storyboards/CardCreation/CardCreationPreview.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
6 changes: 3 additions & 3 deletions NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
1 change: 1 addition & 0 deletions NADA-iOS-forRelease/Sources/NetworkModel/Card/CardCreationRequest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Foundation

// MARK: - CardCreation
struct CardCreationRequest: Codable {
let userID: String
let frontCard: FrontCardDataModel
let backCard: BackCardDataModel
}
Expand Down
2 changes: 2 additions & 0 deletions NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
12 changes: 11 additions & 1 deletion ...S-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand All @@ -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, *)
Expand Down