Skip to content

Commit

Permalink
Merge pull request #109 from hyun99999/feature/#107
Browse files Browse the repository at this point in the history 
[FIX] #107 - BackCardCell initCell() 간소화 및 카드셀 레이아웃 수정
  • Loading branch information
@hyun99999
hyun99999 authored Dec 5, 2021
2 parents 9129220 + 127c929 commit 33af59a
Show file tree
Hide file tree
Showing 7 changed files with 129 additions and 67 deletions.
103 changes: 55 additions & 48 deletions NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,16 @@ class BackCardCell: CardCell {
@IBOutlet weak var firstTmiLabel: UILabel!
@IBOutlet weak var secondTmiLabel: UILabel!
@IBOutlet weak var thirdTmiLabel: UILabel!
@IBOutlet weak var shareButton: UIButton!

// MARK: - View Life Cycle
override func awakeFromNib() {
super.awakeFromNib()
setUI()
}
// TODO: - 2차 릴리즈/공유기능
@IBAction func touchShareButton(_ sender: Any) {
}

// MARK: - Functions
static func nib() -> UINib {
Expand All @@ -51,77 +55,80 @@ extension BackCardCell {
secondTmiLabel.textColor = .white
thirdTmiLabel.font = .textRegular04
thirdTmiLabel.textColor = .white
// TODO: - 2차 릴리즈/공유기능
shareButton.isHidden = true
}

func initCell(_ backgroundImage: String,
_ isMintImage: Bool,
_ isNoMintImage: Bool,
_ isSojuImage: Bool,
_ isBeerImage: Bool,
_ isPourImage: Bool,
_ isPutSauceImage: Bool,
_ isYangnyumImage: Bool,
_ isFriedImage: Bool,
_ firstTmi: String,
_ secondTmi: String,
_ thirdTmi: String) {
if let bgImage = UIImage(named: backgroundImage) {
/// 서버에서 image 를 URL 로 가져올 경우 사용.
func initCell(_ backgroundImageString: String,
_ isMint: Bool,
_ isSoju: Bool,
_ isBoomuk: Bool,
_ isSauced: Bool,
_ firstTMI: String,
_ secondTMI: String,
_ thirdTMI: String) {
if let bgImage = UIImage(named: backgroundImageString) {
self.backgroundImageView.image = bgImage
}
self.mintImageView.image = isMintImage == true ?

self.mintImageView.image = isMint == true ?
UIImage(named: "iconTasteOnMincho") : UIImage(named: "iconTasteOffMincho")
self.noMintImageView.image = isNoMintImage == true ?
self.noMintImageView.image = isMint == false ?
UIImage(named: "iconTasteOnBanmincho") : UIImage(named: "iconTasteOffBanmincho")
self.sojuImageView.image = isSojuImage == true ?

self.sojuImageView.image = isSoju == true ?
UIImage(named: "iconTasteOnSoju") : UIImage(named: "iconTasteOffSoju")
self.beerImageView.image = isBeerImage == true ?
self.beerImageView.image = isSoju == false ?
UIImage(named: "iconTasteOnBeer") : UIImage(named: "iconTasteOffBeer")
self.pourEatImageView.image = isPourImage == true ?

self.pourEatImageView.image = isBoomuk == true ?
UIImage(named: "iconTasteOnBumeok") : UIImage(named: "iconTasteOffBumeok")
self.putSauceEatImageView.image = isPutSauceImage == true ?
self.putSauceEatImageView.image = isBoomuk == false ?
UIImage(named: "iconTasteOnZzik") : UIImage(named: "iconTasteOffZzik")
self.sauceChickenImageView.image = isYangnyumImage == true ?

self.sauceChickenImageView.image = isSauced == true ?
UIImage(named: "iconTasteOnSeasoned") : UIImage(named: "iconTasteOffSeasoned")
self.friedChickenImageView.image = isFriedImage == true ?
self.friedChickenImageView.image = isSauced == false ?
UIImage(named: "iconTasteOnFried") : UIImage(named: "iconTasteOffFried")
self.firstTmiLabel.text = firstTmi
self.secondTmiLabel.text = secondTmi
self.thirdTmiLabel.text = thirdTmi

self.firstTmiLabel.text = firstTMI
self.secondTmiLabel.text = secondTMI
self.thirdTmiLabel.text = thirdTMI
}

// FIXME: - UIImage 로 넘어올때. 나중에 어떻게 사용할지 정해야함.
/// 명함생성할 때 image 를 UIImage 로 가져올 경우 사용
func initCell(_ backgroundImage: UIImage?,
_ isMintImage: Bool,
_ isNoMintImage: Bool,
_ isSojuImage: Bool,
_ isBeerImage: Bool,
_ isPourImage: Bool,
_ isPutSauceImage: Bool,
_ isYangnyumImage: Bool,
_ isFriedImage: Bool,
_ firstTmi: String,
_ secondTmi: String,
_ thirdTmi: String) {

_ isMint: Bool,
_ isSoju: Bool,
_ isBoomuk: Bool,
_ isSauced: Bool,
_ firstTMI: String,
_ secondTMI: String,
_ thirdTMI: String) {
self.backgroundImageView.image = backgroundImage ?? UIImage()
self.mintImageView.image = isMintImage == true ?
self.mintImageView.image = isMint == true ?
UIImage(named: "iconTasteOnMincho") : UIImage(named: "iconTasteOffMincho")
self.noMintImageView.image = isNoMintImage == true ?
self.noMintImageView.image = isMint == false ?
UIImage(named: "iconTasteOnBanmincho") : UIImage(named: "iconTasteOffBanmincho")
self.sojuImageView.image = isSojuImage == true ?

self.sojuImageView.image = isSoju == true ?
UIImage(named: "iconTasteOnSoju") : UIImage(named: "iconTasteOffSoju")
self.beerImageView.image = isBeerImage == true ?
self.beerImageView.image = isSoju == false ?
UIImage(named: "iconTasteOnBeer") : UIImage(named: "iconTasteOffBeer")
self.pourEatImageView.image = isPourImage == true ?

self.pourEatImageView.image = isBoomuk == true ?
UIImage(named: "iconTasteOnBumeok") : UIImage(named: "iconTasteOffBumeok")
self.putSauceEatImageView.image = isPutSauceImage == true ?
self.putSauceEatImageView.image = isBoomuk == false ?
UIImage(named: "iconTasteOnZzik") : UIImage(named: "iconTasteOffZzik")
self.sauceChickenImageView.image = isYangnyumImage == true ?

self.sauceChickenImageView.image = isSauced == true ?
UIImage(named: "iconTasteOnSeasoned") : UIImage(named: "iconTasteOffSeasoned")
self.friedChickenImageView.image = isFriedImage == true ?
self.friedChickenImageView.image = isSauced == false ?
UIImage(named: "iconTasteOnFried") : UIImage(named: "iconTasteOffFried")
self.firstTmiLabel.text = firstTmi
self.secondTmiLabel.text = secondTmi
self.thirdTmiLabel.text = thirdTmi

self.firstTmiLabel.text = firstTMI
self.secondTmiLabel.text = secondTMI
self.thirdTmiLabel.text = thirdTMI
}
}
28 changes: 23 additions & 5 deletions NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,22 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</imageView>
<view alpha="0.40000000000000002" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Q9H-oG-tzn">
<rect key="frame" x="0.0" y="0.0" width="327" height="540"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="20"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3tv-wQ-4Ka">
<rect key="frame" x="279" y="16" width="24" height="24"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" image="iconShare"/>
<connections>
<action selector="touchShareButton:" destination="gTV-IL-0wX" eventType="touchUpInside" id="9we-bF-B51"/>
</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="dHb-jJ-jng">
<rect key="frame" x="24" y="50" width="95.5" height="22"/>
Expand Down Expand Up @@ -99,19 +111,19 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ch6-5U-VOL">
<rect key="frame" x="24" y="415" width="279" height="17"/>
<rect key="frame" x="24" y="415" width="35.5" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IFb-AS-8IM">
<rect key="frame" x="24" y="444" width="279" height="17"/>
<rect key="frame" x="24" y="444" width="35.5" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9yf-Qs-VBg">
<rect key="frame" x="24" y="473" width="279" height="17"/>
<rect key="frame" x="24" y="473" width="35.5" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
Expand All @@ -127,12 +139,14 @@
<constraint firstItem="Nx7-Vx-MTP" firstAttribute="top" secondItem="sm2-Ib-bYM" secondAttribute="bottom" constant="16" id="6KQ-Gm-dN7"/>
<constraint firstItem="rxd-qO-yOK" firstAttribute="trailing" secondItem="bd3-Rn-YVD" secondAttribute="trailing" id="6dO-Dk-n8I"/>
<constraint firstAttribute="bottom" secondItem="Rmd-7u-oYx" secondAttribute="bottom" id="6sP-l0-YJZ"/>
<constraint firstItem="Q9H-oG-tzn" firstAttribute="leading" secondItem="Rmd-7u-oYx" secondAttribute="leading" id="7x9-tr-J5n"/>
<constraint firstAttribute="trailing" secondItem="3tv-wQ-4Ka" secondAttribute="trailing" constant="24" id="8M2-5e-Gzt"/>
<constraint firstItem="XT5-iW-6kG" firstAttribute="top" secondItem="Nx7-Vx-MTP" secondAttribute="bottom" constant="61" id="9gl-yR-9i1"/>
<constraint firstItem="25N-CU-6fD" firstAttribute="top" secondItem="wc5-PI-Gnj" secondAttribute="bottom" constant="16" id="ADz-9m-mBi"/>
<constraint firstItem="25N-CU-6fD" firstAttribute="top" secondItem="Nx7-Vx-MTP" secondAttribute="top" id="B4W-OS-GK1"/>
<constraint firstItem="rxd-qO-yOK" firstAttribute="leading" secondItem="bd3-Rn-YVD" secondAttribute="leading" id="Bmj-nX-mqB"/>
<constraint firstItem="dHb-jJ-jng" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="24" id="EYG-Vx-bQ6"/>
<constraint firstItem="Q9H-oG-tzn" firstAttribute="bottom" secondItem="Rmd-7u-oYx" secondAttribute="bottom" id="GEn-g5-aCr"/>
<constraint firstItem="wc5-PI-Gnj" firstAttribute="bottom" secondItem="sm2-Ib-bYM" secondAttribute="bottom" id="GHK-z0-uZ1"/>
<constraint firstAttribute="trailing" secondItem="bd3-Rn-YVD" secondAttribute="trailing" constant="24" id="GL3-Bj-bSQ"/>
<constraint firstItem="Rmd-7u-oYx" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="GZC-tY-5Ql"/>
Expand All @@ -147,23 +161,26 @@
<constraint firstItem="sm2-Ib-bYM" firstAttribute="trailing" secondItem="yJZ-UI-FTC" secondAttribute="trailing" id="OdV-L4-jqW"/>
<constraint firstItem="wc5-PI-Gnj" firstAttribute="leading" secondItem="sm2-Ib-bYM" secondAttribute="trailing" constant="13" id="S2w-WM-Rre"/>
<constraint firstItem="25N-CU-6fD" firstAttribute="leading" secondItem="wc5-PI-Gnj" secondAttribute="leading" id="TT5-mg-RQ8"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="9yf-Qs-VBg" secondAttribute="trailing" constant="16" id="TU4-dD-0Xl"/>
<constraint firstItem="yJZ-UI-FTC" firstAttribute="leading" secondItem="qum-Iq-vKj" secondAttribute="leading" id="UNV-A5-JTW"/>
<constraint firstItem="wc5-PI-Gnj" firstAttribute="top" secondItem="rxd-qO-yOK" secondAttribute="bottom" constant="16" id="V8D-XP-ypI"/>
<constraint firstAttribute="trailing" secondItem="Ch6-5U-VOL" secondAttribute="trailing" constant="24" id="VvQ-c1-IEH"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Ch6-5U-VOL" secondAttribute="trailing" constant="16" id="VvQ-c1-IEH"/>
<constraint firstItem="3tv-wQ-4Ka" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="16" id="Yho-5j-Btr"/>
<constraint firstItem="rxd-qO-yOK" firstAttribute="bottom" secondItem="yJZ-UI-FTC" secondAttribute="bottom" id="Z0I-22-kdN"/>
<constraint firstItem="dHb-jJ-jng" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="50" id="ZLX-Il-oq0"/>
<constraint firstItem="25N-CU-6fD" firstAttribute="leading" secondItem="Nx7-Vx-MTP" secondAttribute="trailing" constant="13" id="Zgi-vH-V3I"/>
<constraint firstItem="bd3-Rn-YVD" firstAttribute="bottom" secondItem="qum-Iq-vKj" secondAttribute="bottom" id="aCv-m0-BcC"/>
<constraint firstItem="Rmd-7u-oYx" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="b9D-mv-wWz"/>
<constraint firstItem="Ch6-5U-VOL" firstAttribute="top" secondItem="XT5-iW-6kG" secondAttribute="bottom" constant="16" id="eZ8-Sh-fET"/>
<constraint firstAttribute="trailing" secondItem="IFb-AS-8IM" secondAttribute="trailing" constant="24" id="fd3-Oh-BkF"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="IFb-AS-8IM" secondAttribute="trailing" constant="16" id="fd3-Oh-BkF"/>
<constraint firstItem="25N-CU-6fD" firstAttribute="trailing" secondItem="wc5-PI-Gnj" secondAttribute="trailing" id="g3F-Dh-bZh"/>
<constraint firstItem="9yf-Qs-VBg" firstAttribute="top" secondItem="IFb-AS-8IM" secondAttribute="bottom" constant="12" id="g97-gI-Ols"/>
<constraint firstItem="qum-Iq-vKj" firstAttribute="top" secondItem="dHb-jJ-jng" secondAttribute="bottom" constant="16" id="hCD-yz-alU"/>
<constraint firstItem="Ch6-5U-VOL" firstAttribute="leading" secondItem="XT5-iW-6kG" secondAttribute="leading" id="k4x-2l-IzD"/>
<constraint firstItem="yJZ-UI-FTC" firstAttribute="trailing" secondItem="qum-Iq-vKj" secondAttribute="trailing" id="kbr-fu-jW1"/>
<constraint firstItem="sm2-Ib-bYM" firstAttribute="top" secondItem="yJZ-UI-FTC" secondAttribute="bottom" constant="16" id="m58-QQ-KUr"/>
<constraint firstItem="Q9H-oG-tzn" firstAttribute="trailing" secondItem="Rmd-7u-oYx" secondAttribute="trailing" id="oBY-hd-ry4"/>
<constraint firstItem="Q9H-oG-tzn" firstAttribute="top" secondItem="Rmd-7u-oYx" secondAttribute="top" id="oMo-GV-3Jn"/>
<constraint firstItem="XT5-iW-6kG" firstAttribute="leading" secondItem="Nx7-Vx-MTP" secondAttribute="leading" id="ppu-VU-SwE"/>
<constraint firstItem="wc5-PI-Gnj" firstAttribute="leading" secondItem="rxd-qO-yOK" secondAttribute="leading" id="rlj-BO-YFH"/>
<constraint firstItem="bd3-Rn-YVD" firstAttribute="top" secondItem="qum-Iq-vKj" secondAttribute="top" id="ryg-6K-kZy"/>
Expand All @@ -188,6 +205,7 @@
<outlet property="putSauceEatImageView" destination="wc5-PI-Gnj" id="nYr-Y7-XJC"/>
<outlet property="sauceChickenImageView" destination="Nx7-Vx-MTP" id="EBI-QU-BQH"/>
<outlet property="secondTmiLabel" destination="IFb-AS-8IM" id="huF-sy-GN1"/>
<outlet property="shareButton" destination="3tv-wQ-4Ka" id="uQj-kM-ZBL"/>
<outlet property="sojuImageView" destination="yJZ-UI-FTC" id="a17-57-8Jd"/>
<outlet property="tasteTitleLabel" destination="dHb-jJ-jng" id="s2A-b9-Osl"/>
<outlet property="thirdTmiLabel" destination="9yf-Qs-VBg" id="e4s-7p-WmB"/>
Expand Down
9 changes: 8 additions & 1 deletion NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@ class FrontCardCell: CardCell {
@IBOutlet weak var mbtiLabel: UILabel!
@IBOutlet weak var instagramIDLabel: UILabel!
@IBOutlet weak var linkURLLabel: UILabel!
@IBOutlet weak var shareButton: UIButton!

// MARK: - Life Cycle

override func awakeFromNib() {
super.awakeFromNib()
setUI()
}
@IBAction func touchShareButton(_ sender: Any) {
}

static func nib() -> UINib {
return UINib(nibName: Const.Xib.frontCardCell, bundle: Bundle(for: FrontCardCell.self))
Expand All @@ -48,11 +51,15 @@ extension FrontCardCell {
mbtiLabel.textColor = .white
instagramIDLabel.font = .textRegular03
instagramIDLabel.textColor = .white
instagramIDLabel.lineBreakMode = .byTruncatingTail
linkURLLabel.font = .textRegular04
linkURLLabel.textColor = .white
linkURLLabel.numberOfLines = 2
linkURLLabel.lineBreakMode = .byTruncatingTail
shareButton.isHidden = true
}

/// 서버에서 image 를 URL 로 가져올 경우 사용.
func initCell(_ backgroundImage: String,
_ cardTitle: String,
_ cardDescription: String,
Expand All @@ -73,7 +80,7 @@ extension FrontCardCell {
linkURLLabel.text = linkURL
}

// FIXME: - UIImage 로 넘어올때. 나중에 어떻게 사용할지 정해야함.
/// 명함생성할 때 image 를 UIImage 로 가져올 경우 사용
func initCell(_ backgroundImage: UIImage?,
_ cardTitle: String,
_ cardDescription: String,
Expand Down
Loading

0 comments on commit 33af59a

Please sign in to comment.