Skip to content

Commit

Permalink
[FIX] TeamNADA#107 - 메인뷰 flip 딜레이 해결 및 backCard initCell() 간소화
Browse files Browse the repository at this point in the history
### Descriptions
> BackCard initCell() 파라미터 및 레이아웃 수정
- 서버에서 넘겨주는 변수들로 backcard initCell() 파라미터 간소화
- 서버에서 image URL 로 넘겨줄 경우와 명함생성 시 UIImage 로 초기화할 경우 모두 고려한 메서드 생성
- FrontCard URL 2줄 이상 넘어가면 말줄임 설정
  • Loading branch information
hyun99999 committed Dec 2, 2021
1 parent bad7d0c commit dcb247b
Show file tree
Hide file tree
Showing 6 changed files with 93 additions and 62 deletions.
97 changes: 49 additions & 48 deletions NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,75 +53,76 @@ extension BackCardCell {
thirdTmiLabel.textColor = .white
}

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
}
}
11 changes: 6 additions & 5 deletions NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib
Original file line number Diff line number Diff line change
Expand Up @@ -108,19 +108,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 Down Expand Up @@ -158,17 +158,18 @@
<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"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,14 @@ 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
}

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

// FIXME: - UIImage 로 넘어올때. 나중에 어떻게 사용할지 정해야함.
/// 명함생성할 때 image 를 UIImage 로 가져올 경우 사용
func initCell(_ backgroundImage: UIImage?,
_ cardTitle: String,
_ cardDescription: String,
Expand Down
15 changes: 10 additions & 5 deletions NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib
Original file line number Diff line number Diff line change
Expand Up @@ -81,34 +81,39 @@
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="iconUrl" translatesAutoresizingMaskIntoConstraints="NO" id="el0-x0-WD9">
<rect key="frame" x="24" y="467.5" width="24" height="24"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aAt-PF-ce3">
<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"/>
</button>
</subviews>
</view>
<constraints>
<constraint firstItem="cO6-DY-EUn" firstAttribute="top" secondItem="VDj-1w-jyf" secondAttribute="bottom" constant="193" id="025-5i-Sid"/>
<constraint firstItem="S8I-Fv-fkf" firstAttribute="leading" secondItem="D6t-Nc-4xH" secondAttribute="leading" id="1U6-VC-gzG"/>
<constraint firstItem="eyB-c0-PQB" firstAttribute="leading" secondItem="OeE-mZ-GcL" secondAttribute="leading" id="4Ry-xS-5OB"/>
<constraint firstItem="OeE-mZ-GcL" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="50" id="4yZ-WV-dW5"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="VDj-1w-jyf" secondAttribute="trailing" constant="24" id="5rw-tM-UsX"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="VDj-1w-jyf" secondAttribute="trailing" constant="82" id="5rw-tM-UsX"/>
<constraint firstItem="8oi-jO-fkf" firstAttribute="leading" secondItem="TXF-fP-7YQ" secondAttribute="trailing" constant="5" id="6DU-3g-JYy"/>
<constraint firstItem="cO6-DY-EUn" firstAttribute="leading" secondItem="OeE-mZ-GcL" secondAttribute="leading" id="6V1-pq-E02"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="cO6-DY-EUn" secondAttribute="trailing" constant="24" id="7rI-g8-Ig7"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="cO6-DY-EUn" secondAttribute="trailing" constant="27" id="7rI-g8-Ig7"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="8oi-jO-fkf" secondAttribute="trailing" constant="24" id="9HM-25-0VI"/>
<constraint firstItem="LqW-bV-yHr" firstAttribute="leading" secondItem="el0-x0-WD9" secondAttribute="trailing" constant="5" id="A8j-k1-Zdw"/>
<constraint firstItem="8oi-jO-fkf" firstAttribute="centerY" secondItem="TXF-fP-7YQ" secondAttribute="centerY" id="BNK-kd-R8I"/>
<constraint firstItem="aAt-PF-ce3" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="16" id="CPV-z2-Q2H"/>
<constraint firstItem="D6t-Nc-4xH" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="DeT-lx-Vdm"/>
<constraint firstItem="aik-Vi-yux" firstAttribute="leading" secondItem="OeE-mZ-GcL" secondAttribute="leading" id="DzT-ZF-buY"/>
<constraint firstItem="eyB-c0-PQB" firstAttribute="top" secondItem="aik-Vi-yux" secondAttribute="bottom" constant="10" id="Ebd-SK-4i7"/>
<constraint firstAttribute="trailing" secondItem="D6t-Nc-4xH" secondAttribute="trailing" id="GGx-Tf-nEl"/>
<constraint firstItem="TXF-fP-7YQ" firstAttribute="leading" secondItem="OeE-mZ-GcL" secondAttribute="leading" id="ITf-JC-Tm4"/>
<constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="LqW-bV-yHr" secondAttribute="bottom" constant="30" id="JrI-dN-H5E"/>
<constraint firstItem="S8I-Fv-fkf" firstAttribute="bottom" secondItem="D6t-Nc-4xH" secondAttribute="bottom" id="N52-K9-r1O"/>
<constraint firstItem="aik-Vi-yux" firstAttribute="top" secondItem="cO6-DY-EUn" secondAttribute="bottom" constant="13" id="RLL-SV-ohE"/>
<constraint firstItem="TXF-fP-7YQ" firstAttribute="top" secondItem="eyB-c0-PQB" secondAttribute="bottom" constant="55" id="RtB-w6-jlM"/>
<constraint firstItem="S8I-Fv-fkf" firstAttribute="top" secondItem="D6t-Nc-4xH" secondAttribute="top" id="Uuk-OY-MiG"/>
<constraint firstItem="VDj-1w-jyf" firstAttribute="top" secondItem="OeE-mZ-GcL" secondAttribute="bottom" constant="8" id="W5z-RH-cOC"/>
<constraint firstAttribute="trailing" secondItem="aAt-PF-ce3" secondAttribute="trailing" constant="24" id="WO7-2q-KoQ"/>
<constraint firstAttribute="bottom" secondItem="D6t-Nc-4xH" secondAttribute="bottom" id="g3O-ib-dRy"/>
<constraint firstItem="S8I-Fv-fkf" firstAttribute="trailing" secondItem="D6t-Nc-4xH" secondAttribute="trailing" id="gIl-Qp-bCT"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="eyB-c0-PQB" secondAttribute="trailing" constant="24" id="ihs-PT-9zZ"/>
<constraint firstItem="OeE-mZ-GcL" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="24" id="kch-bF-wdy"/>
<constraint firstItem="el0-x0-WD9" firstAttribute="leading" secondItem="OeE-mZ-GcL" secondAttribute="leading" id="ks3-oC-rKr"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="OeE-mZ-GcL" secondAttribute="trailing" constant="24" id="oi1-gH-AEU"/>
Expand All @@ -117,7 +122,6 @@
<constraint firstItem="VDj-1w-jyf" firstAttribute="leading" secondItem="OeE-mZ-GcL" secondAttribute="leading" id="txG-gf-qMy"/>
<constraint firstItem="el0-x0-WD9" firstAttribute="top" secondItem="TXF-fP-7YQ" secondAttribute="bottom" constant="10" id="uLD-KR-vXa"/>
<constraint firstItem="LqW-bV-yHr" firstAttribute="centerY" secondItem="el0-x0-WD9" secondAttribute="centerY" id="v5J-i2-9Ll"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="aik-Vi-yux" secondAttribute="trailing" constant="24" id="zej-Bm-5qK"/>
</constraints>
<size key="customSize" width="307" height="444"/>
<connections>
Expand All @@ -135,6 +139,7 @@
</objects>
<resources>
<image name="iconInstagram" width="24" height="24"/>
<image name="iconShare" width="24" height="24"/>
<image name="iconUrl" width="24" height="24"/>
</resources>
</document>
Loading

0 comments on commit dcb247b

Please sign in to comment.