From 777515e5ab28a7d321eb37320b1090fdf0c7dc85 Mon Sep 17 00:00:00 2001 From: hyungyu Kim Date: Wed, 22 Dec 2021 15:41:57 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[FEAT]=20#198=20-=20=EC=B2=AB=20=EB=AA=85?= =?UTF-8?q?=ED=95=A8=EC=83=9D=EC=84=B1=20=EC=8B=9C=20=EB=B0=94=ED=85=80?= =?UTF-8?q?=EC=8B=9C=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 이미지 에셋 추가 --- .../imgFirstcard.imageset/Contents.json | 23 ++++++++++++++++++ .../imgFirstcard.imageset/imgFirstcard.png | Bin 0 -> 2139 bytes .../imgFirstcard.imageset/imgFirstcard@2x.png | Bin 0 -> 4690 bytes .../imgFirstcard.imageset/imgFirstcard@3x.png | Bin 0 -> 8011 bytes 4 files changed, 23 insertions(+) create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgFirstcard.imageset/Contents.json create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgFirstcard.imageset/imgFirstcard.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgFirstcard.imageset/imgFirstcard@2x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgFirstcard.imageset/imgFirstcard@3x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgFirstcard.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgFirstcard.imageset/Contents.json new file mode 100644 index 00000000..c5506b77 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgFirstcard.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "imgFirstcard.png" + }, + { + "filename" : "imgFirstcard@2x.png", + "scale" : "2x", + "idiom" : "universal" + }, + { + "filename" : "imgFirstcard@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgFirstcard.imageset/imgFirstcard.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgFirstcard.imageset/imgFirstcard.png new file mode 100644 index 0000000000000000000000000000000000000000..01c6c062ca122f7cdfc994f9c0cbff4b4b3956c9 GIT binary patch literal 2139 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 literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgFirstcard.imageset/imgFirstcard@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgFirstcard.imageset/imgFirstcard@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..a33af812b75862f603e0a3e2541d0168cb2744bb GIT binary patch literal 8011 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 literal 0 HcmV?d00001 From a5450f27aae629e171d02e6acb3de5452aedc14e Mon Sep 17 00:00:00 2001 From: hyungyu Kim Date: Thu, 23 Dec 2021 13:52:51 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[FEAT]=20#198=20-=20=EC=B2=AB=20=EB=AA=85?= =?UTF-8?q?=ED=95=A8=EC=83=9D=EC=84=B1=20=EC=8B=9C=20=EB=B0=94=ED=85=80?= =?UTF-8?q?=EC=8B=9C=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 바텀시트 레이아웃구성 --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 4 + .../firsthandIcon.imageset/Contents.json | 23 ++++ .../firsthandIcon.imageset/invalidName.png | Bin 0 -> 561 bytes .../firsthandIcon.imageset/invalidName@2x.png | Bin 0 -> 1067 bytes .../firsthandIcon.imageset/invalidName@3x.png | Bin 0 -> 1667 bytes .../secondhandIcon.imageset/Contents.json | 23 ++++ .../secondhandIcon.imageset/invalidName.png | Bin 0 -> 605 bytes .../invalidName@2x.png | Bin 0 -> 1319 bytes .../invalidName@3x.png | Bin 0 -> 2072 bytes .../Resouces/Constants/ViewController.swift | 1 + .../Sources/SceneDelegate.swift | 2 +- ...stCardAlertBottomSheetViewController.swift | 123 ++++++++++++++++++ .../Main/FrontViewController.swift | 18 ++- 13 files changed, 191 insertions(+), 3 deletions(-) create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/firsthandIcon.imageset/Contents.json create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/firsthandIcon.imageset/invalidName.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/firsthandIcon.imageset/invalidName@2x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/firsthandIcon.imageset/invalidName@3x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/secondhandIcon.imageset/Contents.json create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/secondhandIcon.imageset/invalidName.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/secondhandIcon.imageset/invalidName@2x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/secondhandIcon.imageset/invalidName@3x.png create mode 100644 NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/FirstCardAlertBottomSheetViewController.swift diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 5799e54f..20b92683 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -88,6 +88,7 @@ DBBB91E1639641F40C5B4416 /* Pods_NADA_iOS_forRelease.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */; }; F811720027383097002742CF /* ChangeGroupRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F81171FF27383097002742CF /* ChangeGroupRequest.swift */; }; F822E7A92709CEB60020452C /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = F822E7A82709CEB60020452C /* Notification.swift */; }; + F8268DB927730B0100BF114B /* FirstCardAlertBottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8268DB827730B0100BF114B /* FirstCardAlertBottomSheetViewController.swift */; }; F82FEB4C27639F3100DA7847 /* MainCardCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F82FEB4A27639F3100DA7847 /* MainCardCell.swift */; }; F82FEB4D27639F3100DA7847 /* MainCardCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F82FEB4B27639F3100DA7847 /* MainCardCell.xib */; }; F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */; }; @@ -226,6 +227,7 @@ 7F4EE1D042EC783FA8528743 /* Pods-NADA-iOS-forRelease.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NADA-iOS-forRelease.debug.xcconfig"; path = "Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease.debug.xcconfig"; sourceTree = ""; }; F81171FF27383097002742CF /* ChangeGroupRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangeGroupRequest.swift; sourceTree = ""; }; F822E7A82709CEB60020452C /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = ""; }; + F8268DB827730B0100BF114B /* FirstCardAlertBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirstCardAlertBottomSheetViewController.swift; sourceTree = ""; }; F82FEB4A27639F3100DA7847 /* MainCardCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainCardCell.swift; sourceTree = ""; }; F82FEB4B27639F3100DA7847 /* MainCardCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainCardCell.xib; sourceTree = ""; }; F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CardCreation.storyboard; sourceTree = ""; }; @@ -502,6 +504,7 @@ F8915A20275728F20013D609 /* SelectBirthBottomViewController.swift */, F8915A21275728F20013D609 /* SelectMBTIBottomViewController.swift */, 7734D5A927719520004360E4 /* CardShareBottomSheetViewController.swift */, + F8268DB827730B0100BF114B /* FirstCardAlertBottomSheetViewController.swift */, ); path = BottomSheet; sourceTree = ""; @@ -1130,6 +1133,7 @@ F8C310C0273A7360008EC5BA /* FrontCardCreationDelegate.swift in Sources */, F8C83FBF272FA0670009DF0D /* UserSevice.swift in Sources */, 39F5A3D0271461EA00191F94 /* BackCardCell.swift in Sources */, + F8268DB927730B0100BF114B /* FirstCardAlertBottomSheetViewController.swift in Sources */, F851805B275D047C006BD5ED /* OnboardingViewController.swift in Sources */, 39C1E88F270EC762006D2089 /* UIColor+Extension.swift in Sources */, F8C83FC9272FA3190009DF0D /* GroupAPI.swift in Sources */, diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/firsthandIcon.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/firsthandIcon.imageset/Contents.json new file mode 100644 index 00000000..47fdae58 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/firsthandIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "invalidName.png", + "scale" : "1x", + "idiom" : "universal" + }, + { + "scale" : "2x", + "filename" : "invalidName@2x.png", + "idiom" : "universal" + }, + { + "filename" : "invalidName@3x.png", + "scale" : "3x", + "idiom" : "universal" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/firsthandIcon.imageset/invalidName.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/firsthandIcon.imageset/invalidName.png new file mode 100644 index 0000000000000000000000000000000000000000..c4aba84e8c04d966b25d595851f6c6b3b9c253fb GIT binary patch literal 561 zcmV-10?z%3P)X0{{R39Q7V=00004XF*Lt006O% z3;baP00001b5ch_0Itp)=>Px#qEJj!MMrQ<^wP24t%&Ekm(Oli-l>G;t%&v0vf8A7 z^wF@-lXKmrf9t@V;;)F-o_6ZLoY|Rk_Sm=4m2lLTa@U-7?82entA^X9e(AlL@XD#& zr-R|GisiPH_tmrR#iQb|jPug5<+YL2nRDj3mfx#}->ZiD;KBOezxv(1^w6*O*0uTD zyYI%MKp^31B@uZr2Ad&7TO&ys8yT`5NZ001s@QchC<@lPoO{t^E- z=^AE-NORl@;wD3iZ&%0f`=a!-mhA7s%&pYb(f|Md|NsC0{^I5ikpKVy^GQTOR4C7d zlE-qxFbqUxt5D6orT3t)syP4uYhiMTD33hZBOaE-Vh}}RWpNTsX}y8RNsuFKCcy%s zmsk^W9 zIaL5+cx$~PK*hQ-J__Crzb6mA(IYDbp;`^|CY7L{k&rA|eHTP8Z!F<25c+-_E^*mN zLPX0=w;XT0de$su>(c$@m2CH?&yUmFF8WX3z8fC`!|8Pm00000NkvXXu0mjfBy<`D literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/firsthandIcon.imageset/invalidName@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/firsthandIcon.imageset/invalidName@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..dd4ce61b5d92351058dc5ed94ecd6619b2645193 GIT binary patch literal 1067 zcmV+`1l0S9P)Px#$xuvGMMrQ<>%g7Yop<7}i_np4+oXTst%%8uXUK|J z(U551tcdQ#qu;8A@5rXtoOa!)gYU%pGjtcTvNh~KV?;;@YBznj~meeK1f+oXTwvybb*ozj3)6>mxH4%jTdblSj zL82@KO7IRK>W|LOPR7R!1SiVU$qrWqGy=cGUSKn$uxSx6$di`V0Z13{z%wrpkDX`2 zYX-kWS@$R55*}pYztu;Xb1@BoWeXS$VaUXPsmD$Ri3lBl(okT8Flzul@B;la*Q6}e zgwRaZRmxLYYA6!r7hYgKF?nuePidV>WmTb5t)LGi=Y2mA7E%`Wy)ILTK?uPJ6Pjm2 zu(20-4QgB3UauGMCgD#*hNtJ=x~}RiSS`bk3RFQbSOX%#pS^WmDP^rs@ z4TUCCZkq5XvWI4qM%B~9=KmedB+5l8v`$qe7nsP^ph0TV>S5s@1M`YejQ$0L$id&Pcf5Jy zr@~No>h@3=k}zB=`!v`!$mVy_2uGkc2iRU#Hkj`ozN=6|yW#3IK+e)a*X+ zm1dc67mnskS7jJn4!)hl^M_E$6m)A~`!cM1mp^x)6$?c>L@_6LYcl`kmH>qYPx#*icMVMMrQ<=C+d8pLyZ0i`AQU$%|pqlyBIddC`bw z`PsP8l5FF%j?t8E;H-%0yqVpmg4djO)tPhCmT%Xdc-*Ig+cFv7v*`Ip)-o5b0rup5x_t&=ApLzJ)yv&Pc`ryI(-@p3a zzWUv~`rEqo(XaE)tohox_}I4g)3W!~wC%&7@X4p>yO`dogzUkd>b{%jxs}?YedDr@ z@5ZFzuZiWhlJd-{*PM36fm+m;anFxwzj#u$YDCJ2VLt=Lv;Y7ADRfd!Qvk>!syPlU z7zX)*mzc!b^j4@y?Qnqb>$_Ui@8!$8wrbn(gXQqS;?K~xwLbs=1r$j{K~z}7)tG%# z>Npg}72CoER0IX_UGJT{Ym%mE+B9j?Hw5>7|8KM>Z579zp|~(Rch4V;qvY2o=jBQ2 z!NLDLy7TYf=iS{o*4-aZPe1O)yK?NiZ|M0MJ>Bi7sb?7ukbcZ}6m*WCt9TmhnCU?S z`gXY^=!l>ibhsnvxB;=9L2jMw-4(HYZH?_qk&pIMwFZQKAJEks==e7Qb*_Rvfo}Mo zKr@c_(MLUJM)5ur0myTAQ`EIaqjAS}W@R-RaSiIV=@}i?Uk#E)QQ0A4p-vhQi;AXdtsv)O$|?_ZL!H*m2cV)k&WK9b zmLTg$kZKLiWM2Q|3Yj(_ETRTSam3lxYHy=Gr715ynN|ZtKTucsPfLM{<>^NQI$_ zq9hKh-+G}cL8bv6wPd@~KaF8Atj?D&Q2`S{i0i@!mrN~c@27)Yy^ z*Vn&Hye^dIlXpeok+tav86OJZz_6Rf%R*@YsjG15tip+6tOm zWS(372_cupSDQ_;H=dP{qmLxwGRAy^qk(Hi7dU>IY)%nm`#$9ENAoa)PmH~RG*%k{ z@oAW!w-`ycA5ruDkECj`Au;2Wh9i>GHv6~7xq#~s`ebOZMYBU=x^6&4oZmZb_Yvn& zRg%yr5UxP*0UTAxQR^GKJxm1u2dPnHN(eKUTQen7+Bq zfa_LOf0LspL#uc21=8qj0;o95;BbO4CxOA}$Dw5(d?jqFe}5zMw1C4X1}id~(u>Lc zgVQ_sV)VxSv!9PQH>Y(>CXcsg{V&Q{zo$L)hr_cfhQt1-^I!Zw@NZjjS~h*4X0{{R39Q7V=00004XF*Lt006O% z3;baP00001b5ch_0Itp)=>Px#u24)=MMrQ<^wF>Dzn#;WbIOlqzN#(VX z;;)R{jcV$@oZYB{;jW6@rh(U?dgZs0^24Lzu8Q8Oh2yY`>A#%lyP4IScGa45_0_cM zzMJg9p3#zQ@W`gtn|1Nbs_@CB;H`?>q=D6%bl04B^whHQ&aCmws`}o(`rW|C8%hLmR0+NE?btBSH-PDmf%|6D;;Pq{xh3uCn{9N=z4_si96m7s009|E zL_t(2&xKOScET_W3?U%|9{W=ELRZO>yd;6P|Nmn(y~GKJ>LPpQdBz$$ivFwQy)*Oe z)Y;COM2>LuZG{kL4Wg&u*&|25RZHpvcoIctP`#GP9=Rd(lJ!$w% zmI{VVc#zN6NZlb~9H5i9e-SPSFK6U_jb|NXtFRDY2F?SSEucj#HTa@DJi%nOE)0o6 z38lt`yIEEWk;N=SqN<9U5fb)N!+MTvUuxqj>s+Y-DTrjMNlN?k{dE&;+;`{qWC~|1 zzmS)jn9JRlL>p3k?bbxMWY3^tA~K60#KBbVjAD_}y#`rjy|wmZDAHH=mNYXTUA1_B ryJPx#|4>X+MMrQ<$cACxt%%v5dh5WQ%Y$Lhj%KiLLi5h7 z!GT!5cv9J+d*`{8xM-l>JypnBY-fabQ7=eU&X!JX*4m*cRE-Kc}o zmTv9Dp!CqL@5Q6!vyb7firS)my?0R5m~+;gb<~(~?!~0>%&E?eXy&<;@XDv&sf5mq zWaYP$;;@Y9x|ZYmtkW&~=&JymwwfF{}AO*x>3R80p}*gmN8uxytD&J0!4@mw`P zsKcgaIiUVbpbh~f8izz_GHaCss!uKy!XC{^d#0L1YG1goS&Mz!q6hWL{27{Lqw!aU z9#06i@VAr7*%Sb3Q&!JeuY1_ZAkiC{r!mmy(;e0`>w9&x*~>g4!X-$-X7witGB{A1 z)}=>x*LSDq2H}*W2xwDdJQa$4x2i83aZJ%7WZ1?e$*^UUZ$ufFJZcB7*=4qEvvtJP z&n8xaaf+27HLY&VVzg+IPyq16P!@+Bz}#JcA|>3YkJ4pqeJ<)gY5`^eph4fKHYb5p zXq9jKZnvqQOpiIl4OdcT@iH=maFO(=MVWi6ZENcyh~s#gTH{O;;bWi;yc^ zSJ0wy6xDR|V0M9mblr5>?}tI0#zBx0T!?|uK-;BEO89OTgsb<}I$3WL12J3xNKJQv z*D}cWgiM3C{Lf!%<+1C7*Z{cIDKScsU>v#<8*i)kj}HK?k)r_AyVd!1oC*RgIdL;1 zd|Pie`A04bfG=h`z&sERRt5M3r9ogUqqjsV>ry5Ub#AIowg5nY!U)MM4O}0F!}o$8 zy1uslK#Xn?)Mtzla1(Jb=1hj?+L616iLZu1Rl&LMFambuK10F1{;E8ixQyd10(`+8 zLYOje5WViWA!jLZIQ|;~07i%>P#kvVJO128Ap*oF4>-Xqgunk$-EoHvFAeE2pTZ%S z0&xPegCv)OowwfnekqH|p}<<@$3~R&A9ml}t%pt&D~O|dBxJCR*8P{VmqY93G6@4^ zLeE1fe15ZdDStM!+OM4?S{j8llFjPpdGo8Q-W literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/secondhandIcon.imageset/invalidName@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/secondhandIcon.imageset/invalidName@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..742e3a9235734bd12363ba1867b20539fe488478 GIT binary patch literal 2072 zcmV+z2Px$0#Hm;MMrQQYumT$#?TgQZ4 zv1mxrmTv37oZhK~#C}-ZrGVqHjpwb;uY zsDj<6g4UXJ_tv%Py_@yXu+^D!%g4t#iQP; zh25oq%7|jplx@6oP4myL-KK)xsDk0GiO-K|_tmuU$*1(st>v|m`rf|!-M#wSx%t_+ z`rEtu+`RSCuky^Q_tv!b)Ux>3w)D@f@ye&}#G&lLpYO+|>b{%euZrlpm*ljM=C_m0 zjc3)FbK0SN+@^uAWIw`uRmg>3xo=4Uqu`Y6xIg_ByG5b! zKd>rS%ekX`dwp^J%6(s)T))5Xw7FcIou|{&)A#Fdo9a8K2R}|vugf_+xIU0SK0Xef zZvR>=?Hs_`2mf}e~X zC=%`x8|C%W+h+!K*Q#f)B<|4_ahGJZ*6|pOL>lXE<`6+(i(OsD$1B728`ldJ0xAKvSA>y@eDHo`^cSBtDiuLFyAE!24`6jz0NacQ{$rz%ay_~bQ-?23!i8q_zTdC(@ z7J1{WpA%Hs^GqU%*LEj`Lh;C@ApNkC6T}^LE%Zig+*Sc=AxNHea@2LLG81 zbeH75l&h~0F#z$>XfJ!xxJvui?%}WfX=srNB%2qNayv2+B;MR*>C|$$TrJcl7dNJ^ z>uTtGSOI#cUTK0l0yWM~GK|IcMRQQ+icLq+3{f43khmq~Ne2HY$*0I^{$)18BB7kfX$>kC)tV1zMY&0aV_Z(GT<9oTb_% zH3;~>IS@8;H?7q;dS@Xz=B$WeH&n-=XX^?Fi8K%EX<55CkkB8^p3ij+>QPsnz>#RE zX@n$0HxJvX>2H{duIZ*5C5-FZj^{REF$Ow~V?6Z*}lj4yj5-pN`5xPe;73JnA6~xT_ zFbsVrj*}#bjPHpjxreB^Zt55*H<|G`VdhDk_-y>iLf=X#2aTd6O?88`!B%cgnfUWF zj+w{}#$RI<0uS*)6QysiWs<~qRMqxBmw~0K@MW4ReA8AJLDI=*gYB1p zuGzK0T(Z^m{CFNYHl~q$H}POX5^vb8G>~f%36N;l3H*4>MxNt1UJwM1rHJwxBq-bO zM^KO!@j_7))v~>4@wr^a3Bx4ggbi#}7fBW1OwhZPt&#=}mvD5QNV2_<`TY9&O)Z83 z*VY*n^kDld#LKZuI0jTPNCM}Wc=@$r#gVGh83p4`@wVS;+lLn62(kdJX^}8NO+i6? zF28;+7vP(`1_fI|wcCzs>Y9L`MNvWMvy1s0aLXlQX;hIc8D_LyQT>+fC$D31(9`ky8Xgl8Uz56_&+2V9i*&P z#HkvbM<7+yOlN=lZIpZIssLI`k_4EM#3)Vyv0xy`3hq-bHtlDZByCMX6qrU}FyF{A zERgx@Kc-yR>wC7ck%XcI5e!jeP7;pk2J^Igc5wh@X9yb-ITj_NOVc$NDCDOJ{rr~p z2EnzDq0QmJ@&*Mg;-E&1MBnwoY3jYEFxm4!(svSQ5;0EjMM^7TuZpRl;<;}t{~}Qk z%^u9Dz<BBfQ$?*X!V#qpx8W08v?t72L!hf}Dso3iGA0Hq4tzz20`u+iG{PfUp%dA5H0000 Date: Thu, 23 Dec 2021 20:58:56 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[FEAT]=20#198=20-=20=EC=B2=AB=20=EB=AA=85?= =?UTF-8?q?=ED=95=A8=EC=83=9D=EC=84=B1=20=EC=8B=9C=20=EB=B0=94=ED=85=80?= =?UTF-8?q?=EC=8B=9C=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fixme qa 테플용으로 현재 viewWillAppear 로 테스트 --- .../Resouces/Constants/UserDefaults.swift | 4 +-- .../Sources/SceneDelegate.swift | 5 +--- ...stCardAlertBottomSheetViewController.swift | 29 +++++++++++++------ .../CardCreationPreviewViewController.swift | 16 ++++++++++ .../Main/FrontViewController.swift | 24 +++++++-------- 5 files changed, 50 insertions(+), 28 deletions(-) diff --git a/NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift b/NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift index e138bc02..92812197 100644 --- a/NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift +++ b/NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift @@ -12,7 +12,7 @@ extension Const { static let darkModeState = "darkModeState" static let accessToken = "accessToken" static let refreshToken = "refreshToken" -// static let userID = "userID" - static let userID = "nada2" + static let userID = "userID" + static let isFirstCard = "isFirstCard" } } diff --git a/NADA-iOS-forRelease/Sources/SceneDelegate.swift b/NADA-iOS-forRelease/Sources/SceneDelegate.swift index 3c199b7e..7b430bb9 100644 --- a/NADA-iOS-forRelease/Sources/SceneDelegate.swift +++ b/NADA-iOS-forRelease/Sources/SceneDelegate.swift @@ -15,14 +15,11 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { let defaults = UserDefaults.standard func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { - // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. - // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. - // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). guard let windowScene = (scene as? UIWindowScene) else { return } window = UIWindow(frame: windowScene.coordinateSpace.bounds) window?.windowScene = windowScene - window?.rootViewController = UIStoryboard(name: Const.Storyboard.Name.front, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.frontViewController) + window?.rootViewController = UIStoryboard(name: Const.Storyboard.Name.splash, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.splashViewController) window?.makeKeyAndVisible() IQKeyboardManager.shared.enable = true diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/FirstCardAlertBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/FirstCardAlertBottomSheetViewController.swift index abb6404b..89471935 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/FirstCardAlertBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/FirstCardAlertBottomSheetViewController.swift @@ -42,20 +42,29 @@ class FirstCardAlertBottomSheetViewController: CommonBottomSheetViewController { private let firstSubtitleLabel: UILabel = { let label = UILabel() - label.text = "명함을 좌우로 스와이프하여\n 앞/뒷면을 확인할 수 있어요." - - + label.textAlignment = .center + label.numberOfLines = 2 + let attributedString = NSMutableAttributedString(string: "명함을 좌우로 스와이프하여\n 앞/뒷면을 확인할 수 있어요.") + attributedString.addAttributes([.foregroundColor: UIColor.primary, .font: UIFont.textRegular03], range: NSRange(location: 0, length: 3)) + attributedString.addAttributes([.foregroundColor: UIColor.mainColorNadaMain, .font: UIFont.textBold01], range: NSRange(location: 4, length: 8)) + attributedString.addAttributes([.foregroundColor: UIColor.primary, .font: UIFont.textRegular03], range: NSRange(location: 14, length: 16)) + label.attributedText = attributedString + return label }() private let secondSubtitleLabel: UILabel = { let label = UILabel() - label.text = "우측 상단의 공유 버튼을 통해\n 친구에게 공유해 보세요." + label.textAlignment = .center + label.numberOfLines = 2 + let attributedString = NSMutableAttributedString(string: "우측 상단의 공유 버튼을 통해\n 친구에게 공유해 보세요.") + attributedString.addAttributes([.foregroundColor: UIColor.mainColorNadaMain, .font: UIFont.textBold01], range: NSRange(location: 0, length: 12)) + attributedString.addAttributes([.foregroundColor: UIColor.primary, .font: UIFont.textRegular03], range: NSRange(location: 13, length: 17)) + label.attributedText = attributedString return label }() - // MARK: - View Life Cycle override func viewDidLoad() { @@ -68,6 +77,8 @@ class FirstCardAlertBottomSheetViewController: CommonBottomSheetViewController { // UI 세팅 작업 private func setupUI() { + titleLabel.numberOfLines = 2 + view.addSubview(cardImageView) view.addSubview(bgView) bgView.addSubview(firstHandIcon) @@ -99,25 +110,25 @@ class FirstCardAlertBottomSheetViewController: CommonBottomSheetViewController { firstHandIcon.translatesAutoresizingMaskIntoConstraints = false NSLayoutConstraint.activate([ firstHandIcon.topAnchor.constraint(equalTo: bgView.topAnchor, constant: 16), - firstHandIcon.centerXAnchor.constraint(equalTo: bottomSheetView.centerXAnchor) + firstHandIcon.centerXAnchor.constraint(equalTo: bgView.centerXAnchor) ]) secondHandIcon.translatesAutoresizingMaskIntoConstraints = false NSLayoutConstraint.activate([ secondHandIcon.topAnchor.constraint(equalTo: firstSubtitleLabel.bottomAnchor, constant: 16), - secondHandIcon.centerXAnchor.constraint(equalTo: bottomSheetView.centerXAnchor) + secondHandIcon.centerXAnchor.constraint(equalTo: bgView.centerXAnchor) ]) firstSubtitleLabel.translatesAutoresizingMaskIntoConstraints = false NSLayoutConstraint.activate([ firstSubtitleLabel.topAnchor.constraint(equalTo: firstHandIcon.bottomAnchor, constant: 2), - firstSubtitleLabel.centerXAnchor.constraint(equalTo: bottomSheetView.centerXAnchor) + firstSubtitleLabel.centerXAnchor.constraint(equalTo: bgView.centerXAnchor) ]) secondSubtitleLabel.translatesAutoresizingMaskIntoConstraints = false NSLayoutConstraint.activate([ secondSubtitleLabel.topAnchor.constraint(equalTo: secondHandIcon.bottomAnchor, constant: 2), - secondSubtitleLabel.centerXAnchor.constraint(equalTo: bottomSheetView.centerXAnchor) + secondSubtitleLabel.centerXAnchor.constraint(equalTo: bgView.centerXAnchor) ]) } } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift index d6545a4c..740062aa 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift @@ -194,6 +194,22 @@ extension CardCreationPreviewViewController { case .success: print("cardCreationWithAPI - success") self.dismiss(animated: true, completion: nil) + // FIXME: - 초기에만등장 +// if UserDefaults.standard.object(forKey: Const.UserDefaults.isFirstCard) == nil { +// self.dismiss(animated: true) { +// let nextVC = FirstCardAlertBottomSheetViewController() +// .setTitle(""" +// 🎉 +// 첫 명함이 생성되었어요! +// """) +// .setHeight(587) +// nextVC.modalPresentationStyle = .overFullScreen +// DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.5) { +// self.presentingViewController?.present(nextVC, animated: false, completion: nil) +// } +// } +// } +// UserDefaults.standard.set(false, forKey: Const.UserDefaults.isFirstCard) case .requestErr(let message): print("cardCreationWithAPI - requestErr: \(message)") case .pathErr: diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift index 9ad47dcf..df6737d4 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift @@ -59,13 +59,22 @@ class FrontViewController: UIViewController { setDelegate() setNotification() // TODO: - 서버 테스트 + // cardListFetchWithAPI(userID: "nada", isList: false, offset: 0) } + // FIXME: - qa테스트 override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - setFirstCardAlert() + let nextVC = FirstCardAlertBottomSheetViewController() + .setTitle(""" + 🎉 + 첫 명함이 생성되었어요! + """) + .setHeight(587) + nextVC.modalPresentationStyle = .overFullScreen + present(nextVC, animated: true, completion: nil) } // MARK: - @IBAction Properties @@ -88,18 +97,7 @@ class FrontViewController: UIViewController { } // MARK: - Extensions -extension FrontViewController { - private func setFirstCardAlert() { - let nextVC = FirstCardAlertBottomSheetViewController() - .setTitle(""" - 🎉 - 첫 명함이 생성되었어요! - """) - .setHeight(587) - nextVC.modalPresentationStyle = .overFullScreen - present(nextVC, animated: false, completion: nil) - } - +extension FrontViewController { private func setDelegate() { cardSwiper.delegate = self cardSwiper.datasource = self