From ccb940ec0ef9454aba7c2330382651e23cdae4c1 Mon Sep 17 00:00:00 2001 From: MinjaeLee <2alswo7@khu.ac.kr> Date: Sat, 17 Jul 2021 09:28:53 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[DESIGN]=20#174=20-=20=EB=94=94=EC=9E=90?= =?UTF-8?q?=EC=9D=B8=20=EC=84=B8=EB=B6=80=EB=82=B4=EC=9A=A9=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Base/Board/BoardViewController.swift | 5 ++- .../Base/Board/Views/BoardPopupView.swift | 1 + .../Base/Board/Views/BoardPopupView.xib | 1 + .../StyleTestResultStoryboard.storyboard | 34 ++++++++------- .../CheckTrip/CheckTripStoryboard.storyboard | 10 ++--- .../Sources/Main/MainStoryboard.storyboard | 43 ++++++++++--------- DooRiBon/Podfile.lock | 2 +- 7 files changed, 53 insertions(+), 43 deletions(-) diff --git a/DooRiBon/DooRiBon/Sources/Base/Board/BoardViewController.swift b/DooRiBon/DooRiBon/Sources/Base/Board/BoardViewController.swift index 1cec291..b05463a 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Board/BoardViewController.swift +++ b/DooRiBon/DooRiBon/Sources/Base/Board/BoardViewController.swift @@ -59,7 +59,10 @@ class BoardViewController: UIViewController { ] let popupData = [ BoardPopupData(title: "여행 목표", description: "이번 여행의 목표를 함께 공유하세요!"), - BoardPopupData(title: "꼭 알아줘", description: "이번 여행에 함께하는 사람들에게\n나에 대해 꼭 알리고 싶은 것을 작성해주세요!"), + BoardPopupData(title: "꼭 알아줘", description: """ + 이번 여행에 함께하는 사람들에게 + 나에 대해 꼭 알리고 싶은 것을 작성해주세요! + """), BoardPopupData(title: "역할 분담", description: "이번 여행에서 나는 이런 역할을 담당할게!"), BoardPopupData(title: "체크리스트", description: "준비는 철저하게! 필요한 것을 미리 체크하세요"), ] diff --git a/DooRiBon/DooRiBon/Sources/Base/Board/Views/BoardPopupView.swift b/DooRiBon/DooRiBon/Sources/Base/Board/Views/BoardPopupView.swift index 6b6e446..880d551 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Board/Views/BoardPopupView.swift +++ b/DooRiBon/DooRiBon/Sources/Base/Board/Views/BoardPopupView.swift @@ -15,6 +15,7 @@ class BoardPopupView: UIView { @IBOutlet private weak var containerView: UIView! @IBOutlet private weak var titleLabel: UILabel! @IBOutlet private weak var descriptionLabel: UILabel! + @IBOutlet weak var illustImage: UIImageView! @IBOutlet private weak var contentsTextView: UITextView! @IBOutlet private weak var cancelButton: UIButton! @IBOutlet private weak var confirmButton: UIButton! diff --git a/DooRiBon/DooRiBon/Sources/Base/Board/Views/BoardPopupView.xib b/DooRiBon/DooRiBon/Sources/Base/Board/Views/BoardPopupView.xib index cdb09c8..5ad902b 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Board/Views/BoardPopupView.xib +++ b/DooRiBon/DooRiBon/Sources/Base/Board/Views/BoardPopupView.xib @@ -152,6 +152,7 @@ + diff --git a/DooRiBon/DooRiBon/Sources/Base/Member/StyleTestResult/StyleTestResultStoryboard.storyboard b/DooRiBon/DooRiBon/Sources/Base/Member/StyleTestResult/StyleTestResultStoryboard.storyboard index 2660f28..207c9d8 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Member/StyleTestResult/StyleTestResultStoryboard.storyboard +++ b/DooRiBon/DooRiBon/Sources/Base/Member/StyleTestResult/StyleTestResultStoryboard.storyboard @@ -1,6 +1,6 @@ - + @@ -26,20 +26,24 @@ - + - + - + - + - - + @@ -130,7 +134,7 @@ - + @@ -647,7 +647,7 @@ - + @@ -693,7 +693,7 @@ - + @@ -815,7 +815,7 @@ - + @@ -907,7 +908,7 @@ - + @@ -923,8 +924,8 @@ + - diff --git a/DooRiBon/Podfile.lock b/DooRiBon/Podfile.lock index 9da597c..1433317 100644 --- a/DooRiBon/Podfile.lock +++ b/DooRiBon/Podfile.lock @@ -42,4 +42,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 91b9fe361384338c0b3bc166b8cc09b9f88e5abf -COCOAPODS: 1.10.0 +COCOAPODS: 1.10.1 From 8cb702fab8a521953e32e9e125e805218ea4bc54 Mon Sep 17 00:00:00 2001 From: MinjaeLee <2alswo7@khu.ac.kr> Date: Sat, 17 Jul 2021 09:54:38 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[DESIGN]=20#174=20-=20=EC=97=AC=ED=96=89=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EA=B2=B0=EA=B3=BC=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Cell/MemberOurTableViewCell.swift | 2 + .../MemberOur/MemberOurStoryboard.storyboard | 23 +- .../StyleTestResultStoryboard.storyboard | 6 +- .../StartTrip/StartTripViewController.xib | 235 +++++++++--------- 4 files changed, 139 insertions(+), 127 deletions(-) diff --git a/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/Cell/MemberOurTableViewCell.swift b/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/Cell/MemberOurTableViewCell.swift index 4990fa5..1198396 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/Cell/MemberOurTableViewCell.swift +++ b/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/Cell/MemberOurTableViewCell.swift @@ -20,6 +20,8 @@ class MemberOurTableViewCell: UITableViewCell { @IBOutlet weak var memberStyleThree: UILabel! @IBOutlet weak var memberName: UILabel! @IBOutlet weak var memberThumbNailImage: UIImageView! + @IBOutlet weak var shadowView: UIView! + var delegate: MemberTableCellDelegate? var indexPath: IndexPath? diff --git a/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/MemberOurStoryboard.storyboard b/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/MemberOurStoryboard.storyboard index c50e47d..ff8c53a 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/MemberOurStoryboard.storyboard +++ b/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/MemberOurStoryboard.storyboard @@ -40,6 +40,10 @@ + + + + @@ -64,7 +68,7 @@ - + - + - + @@ -219,6 +227,7 @@ + diff --git a/DooRiBon/DooRiBon/Sources/Base/Member/StyleTestResult/StyleTestResultStoryboard.storyboard b/DooRiBon/DooRiBon/Sources/Base/Member/StyleTestResult/StyleTestResultStoryboard.storyboard index 207c9d8..d3b2386 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Member/StyleTestResult/StyleTestResultStoryboard.storyboard +++ b/DooRiBon/DooRiBon/Sources/Base/Member/StyleTestResult/StyleTestResultStoryboard.storyboard @@ -38,7 +38,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - + - - - - - - - + + + From e6c5ec6bdee0fc4f8415e37380236603419b91a7 Mon Sep 17 00:00:00 2001 From: MinjaeLee <2alswo7@khu.ac.kr> Date: Sat, 17 Jul 2021 10:27:59 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[DESIGN]=20#174=20-=20=EB=B3=B4=EB=93=9C=20?= =?UTF-8?q?=EC=9D=BC=EB=9F=AC=EC=8A=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Contents.json | 23 +++++++++++++++++ .../iconBoardAimActiveImg.png | Bin 0 -> 618 bytes .../iconBoardAimActiveImg@2x.png | Bin 0 -> 964 bytes .../iconBoardAimActiveImg@3x.png | Bin 0 -> 1223 bytes .../Contents.json | 23 +++++++++++++++++ .../iconBoardCheckActiveImg.png | Bin 0 -> 911 bytes .../iconBoardCheckActiveImg@2x.png | Bin 0 -> 1493 bytes .../iconBoardCheckActiveImg@3x.png | Bin 0 -> 2024 bytes .../Contents.json | 23 +++++++++++++++++ .../iconBoardGoalActiveImg.png | Bin 0 -> 529 bytes .../iconBoardGoalActiveImg@2x.png | Bin 0 -> 774 bytes .../iconBoardGoalActiveImg@3x.png | Bin 0 -> 1015 bytes .../Contents.json | 23 +++++++++++++++++ .../iconBoardRoleActiveImg.png | Bin 0 -> 703 bytes .../iconBoardRoleActiveImg@2x.png | Bin 0 -> 1136 bytes .../iconBoardRoleActiveImg@3x.png | Bin 0 -> 1465 bytes .../Base/Board/BoardViewController.swift | 12 ++++++--- .../Board/Cells/BoardNoDataTableViewCell.xib | 4 +-- .../Base/Board/Cells/BoardTableViewCell.xib | 4 +-- .../Base/Board/Views/BoardPopupView.swift | 8 ++++++ .../Base/Board/Views/BoardPopupView.xib | 24 +++++++++--------- .../Board/Views/BoardSectionHeaderView.xib | 4 +-- 22 files changed, 126 insertions(+), 22 deletions(-) create mode 100644 DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/Contents.json create mode 100644 DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/iconBoardAimActiveImg.png create mode 100644 DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/iconBoardAimActiveImg@2x.png create mode 100644 DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/iconBoardAimActiveImg@3x.png create mode 100644 DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/Contents.json create mode 100644 DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/iconBoardCheckActiveImg.png create mode 100644 DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/iconBoardCheckActiveImg@2x.png create mode 100644 DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/iconBoardCheckActiveImg@3x.png create mode 100644 DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/Contents.json create mode 100644 DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/iconBoardGoalActiveImg.png create mode 100644 DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/iconBoardGoalActiveImg@2x.png create mode 100644 DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/iconBoardGoalActiveImg@3x.png create mode 100644 DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/Contents.json create mode 100644 DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/iconBoardRoleActiveImg.png create mode 100644 DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/iconBoardRoleActiveImg@2x.png create mode 100644 DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/iconBoardRoleActiveImg@3x.png diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/Contents.json b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/Contents.json new file mode 100644 index 0000000..736917e --- /dev/null +++ b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "iconBoardAimActiveImg.png", + "scale" : "1x", + "idiom" : "universal" + }, + { + "idiom" : "universal", + "filename" : "iconBoardAimActiveImg@2x.png", + "scale" : "2x" + }, + { + "filename" : "iconBoardAimActiveImg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/iconBoardAimActiveImg.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/iconBoardAimActiveImg.png new file mode 100644 index 0000000000000000000000000000000000000000..624ab3928decf510b5c9eb5a49a6a37ea270086d GIT binary patch literal 618 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 literal 0 HcmV?d00001 diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/Contents.json b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/Contents.json new file mode 100644 index 0000000..2f8d9e3 --- /dev/null +++ b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "scale" : "1x", + "idiom" : "universal", + "filename" : "iconBoardCheckActiveImg.png" + }, + { + "filename" : "iconBoardCheckActiveImg@2x.png", + "scale" : "2x", + "idiom" : "universal" + }, + { + "scale" : "3x", + "idiom" : "universal", + "filename" : "iconBoardCheckActiveImg@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/iconBoardCheckActiveImg.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/iconBoardCheckActiveImg.png new file mode 100644 index 0000000000000000000000000000000000000000..7157fe853202a0bc6a3053d4e96f6feb0b9b489a GIT binary patch literal 911 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 Jvd$@?2>>Cn2?78B literal 0 HcmV?d00001 diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/iconBoardGoalActiveImg@2x.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/iconBoardGoalActiveImg@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..cfae8e0617c6b18bc1cc6cdf18590b8fed9042aa GIT binary patch literal 774 zcmV+h1Nr=kP)Px#T2M?>MMrQ<|CM+Du%G|1pZ~nD|F56_;o1MNpZ~n8 z|J&04;n@FsQU9->|Ki#Iub=}VW6neo zW4ySRWpckshD=p4mXtk3(0}Cxn!J3I6u01ZyC)@ud|;RF^8Znuv=GUk=RPP1ot#+GR>vWU*tTmZE)l2wSCe+JZd{4ZC zTPwebl(CCk$DE>>FLI)S`;LrM&hqt5&E4Ir%O2`AoGB*7?<_4%imK~LPt=OS$OX57 z7Nh(Mvrv>8I+}X)jU#naHPAB(e?bavVBj5I;#^n?#x!c(DZMxcf7M3Sf%Chm+=IV} zTpKFQn&3SrNBOngsZzCRp46Yl@F#8^72lUlHqy+=k8b~y{aB|Qf&&CT!P{|j2o7-d z3Jy>^1P2g4!QX{ZjZJ>wKEa2cT7xf-qnKIOT~WsFUW^{it~92BB~D(!9kEA0Zj)Q1 z%Z+Yp^lYo#5`A-UTlDS0Ezu*Oi!J~IG51JdaHVSJ{Jowb$v-_w`~Y;(1(q8!s&;;! zMhSSFsM^^@r#PK+EftvV@6(u}%3;z{j_aPbR3OU_m~W@8r4rjcZmB?*k4`CiRRA7T zvofiRAdn9~V=@Z4pp-v;qbwBDGP(dB*9euPU^{=qKXqY>1Ko=2jsO4v07*qoM6N<$ Eg3{c9W&i*H literal 0 HcmV?d00001 diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/iconBoardGoalActiveImg@3x.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/iconBoardGoalActiveImg@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..1b8a4db70066314350535e4a1361ec4bdde48aca GIT binary patch literal 1015 zcmVr0058(0{{R3;1mO^00004XF*Lt006O% z3;baP00001b5ch_0Itp)=>Px#PEbr#MMrQ<|Gu#Q;@JPKod2SW|FWR}u%G|1pZ~_V z|K8O9!?pk7+5h3#|9epX;o1MNpZ|MN|9VjWdr|-2+5fPg|KZsGdr|+Hg#XOJ|GTU) zs+#lw000zpQchCl^t6E00SpUL_t(|+U=Uzc7q@k zMV%0EiW)HT|36xircE?P0fEZ{`=LV~>|W;{uBL60oFl*G_fKdT`)Qi`u^1L_93VY zkH-S}7&Y{;Dg%1GMv5LzWoTC~x5M~)jPk0oN!zwX(Y7doSAluVjw(?lszjBj;#?(_ zAZQPiR#JuEp|`=%tVDd&GGTz=hUKqB44;9uoI10aLy=MP`10LWY^|DwWqMIa)P z2qso4K7%10KcMzyLir($mmy_b1s^VICUVVOU7OTgnJgF+$K}nq77lZ{avq3_$|?5a zLKpbyWBE`Z89S}&;K=42rh#X)s5ehQ1#CCxb%URhJA_*t?r z#$&NAr^jP&yVTqUHnt1lcCaua{qf9>Mx@)>nMuU#U_`o|73>#5t)HUWAd_Ea%du#7 zma;cKf@ys2S-}>pf}uVSGF!2%ZwD93dP=8mM4f48w}LshSm@bM-el&~-}{Z3eM5*@ zYGUMVs|a>LeyXO@@S}7RA$B&G;&|>DH@Em&Lxt_O ziE(rB*GtZ3p%^!}*tsO#yASSgL6$@L9Fbxuj8(QnS&wLD%A}Sc^IWtc~6A>sT{q5ErC=%H!jqCHj0~rsa%4Y&qs0L z=JQe998hJoS^(#>DlX)FRujrWRTitIgjIQ;5Uk1KZ)cZqR00|haBWGLdnF-dC?@wu lr?SKlds|7(K&*988r4*GxY(Eo=w{%@H7e@WN>sijbMZ3sxDI^h3< zoByi<{;!++e?6EBR9O@7zd8`ao!9#R(M=E+C|BMQ- zIe{QGv+Dk@p8UTh?*F9x|NB<`KY!3|+T>=CvrB^ff*JPTzo3?SUqIph)TQqyOi0+} z(6GSaeM7){gZBjv2^SjnpD(x{xFhl%&^yaKT^vI!PEVckvaDG_pw+RkU#fRw{^-7zD_OuJe zD!RtXB~QD0eBLkr@wb2Owu*V;l`VxL%hfK3Gp&8xWxH>wTU?^D#fcuOObp9Ms{ za=N{3S5wr466+JZJG7F|hvn%rPT14rtGUAN_I2Te*&ly2H#xphcVM2FzK8XR>#Wj% z70rJnqRV0w>XkiH#Xdbr3EwcIdrs$p(y!hYmUq`H`R;ywBIc~7=ya9BUFGL~>xE^q zPk*R9dvA@7%z0a>#4Qa2~dfzj% zD%SkZbdp}s@PT#ZhpZY?`}CZ^H?Dc7Y($f%3ROotUfu4X)_Pg=N+?^%YK?furO{vH aU+AkktdTipKT!`D!wjCTelF{r5}E+0U0&G$ literal 0 HcmV?d00001 diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/iconBoardRoleActiveImg@2x.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/iconBoardRoleActiveImg@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0694357b509df98d073a57a0599ecae16a997245 GIT binary patch literal 1136 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 TLsCf200000NkvXXu0mjf2@3>X literal 0 HcmV?d00001 diff --git a/DooRiBon/DooRiBon/Sources/Base/Board/BoardViewController.swift b/DooRiBon/DooRiBon/Sources/Base/Board/BoardViewController.swift index b05463a..79341f8 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Board/BoardViewController.swift +++ b/DooRiBon/DooRiBon/Sources/Base/Board/BoardViewController.swift @@ -10,6 +10,7 @@ import UIKit struct BoardPopupData { var title: String var description: String + var illust: String } // 태그 @@ -58,13 +59,13 @@ class BoardViewController: UIViewController { description: "이번 여행에서 꼭 확인해야\n하는 것들을 미리 공유해요") ] let popupData = [ - BoardPopupData(title: "여행 목표", description: "이번 여행의 목표를 함께 공유하세요!"), + BoardPopupData(title: "여행 목표", description: "이번 여행의 목표를 함께 공유하세요!", illust: "iconBoardGoalActiveImg"), BoardPopupData(title: "꼭 알아줘", description: """ 이번 여행에 함께하는 사람들에게 나에 대해 꼭 알리고 싶은 것을 작성해주세요! - """), - BoardPopupData(title: "역할 분담", description: "이번 여행에서 나는 이런 역할을 담당할게!"), - BoardPopupData(title: "체크리스트", description: "준비는 철저하게! 필요한 것을 미리 체크하세요"), + """, illust: "iconBoardAimActiveImg"), + BoardPopupData(title: "역할 분담", description: "이번 여행에서 나는 이런 역할을 담당할게!", illust: "iconBoardRoleActiveImg"), + BoardPopupData(title: "체크리스트", description: "준비는 철저하게! 필요한 것을 미리 체크하세요", illust: "iconBoardCheckActiveImg"), ] private var selectedData: DummyDataModel? { @@ -371,6 +372,8 @@ extension BoardViewController: UITableViewDelegate, BoardSectionHeaderViewDelega boardPopupView .setTitle(popupData[selectedTagIndex].title) .setDescription(popupData[selectedTagIndex].description) + .setIllust(popupData[selectedTagIndex].illust) + .present { event in if event == .confirm { self.postTripBoard(contents: self.contents, groupId: self.thisID, tag: description) @@ -405,6 +408,7 @@ extension BoardViewController: UITableViewDelegate, BoardSectionHeaderViewDelega boardPopupView .setTitle(self.popupData[self.selectedTagIndex].title) .setDescription(self.popupData[self.selectedTagIndex].description) + .setIllust(self.popupData[self.selectedTagIndex].illust) .setTextView(boardData.content) .present { event in if event == .confirm { diff --git a/DooRiBon/DooRiBon/Sources/Base/Board/Cells/BoardNoDataTableViewCell.xib b/DooRiBon/DooRiBon/Sources/Base/Board/Cells/BoardNoDataTableViewCell.xib index 9db6a40..a9768aa 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Board/Cells/BoardNoDataTableViewCell.xib +++ b/DooRiBon/DooRiBon/Sources/Base/Board/Cells/BoardNoDataTableViewCell.xib @@ -33,13 +33,13 @@ -