From 3ba5ff1d2dba841057776488960066edd3b8db54 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 18 Jan 2023 23:48:10 +0900 Subject: [PATCH 01/24] =?UTF-8?q?add:=20=EB=AA=85=ED=95=A8=20=EA=B3=B5?= =?UTF-8?q?=EC=9C=A0=20=EB=B0=94=ED=85=80=EC=8B=9C=ED=8A=B8=EB=A5=BC=20?= =?UTF-8?q?=EC=9C=84=ED=95=9C=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=97=90?= =?UTF-8?q?=EC=85=8B=20=EC=B6=94=EA=B0=80=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../icnNearbyOff.imageset/Contents.json | 23 ++++++++++++++++++ .../icnNearbyOff.imageset/icnNearbyOff.png | Bin 0 -> 368 bytes .../icnNearbyOff.imageset/icnNearbyOff@2x.png | Bin 0 -> 504 bytes .../icnNearbyOff.imageset/icnNearbyOff@3x.png | Bin 0 -> 669 bytes .../icnNearbyOn.imageset/Contents.json | 23 ++++++++++++++++++ .../icnNearbyOn.imageset/icnNearbyOn.png | Bin 0 -> 361 bytes .../icnNearbyOn.imageset/icnNearbyOn@2x.png | Bin 0 -> 548 bytes .../icnNearbyOn.imageset/icnNearbyOn@3x.png | Bin 0 -> 715 bytes .../nadaLogoTxt.imageset/Contents.json | 23 ++++++++++++++++++ .../nadaLogoTxt.imageset/nadaLogoTxt.png | Bin 0 -> 624 bytes .../nadaLogoTxt.imageset/nadaLogoTxt@2x.png | Bin 0 -> 1094 bytes .../nadaLogoTxt.imageset/nadaLogoTxt@3x.png | Bin 0 -> 1624 bytes 12 files changed, 69 insertions(+) create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNearbyOff.imageset/Contents.json create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNearbyOff.imageset/icnNearbyOff.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNearbyOff.imageset/icnNearbyOff@2x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNearbyOff.imageset/icnNearbyOff@3x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNearbyOn.imageset/Contents.json create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNearbyOn.imageset/icnNearbyOn.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNearbyOn.imageset/icnNearbyOn@2x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNearbyOn.imageset/icnNearbyOn@3x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/nadaLogoTxt.imageset/Contents.json create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/nadaLogoTxt.imageset/nadaLogoTxt.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/nadaLogoTxt.imageset/nadaLogoTxt@2x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/nadaLogoTxt.imageset/nadaLogoTxt@3x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNearbyOff.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNearbyOff.imageset/Contents.json new file mode 100644 index 00000000..99d1a740 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNearbyOff.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "icnNearbyOff.png" + }, + { + "idiom" : "universal", + "filename" : "icnNearbyOff@2x.png", + "scale" : "2x" + }, + { + "filename" : "icnNearbyOff@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/icnNearbyOff.imageset/icnNearbyOff.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNearbyOff.imageset/icnNearbyOff.png new file mode 100644 index 0000000000000000000000000000000000000000..5baab79a1d1d0de386409cc6a86e444dfb530d2c GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SM3?%Ea%ijShmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIBP0X`wF?gc(8)@+%-aQ*V-n^&yfynOX$AQwz-Ub$xTs#RN8tl3jvw0V#Wvbjy~C2{rz1o zSHx41^5zDCu$>tj?ug|Co!PCpfT3GPJLDW=x6I>rccZ5^KI2N5`1s!5YUAc_@9s)( zIGvlc;g}w~N%8DJvohnz1$mwa#F7Gbvfi+{!8`3%n`w;B!J^3<*|u^& z>F8mx*SQjn$FA(HUaT3Q7a?Ul%VD9W$lmJJiWBk<@Jzic9a_%r`TiJ>B;N$Px#7*I@9MMrQJx{|h5QeP;=LbXuuZ{|3MWu)p z6-rkZs?HGtGP{ZDzfV#-PRx=!i;a6H4|(#Q@544@Boc{4BK;#RRzg32V5z+@ot8Li zZk$kDB6>_q1hz9?moa82yTXi=gR#dkR)b?SfuK>QA$AAEZbJ;Zxhlj?sEp{hOrUbI z?PIfrXn>eCDH-F|7Kqs`4V6G)a{L2$kczPk6{Ltui7P;PgDXH}xr-1x0{Ovr44AZ+iR_}({cwadXH(<=4Q++seg&cOGIo@_Axv@pwIxrQ~@FKr-AITs!lvI6;x#X;^) z4C~IxyaaM20(?ST-3xq{FWQQ)9%7rZwa~HbmWF+cjJal>Yes!nf z&E3gvdExCz^WV)XFUz-oZ_}SB(FR2`{y$8bqE-3TN!=nu)m*T5-i#Gpy1gmOvhHcB zSg-PI61NGSz_{{!>-~s>(}Iq;o#Q>qpYlvYIA%v}caoEocu7u<-{U)cYr1A+91lBc zn)xo_v-(youU7{WoP@6_@yBhq)8Xi{V$98T2rv}f(QFu3$j!at{hAx=RLqVRx~|x< zP1fJ1kUhJox8LXH0kt31HdAbCo6^{f@7T&qZ~k?$dNu!L;a4JG?w+yQQ6RfLH}uW~ z|8<5=hAQ*dUAvGIXzl7#)4MH|fA>4i%ekE~N5ilDek}iHN89a)U}mJ{9c!f%e6_ojS+31fRFhph zyn3~in;GBs8Ls+yOZtAFGS4^BzxbkOWwt4oz`ct6qz88@m?tzPt)FNqzJtHo`T27< z$NLs};hBf6G?jD~cDm@(`U;$w5^*fgV_KSqU35}TanUx+PT?*IOTsr>6%-hr1F zrtbS~ed49T<@81~`LY@JH$4)5SJNkFp16wd@g;d)ZO0{I?~0FcJ(4#%qg!=i|D}5z zam#C>sxqq9SH_ieoqqmX_2Pc*!v;K1^kNS%G}U;vjb? zhIQv;UIICa0X`wF?gc*I3etWSB!4eR`d*LjoxM4!p^Gjl zgg9-VdQAAj3!6iHW!;~rq#Y}%j%#?6x&O(td+*O!_)Vn79UyGEV?wVfKqjT%m(e~d9YZ#7OXPPs{Pj&+Ojlt8^&t;ucLK6T0 CNT7)T literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNearbyOn.imageset/icnNearbyOn@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNearbyOn.imageset/icnNearbyOn@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..1b8f1ebc36191832ab76c7d971e0bc1a444a0ac6 GIT binary patch literal 548 zcmV+<0^9wGP)Px#Ay7u}j1-6o*q< z^u{819&QCe=u|;eZYmxQx*a-oQV`Tm%87zg55eIkT^!uZk>1(A()N<3iHpA!4hQp1 z9s2bp@4e)e5R1iPu~_~QgR6u+?3h}6Nl|fOW*rxTOB2fpYmNE_+Ik@w8U#xkjp5-A z3xzFM`%twnc#VYyy2=$@dj+)ev;W}wD{M1;6JEU57< zl@FeL!nIia079ZKk{RvII3+31L^R-jzT9#j>Dp(zRz3$cx81=J-6hE3)4kbdYlL)E zEyJ%aWtDW<_oOpcR+;s{O!h(=%PVj0g!B!u_RE)VS7oiM+K+y>HWt^1Cz3LYC(yhS zvnE^PTF}Afj(B~_b?W!Ae5PVg(ZUbv_MAZ%LizbB9QEr0GEifFnVWk#=os2or(T-J zee@VKZ56pubMOLq*v|=>;Df&_BaG!=MsbHV*AGTWQ+7jLqGRyjyeJ~O#{V$9gZIa( m+}k(LvHfecSS%LHAMy>LYOTC78D8oD0000Px#8&FJCMMrQ<_i$$SaAfvyX7_Mr_HbqQaAo;$W%h7p zQeI6+00008bW%=J0Ocf^dr-g-pqm$00006yNklC044B1ylTiJ-MRiG3vVk zJ&#pjU`YqL1-ju$7m91+p`)P-k2!^1AU9JEuJ|tD_*N>e3pKeax(lN&&4%=*=xR=* z>aj?G{vxw|nBEg^kb%Yk-QXo?h|WGl&_MZKKXuqAVUR(HVA`(m zG46x3Bx`FBY%$E_&X!s{Umnel^yN?gMs{BtdmqC)`De4WIcYnTZ1E-d(<9n=002ovPDHLkV1haCNcI2# literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/nadaLogoTxt.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/nadaLogoTxt.imageset/Contents.json new file mode 100644 index 00000000..0731916c --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/nadaLogoTxt.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "nadaLogoTxt.png", + "scale" : "1x" + }, + { + "filename" : "nadaLogoTxt@2x.png", + "scale" : "2x", + "idiom" : "universal" + }, + { + "filename" : "nadaLogoTxt@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/nadaLogoTxt.imageset/nadaLogoTxt.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/nadaLogoTxt.imageset/nadaLogoTxt.png new file mode 100644 index 0000000000000000000000000000000000000000..fcbe294c08a5a2b9dcb42a6894d278c657c4f708 GIT binary patch literal 624 zcmeAS@N?(olHy`uVBq!ia0vp^AwVq0!VDxG+Eji3DVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}x&b~RuI>ds-wV>d7o>gzk!e8k8<_p6AQ33|y&wfF0#z_aO?E9%BVS37 zUoeBh!G`+_!ru!RI7}$mkeZwK5NP~yPZ!4!i_>=}Z}es=6ghssP-&Kwn&Z|E4o4H2 zNxuW5FY_;7Hi2UnS9-QU`yxdS^XWX%N>WRC%j8-l@Xl}Vmp6ZT_kRC9cj4`| zrOn@K_Mfkys4ma?moe6!+ig>Y==N(k8QUmx|U@qR$p(xXaw&a*BUB+b5X zaqR)ychl0H0!?i@)dY-NqC!#}oMq0pBZ+T*K^#`uM{juX;+WSYFK+zZLx0oNwwACbN8rNwY^ga z()7>#D#nr>Y4~T0=d-76HCGs<=G~dSFFa=Y!dgoQ7oJTvlahO;Ogp;z`o3`O^r8&M zMHh;`S1P~hJN`m5&8a2tN8IwhckM>A4wwu0+3kN4#{0UfZ^4z*&--iieV_1!YCLz* zYBqRZ&vU!YwRwW*f%V~c8AZ8{>Q|-a%;nGH<96k~Yu4dwCa+}@bu)C~ghiA2_h+Av zkynw0-;VZ88A}CzT#jn2FZ;{Tmiyb8UGAX+FtQmuUHx3vIVCg! E0NWi4=>Px# literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/nadaLogoTxt.imageset/nadaLogoTxt@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/nadaLogoTxt.imageset/nadaLogoTxt@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..68aa11343e6de7d0a9d3a69f8332a5dfaf93deeb GIT binary patch literal 1094 zcmV-M1iAZ(P)Px#Cs0gOMMrQ<_HbtSaAoyyW%qDo^>AeOaAo&!X7_Mr z_HbtQaAx*!X7+Gq`ol@+x?x3KKHz3;wx?A7n=!DY7C?WzXsY@V zzf-g!Kx~e5k>W$Gc^$g~l$FbR%4@Dm6Pw zl%Ok^#kO^)^%A60s0KAKwzCalME8@ZnQx#UFz7jk;`N_8okbI*(^7p(Ow#FmFJ&qfsVa#M z(n3+^!)7biUT&C5InBRp9yE}=%~a~MRb|l~2O6B<{p+z^-f&@p6zB|h#F9C+=~pVx zf+`xhP>R14+gBaLrX2-ZXHM4(BF$)QR9#VlQvB<`^;LH{$3Yrsct|fTdCHN}f&(G#^$3Vh!zZ~Nx{l|tKmzHBMp zj$+H4a77hL^{1UhQ=>Xn=+Hw|?7ETX6svlo6joIp;ltpr&JW3X$v}C7(zS`9+q+Ow zyi3Y)HPv*YHsSDcI;U<2( znXew%{B4ZgPj102?4wC_@;m;mTiEcE>cmBHK|F}2e@~}lI{t6`16w(Xe-b-vVgLXD M07*qoM6N<$g1q(pf&c&j literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/nadaLogoTxt.imageset/nadaLogoTxt@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/nadaLogoTxt.imageset/nadaLogoTxt@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..394f92f0ef59ef4de9546628e2afd1de32b59c9e GIT binary patch literal 1624 zcmV-e2B-OnP)Px#Cs0gOMMrQ<_i$$RaAx;#X7_Mp_i$$SaAo#zW%F=j z_HbtRaAx>$WcF}o{gmq~0000CbW%=J03d|lM5M!D5btm>wqY5E000HINklV5e2W16hSTSAVokpI7qRe2!W>& z;UPte6j}&R@gO$J(`0v(n7DtGyYu?{&CcdoIdKbjs_f3}eC9jzo%zj72&qz)s#K*a zRq6kl+CRTvCjKgpkISRi;y7NHhj$WuJSbCqiSnuV(&RJorOD^wZ;}67_rSb;^YNqm z_g_wYMt;W)J^AoUy!KU={nh0XlzfkUzx&eD>h3(doD>zW&;2B0D|tA#AIE`uYRL-1 zPcwDzi;7285@Mxqgq&vb`$T2AAd6)R{!*`E*DWd@%cq(?eUg7K*c3=VVP(JfBH!i~SuSO8RdF#P5 zT|vV%oezqS z&hwsG{8KdVcVZ$z>!sv%A9xSo+dx9o0_`Y1Yr|e57$9v9U@eI#Oc`)9O*-AW9-h=oXiFaA| zT;zCfW)%OchM%!5m%>|oZK^5n^|VPy@is5l%<*2!B>wJV0_S}|I&2~$AC7;pW->0E0lFp0ds^}Xhp3j}P5+2*!zU(IA)8hk*cw5ff zb^9D@$*9U(qApR+wqfWD>^qS*RXq`NCH`Z1M+3vDZ;ZJ! z)+J7kcz~zP-*vy{&Rc)Z(&U1BkK^0V)uzD(|X zt=xMU|5Wbt0{%K;D#T;t{^V z&rS}m=YmlX{+OVx2*F!}%x?2IM?AR$s%X0ke}dZ|vXTP-fgF_+ylY*PT=^#PRPhQP ziB@b7z%6O&i47~s@eh@*Yl1F$)+ATHNj&{#pgnxAbz+~M0BwN}-{$YX)yg@B`bF>k z^wGi~o{$&tit@EZkb3I*4o#re_$)2*4aHx+D~nrC@a<~LJ@XGV9`J_r!s#2AzRHZ8YyXkK* W Date: Wed, 18 Jan 2023 23:48:27 +0900 Subject: [PATCH 02/24] chore: pod update (#349) --- Podfile.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 791010a0..175d2123 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,24 +1,24 @@ PODS: - Alamofire (5.6.4) - - Firebase/CoreOnly (10.3.0): - - FirebaseCore (= 10.3.0) - - Firebase/DynamicLinks (10.3.0): + - Firebase/CoreOnly (10.4.0): + - FirebaseCore (= 10.4.0) + - Firebase/DynamicLinks (10.4.0): - Firebase/CoreOnly - - FirebaseDynamicLinks (~> 10.3.0) - - FirebaseCore (10.3.0): + - FirebaseDynamicLinks (~> 10.4.0) + - FirebaseCore (10.4.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/Logger (~> 7.8) - - FirebaseCoreInternal (10.3.0): + - FirebaseCoreInternal (10.4.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseDynamicLinks (10.3.0): + - FirebaseDynamicLinks (10.4.0): - FirebaseCore (~> 10.0) - - GoogleUtilities/Environment (7.10.0): + - GoogleUtilities/Environment (7.11.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.10.0): + - GoogleUtilities/Logger (7.11.0): - GoogleUtilities/Environment - - "GoogleUtilities/NSData+zlib (7.10.0)" - - IQKeyboardManagerSwift (6.5.10) + - "GoogleUtilities/NSData+zlib (7.11.0)" + - IQKeyboardManagerSwift (6.5.11) - KakaoSDKAuth (2.13.1): - KakaoSDKCommon (= 2.13.1) - KakaoSDKCommon (2.13.1): @@ -81,12 +81,12 @@ SPEC REPOS: SPEC CHECKSUMS: Alamofire: 4e95d97098eacb88856099c4fc79b526a299e48c - Firebase: f92fc551ead69c94168d36c2b26188263860acd9 - FirebaseCore: 988754646ab3bd4bdcb740f1bfe26b9f6c0d5f2a - FirebaseCoreInternal: 29b76f784d607df8b2a1259d73c3f04f1210137b - FirebaseDynamicLinks: 51c81d07bd63155bb56d76b0abdda79c8a3d8d02 - GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95 - IQKeyboardManagerSwift: 52962c76ab33532f15ad9f3ff4e5715eda5335bb + Firebase: ba3501b5142a57747eac74d27c96d2b313bdec90 + FirebaseCore: b8697a177690b69b0dbce9d612b69b893be70469 + FirebaseCoreInternal: e301297f4c15a17489e48ed722d733b1578e0c02 + FirebaseDynamicLinks: 497bdb5433a4a117d21d73c0349e6ebc1d56b4d9 + GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f + IQKeyboardManagerSwift: c7955c0bdbf7b2eb29bb7daaa44e3d90f55a9a85 KakaoSDKAuth: d9de0cb0c723441ced3616d481952bde34438dcb KakaoSDKCommon: a16807e19984a0a208c3117c7ef117f101a9a128 KakaoSDKUser: 92d34cf6af7b123c22a7ee44424332123e356901 From 6e103d4922b65ec4f1542d4dfac70119ba367c22 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 18 Jan 2023 23:48:44 +0900 Subject: [PATCH 03/24] =?UTF-8?q?fix:=20=EB=B0=94=ED=85=80=EC=8B=9C?= =?UTF-8?q?=ED=8A=B8=20=EB=86=92=EC=9D=B4=20=EB=B3=80=EA=B2=BD=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/ViewControllers/Main/FrontViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift index 8b6c9409..c5103896 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift @@ -134,7 +134,7 @@ extension FrontViewController { private func didRecievePresentCardShare(_ notification: Notification) { let nextVC = CardShareBottomSheetViewController() .setTitle("명함공유") - .setHeight(404) + .setHeight(606.0) if let cardData = notification.object as? Card { nextVC.cardDataModel = cardData From a5beac678ddb4892be761f8e8ec9f56a40adfe6c Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 18 Jan 2023 23:49:34 +0900 Subject: [PATCH 04/24] =?UTF-8?q?feat:=20UIView=20Extension=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - layout 작업 시에 UIView 배열로 뷰에 더하는 함수 생성. --- .../Resouces/Extensions/UIView+Extension.swift | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NADA-iOS-forRelease/Resouces/Extensions/UIView+Extension.swift b/NADA-iOS-forRelease/Resouces/Extensions/UIView+Extension.swift index 019fff8a..55a1ceda 100644 --- a/NADA-iOS-forRelease/Resouces/Extensions/UIView+Extension.swift +++ b/NADA-iOS-forRelease/Resouces/Extensions/UIView+Extension.swift @@ -50,6 +50,12 @@ extension UIView { } extension UIView { + func addSubviews(_ views: [UIView]) { + views.forEach { view in + self.addSubview(view) + } + } + func pinToSafeArea(top: CGFloat? = 0, left: CGFloat? = 0, bottom: CGFloat? = 0, right: CGFloat? = 0) { guard let superview = self.superview else { return } From 33a315e0a1870658e6ce5dac1eca11685bee2518 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 18 Jan 2023 23:52:52 +0900 Subject: [PATCH 05/24] =?UTF-8?q?feat:=20addSubviews(=5F:)=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=20=EC=A0=81=EC=9A=A9=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BottomSheet/CardShareBottomSheetViewController.swift | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index 58ac0747..2e9243d7 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -74,13 +74,15 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { // MARK: - @Functions private func setupUI() { + view.addSubviews([cardBackgroundView, nearByBackgroundView]) + idStackView.addArrangedSubview(idTitleLabel) idStackView.addArrangedSubview(idLabel) idStackView.addArrangedSubview(copyButton) - view.addSubview(qrImage) - view.addSubview(idStackView) - view.addSubview(saveAsImageButton) + cardBackgroundView.addSubviews([nadaLogoImage, qrImage, idStackView, saveAsImageButton]) + + nearByBackgroundView.addSubviews([nearByImage, nearByLabel, nearBySwitch]) idLabel.text = cardDataModel?.cardID ?? "" From cc271707e54ad90cbf96524fc204c875650e134a Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 18 Jan 2023 23:55:44 +0900 Subject: [PATCH 06/24] =?UTF-8?q?refactor:=20=EC=A0=91=EA=B7=BC=20?= =?UTF-8?q?=EC=A0=9C=EC=96=B4=EC=9E=90=20=EC=88=98=EC=A0=95=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CardShareBottomSheetViewController.swift | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index 2e9243d7..e0831d2f 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -14,8 +14,8 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { // MARK: - Properties - var isShareable = false - var cardDataModel: Card? + public var isShareable = false + public var cardDataModel: Card? private let qrImage: UIImageView = { let imageView = UIImageView() @@ -223,12 +223,14 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { // MARK: - @objc Methods - @objc func copyId() { + @objc + private func copyId() { UIPasteboard.general.string = cardDataModel?.cardID ?? "" showToast(message: "명함 아이디가 복사되었습니다.", font: UIFont.button02, view: "copyID") } - @objc func saveAsImage() { + @objc + private func saveAsImage() { setImageWriteToSavedPhotosAlbum() } From d3cfebefe7ac1124526a30e69f45c7725605e94d Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 18 Jan 2023 23:57:52 +0900 Subject: [PATCH 07/24] =?UTF-8?q?add:=20UI=20Components=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CardShareBottomSheetViewController.swift | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index e0831d2f..422d6501 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -17,6 +17,50 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { public var isShareable = false public var cardDataModel: Card? + private let cardBackgroundView: UIView = { + let view = UIView() + view.backgroundColor = .card + view.layer.cornerRadius = 10.0 + + return view + }() + + private let nearByBackgroundView: UIView = { + let view = UIView() + view.backgroundColor = .card + view.layer.cornerRadius = 10.0 + + return view + }() + + private let nadaLogoImage: UIImageView = { + let imageView = UIImageView() + imageView.image = UIImage(named: "nadaLogoTxt") + + return imageView + }() + + private let nearByImage: UIImageView = { + let imageView = UIImageView() + + return imageView + }() + + private let nearByLabel: UILabel = { + let label = UILabel() + label.font = .button02 + + return label + }() + + private let nearBySwitch: UISwitch = { + let nearBySwitch = UISwitch() + nearBySwitch.onTintColor = .mainColorNadaMain + nearBySwitch.addTarget(self, action: #selector(touchSwitch), for: .valueChanged) + + return nearBySwitch + }() + private let qrImage: UIImageView = { let imageView = UIImageView() imageView.frame = CGRect(x: 0, y: 0, width: 160, height: 160) From 7280ee9d62d1fa23127af2e7d6e6451b4251fbb0 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Thu, 19 Jan 2023 00:00:17 +0900 Subject: [PATCH 08/24] =?UTF-8?q?feat:=20=EB=AA=85=ED=95=A8=20=ED=99=9C?= =?UTF-8?q?=EC=84=B1=ED=99=94=20=EC=9C=A0=EB=AC=B4=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=A5=B8=20UI=20=EA=B5=AC=ED=98=84=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - if 문을 사용하게 되면 줄이 두배 길어지고, 삼항연산자 사용하면 UI components 에 코드가 집중할 수 있다고 생각했습니다. - if-else 문에서 휴먼에러로 변경되는 UI 를 놓치지 않을 수 있습니다. --- .../CardShareBottomSheetViewController.swift | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index 422d6501..285e9e13 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -16,6 +16,7 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { public var isShareable = false public var cardDataModel: Card? + public var isActivate: Bool? private let cardBackgroundView: UIView = { let view = UIView() @@ -130,6 +131,15 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { idLabel.text = cardDataModel?.cardID ?? "" + guard let isActivate else { return } + + nearByBackgroundView.backgroundColor = isActivate ? .mainColorNadaMain.withAlphaComponent(0.15) : .card + + nearByImage.image = isActivate ? UIImage(named: "icnNearbyOn") : UIImage(named: "icnNearbyOff") + + nearByLabel.text = isActivate ? "내 근처의 명함 ON" : "내 근처의 명함 OFF" + nearByLabel.textColor = isActivate ? .mainColorNadaMain : .tertiary + setupLayout() setQRImage() } From 6ea26dcc90c66ab03943eb0f803925e7f60d061d Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Thu, 19 Jan 2023 00:00:37 +0900 Subject: [PATCH 09/24] =?UTF-8?q?delete:=20FIXME=20=EC=A3=BC=EC=84=9D=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BottomSheet/CardShareBottomSheetViewController.swift | 3 --- 1 file changed, 3 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index 285e9e13..4900208c 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -171,9 +171,6 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { let frame = CGRect(origin: .zero, size: qrImage.frame.size) let qrcode = QRCodeView(frame: frame) generateDynamicLink(with: cardDataModel?.cardID ?? "") { dynamicLink in - - // FIXME: - ThisIsTeamNADAQrCode 로 나다에서 prefix 파악하는데 수정하기 - qrcode.generateCode(dynamicLink, foregroundColor: .primary, backgroundColor: .background) From c2c79a8517c6c58725d7e801ac7c584172f2ce33 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Thu, 19 Jan 2023 00:01:06 +0900 Subject: [PATCH 10/24] =?UTF-8?q?fix:=20=EB=AA=85=ED=95=A8=20=EA=B3=B5?= =?UTF-8?q?=EC=9C=A0=20=EB=B0=94=ED=85=80=EC=8B=9C=ED=8A=B8=EC=9D=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=EC=9C=BC=EB=A1=9C=20QR=20Code=20=EC=9D=98=20?= =?UTF-8?q?=EB=B0=B0=EA=B2=BD=20=EB=B3=80=EA=B2=BD=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BottomSheet/CardShareBottomSheetViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index 4900208c..04b082ac 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -173,7 +173,7 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { generateDynamicLink(with: cardDataModel?.cardID ?? "") { dynamicLink in qrcode.generateCode(dynamicLink, foregroundColor: .primary, - backgroundColor: .background) + backgroundColor: .card) self.qrImage.addSubview(qrcode) } } From d841a23f62b24088d3679fc3599de1f34f430b61 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Thu, 19 Jan 2023 00:01:29 +0900 Subject: [PATCH 11/24] =?UTF-8?q?fix:=20QR=20Code=20=ED=81=AC=EA=B8=B0=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BottomSheet/CardShareBottomSheetViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index 04b082ac..3504b3ba 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -64,7 +64,7 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { private let qrImage: UIImageView = { let imageView = UIImageView() - imageView.frame = CGRect(x: 0, y: 0, width: 160, height: 160) + imageView.frame = CGRect(x: 0, y: 0, width: 189, height: 189) return imageView }() From 861ec6d8513e867923b64a101555b0877629906f Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Thu, 19 Jan 2023 00:01:59 +0900 Subject: [PATCH 12/24] =?UTF-8?q?design:=20UI=20layout=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CardShareBottomSheetViewController.swift | 62 ++++++++++++++++--- 1 file changed, 53 insertions(+), 9 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index 3504b3ba..4136b998 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -145,25 +145,69 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { } private func setupLayout() { + cardBackgroundView.translatesAutoresizingMaskIntoConstraints = false + NSLayoutConstraint.activate([ + cardBackgroundView.topAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: 20.0), + cardBackgroundView.leadingAnchor.constraint(equalTo: bottomSheetView.leadingAnchor, constant: 24.0), + cardBackgroundView.trailingAnchor.constraint(equalTo: bottomSheetView.trailingAnchor, constant: -24.0), + cardBackgroundView.heightAnchor.constraint(equalToConstant: 384.0) + ]) + + nadaLogoImage.translatesAutoresizingMaskIntoConstraints = false + NSLayoutConstraint.activate([ + nadaLogoImage.topAnchor.constraint(equalTo: cardBackgroundView.topAnchor, constant: 18.0), + nadaLogoImage.leadingAnchor.constraint(equalTo: cardBackgroundView.leadingAnchor, constant: 18.0), + nadaLogoImage.widthAnchor.constraint(equalToConstant: 84.0), + nadaLogoImage.heightAnchor.constraint(equalToConstant: 30.0) + ]) + qrImage.translatesAutoresizingMaskIntoConstraints = false NSLayoutConstraint.activate([ - qrImage.topAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: 8), - qrImage.centerXAnchor.constraint(equalTo: bottomSheetView.centerXAnchor), - qrImage.widthAnchor.constraint(equalToConstant: 160), - qrImage.heightAnchor.constraint(equalToConstant: 160) + qrImage.topAnchor.constraint(equalTo: cardBackgroundView.topAnchor, constant: 64.0), + qrImage.centerXAnchor.constraint(equalTo: cardBackgroundView.centerXAnchor), + qrImage.widthAnchor.constraint(equalToConstant: 189.0), + qrImage.heightAnchor.constraint(equalToConstant: 189.0) ]) idStackView.translatesAutoresizingMaskIntoConstraints = false NSLayoutConstraint.activate([ - idStackView.topAnchor.constraint(equalTo: qrImage.bottomAnchor, constant: 9), - idStackView.centerXAnchor.constraint(equalTo: bottomSheetView.centerXAnchor) + idStackView.topAnchor.constraint(equalTo: qrImage.bottomAnchor, constant: 15.0), + idStackView.centerXAnchor.constraint(equalTo: cardBackgroundView.centerXAnchor) ]) saveAsImageButton.translatesAutoresizingMaskIntoConstraints = false NSLayoutConstraint.activate([ - saveAsImageButton.topAnchor.constraint(equalTo: idStackView.bottomAnchor, constant: 32), - saveAsImageButton.centerXAnchor.constraint(equalTo: bottomSheetView.centerXAnchor), - saveAsImageButton.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 107) + saveAsImageButton.topAnchor.constraint(equalTo: idStackView.bottomAnchor, constant: 20.0), + saveAsImageButton.centerXAnchor.constraint(equalTo: cardBackgroundView.centerXAnchor) + ]) + + nearByBackgroundView.translatesAutoresizingMaskIntoConstraints = false + NSLayoutConstraint.activate([ + nearByBackgroundView.topAnchor.constraint(equalTo: cardBackgroundView.bottomAnchor, constant: 12.0), + nearByBackgroundView.leadingAnchor.constraint(equalTo: bottomSheetView.leadingAnchor, constant: 24.0), + nearByBackgroundView.trailingAnchor.constraint(equalTo: bottomSheetView.trailingAnchor, constant: -24.0), + nearByBackgroundView.heightAnchor.constraint(equalToConstant: 60.0) + ]) + + nearByImage.translatesAutoresizingMaskIntoConstraints = false + NSLayoutConstraint.activate([ + nearByImage.centerYAnchor.constraint(equalTo: nearByBackgroundView.centerYAnchor), + nearByImage.heightAnchor.constraint(equalToConstant: 54.0), + nearByImage.widthAnchor.constraint(equalToConstant: 54.0) + ]) + + nearByLabel.translatesAutoresizingMaskIntoConstraints = false + NSLayoutConstraint.activate([ + nearByLabel.centerYAnchor.constraint(equalTo: nearByBackgroundView.centerYAnchor), + nearByLabel.leadingAnchor.constraint(equalTo: nearByImage.trailingAnchor) + ]) + + nearBySwitch.translatesAutoresizingMaskIntoConstraints = false + NSLayoutConstraint.activate([ + nearBySwitch.centerYAnchor.constraint(equalTo: nearByBackgroundView.centerYAnchor), + nearBySwitch.trailingAnchor.constraint(equalTo: nearByBackgroundView.trailingAnchor, constant: -20.0), + nearBySwitch.heightAnchor.constraint(equalToConstant: 31.0), + nearBySwitch.widthAnchor.constraint(equalToConstant: 51.0) ]) } From e5785b6d6aee8bfcb1f4cf26eab8f844d07d2059 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Thu, 19 Jan 2023 00:02:38 +0900 Subject: [PATCH 13/24] =?UTF-8?q?feat:=20nearBySwitch=20=EC=9D=98=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CardShareBottomSheetViewController.swift | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index 4136b998..b6443202 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -337,4 +337,22 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { showToast(message: "갤러리에 저장되었습니다.", font: UIFont.button02, view: "saveImage") } } + + @objc func touchSwitch(_ sender: UISwitch) { + if sender.isOn { + nearByBackgroundView.backgroundColor = .mainColorNadaMain.withAlphaComponent(0.15) + + nearByImage.image = UIImage(named: "icnNearbyOn") + + nearByLabel.text = "내 근처의 명함 ON" + nearByLabel.textColor = .mainColorNadaMain + } else { + nearByBackgroundView.backgroundColor = .card + + nearByImage.image = UIImage(named: "icnNearbyOff") + + nearByLabel.text = "내 근처의 명함 OFF" + nearByLabel.textColor = .tertiary + } + } } From 64c48a44ca58e9eefa2cfd4f657c4a361dd34098 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Thu, 19 Jan 2023 00:04:47 +0900 Subject: [PATCH 14/24] =?UTF-8?q?refactor:=20=EC=82=BC=ED=95=AD=EC=97=B0?= =?UTF-8?q?=EC=82=B0=EC=9E=90=20=EC=82=AC=EC=9A=A9=ED=95=9C=20nearBySwitch?= =?UTF-8?q?=20=EC=95=A1=EC=85=98=EB=A9=94=EC=84=9C=EB=93=9C=20=EB=A6=AC?= =?UTF-8?q?=ED=8E=99=ED=86=A0=EB=A7=81=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CardShareBottomSheetViewController.swift | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index b6443202..ef31fae2 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -339,20 +339,11 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { } @objc func touchSwitch(_ sender: UISwitch) { - if sender.isOn { - nearByBackgroundView.backgroundColor = .mainColorNadaMain.withAlphaComponent(0.15) - - nearByImage.image = UIImage(named: "icnNearbyOn") - - nearByLabel.text = "내 근처의 명함 ON" - nearByLabel.textColor = .mainColorNadaMain - } else { - nearByBackgroundView.backgroundColor = .card - - nearByImage.image = UIImage(named: "icnNearbyOff") - - nearByLabel.text = "내 근처의 명함 OFF" - nearByLabel.textColor = .tertiary - } + nearByBackgroundView.backgroundColor = sender.isOn ? .mainColorNadaMain.withAlphaComponent(0.15) : .card + + nearByImage.image = sender.isOn ? UIImage(named: "icnNearbyOn") : UIImage(named: "icnNearbyOff") + + nearByLabel.text = sender.isOn ? "내 근처의 명함 ON" : "내 근처의 명함 OFF" + nearByLabel.textColor = sender.isOn ? .mainColorNadaMain : .tertiary } } From 0ae241142ad95782561e116be6c0813143e42a63 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Thu, 19 Jan 2023 00:05:07 +0900 Subject: [PATCH 15/24] chore: import Lottie (#349) --- .../BottomSheet/CardShareBottomSheetViewController.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index ef31fae2..18adc8ec 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -9,6 +9,7 @@ import UIKit import Photos import FirebaseDynamicLinks +import Lottie class CardShareBottomSheetViewController: CommonBottomSheetViewController { From 14e56577e9e22a336c9051731358c92855cba8f2 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Thu, 19 Jan 2023 00:10:58 +0900 Subject: [PATCH 16/24] =?UTF-8?q?feat:=20=EB=AA=85=ED=95=A8=20=EA=B3=B5?= =?UTF-8?q?=EC=9C=A0=20=EB=B0=94=ED=85=80=EC=8B=9C=ED=8A=B8=EA=B0=80=20?= =?UTF-8?q?=EA=B0=80=EC=A7=80=EB=8A=94=20=EB=B3=80=EC=88=98=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 추후에 수정되어야 하기 때문에 주석 설정. --- .../Sources/ViewControllers/Main/FrontViewController.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift index c5103896..18b6ac1d 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift @@ -140,6 +140,9 @@ extension FrontViewController { nextVC.cardDataModel = cardData } + // FIXME: - 명함 공유 활성화여부 넘기기(서버 혹은 multipeer connectivity 로) + nextVC.isActivate = false + nextVC.modalPresentationStyle = .overFullScreen self.present(nextVC, animated: false, completion: nil) } From 74073da1e73e1b8374c1a6e353bf8ea0c15ba762 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Thu, 19 Jan 2023 16:12:02 +0900 Subject: [PATCH 17/24] =?UTF-8?q?add:=20lottieImage=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - lazy 로 선언해서 lottie image 를 사용하기 전까지 메모리에 올리지 않게 됨. --- .../BottomSheet/CardShareBottomSheetViewController.swift | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index 18adc8ec..1b8a0627 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -110,6 +110,14 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { return button }() + lazy + private var lottieImage: LottieAnimationView = { + let view = LottieAnimationView(name: Const.Lottie.nearby) + view.loopMode = .loop + + return view + }() + // MARK: - View Life Cycle override func viewDidLoad() { From 8c0040cf3d9c99cbe5bba68cd0d0c55521527ca8 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Thu, 19 Jan 2023 16:13:03 +0900 Subject: [PATCH 18/24] =?UTF-8?q?design:=20lottieImage=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=95=84=EC=9B=83=20=EC=84=A4=EC=A0=95=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BottomSheet/CardShareBottomSheetViewController.swift | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index 1b8a0627..b41d815c 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -136,7 +136,7 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { cardBackgroundView.addSubviews([nadaLogoImage, qrImage, idStackView, saveAsImageButton]) - nearByBackgroundView.addSubviews([nearByImage, nearByLabel, nearBySwitch]) + nearByBackgroundView.addSubviews([nearByImage, nearByLabel, nearBySwitch, lottieImage]) idLabel.text = cardDataModel?.cardID ?? "" @@ -218,6 +218,12 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { nearBySwitch.heightAnchor.constraint(equalToConstant: 31.0), nearBySwitch.widthAnchor.constraint(equalToConstant: 51.0) ]) + + lottieImage.translatesAutoresizingMaskIntoConstraints = false + NSLayoutConstraint.activate([ + lottieImage.centerXAnchor.constraint(equalTo: nearByImage.centerXAnchor), + lottieImage.centerYAnchor.constraint(equalTo: nearByImage.centerYAnchor) + ]) } private func setQRImage() { @@ -286,7 +292,6 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { default: break } - } // FIXME: - 명함 저장시에도 테두리 둥글게 가능한가 찾기 From 32632a833651bb3ba6c3e5b26b4d14435d3c1eb0 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Thu, 19 Jan 2023 16:14:16 +0900 Subject: [PATCH 19/24] =?UTF-8?q?feat:=20isActivate=20=EB=B3=80=EC=88=98?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20UI=20=EC=84=A4=EC=A0=95=20(#34?= =?UTF-8?q?9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BottomSheet/CardShareBottomSheetViewController.swift | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index b41d815c..90c8008d 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -148,7 +148,12 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { nearByLabel.text = isActivate ? "내 근처의 명함 ON" : "내 근처의 명함 OFF" nearByLabel.textColor = isActivate ? .mainColorNadaMain : .tertiary - + + nearBySwitch.setOn(isActivate, animated: false) + + lottieImage.isHidden = isActivate ? false : true + _ = isActivate ? lottieImage.play() : lottieImage.stop() + setupLayout() setQRImage() } From 857bb48c9e484395a7151d0cea3cdd5307ca2de6 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Thu, 19 Jan 2023 16:15:52 +0900 Subject: [PATCH 20/24] =?UTF-8?q?feat:=20nearBySwitch=20=EC=95=A1=EC=85=98?= =?UTF-8?q?=20=EB=A9=94=EC=84=9C=EB=93=9C=EC=97=90=20lottieImage=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BottomSheet/CardShareBottomSheetViewController.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index 90c8008d..fd0670f8 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -364,5 +364,8 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { nearByLabel.text = sender.isOn ? "내 근처의 명함 ON" : "내 근처의 명함 OFF" nearByLabel.textColor = sender.isOn ? .mainColorNadaMain : .tertiary + + lottieImage.isHidden = sender.isOn ? false : true + _ = sender.isOn ? lottieImage.play() : lottieImage.stop() } } From e67e4c720c03bfeacad4af3c8b9a531cfd24ca4f Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Thu, 19 Jan 2023 16:41:41 +0900 Subject: [PATCH 21/24] =?UTF-8?q?refactor:=20SwiftLint=20(self=5Fin=5Fprop?= =?UTF-8?q?erty=5Finitialization)=20=EC=9B=8C=EB=8B=9D=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 아직 선언되지 않은 컴포넌트의 액션 메서드를 적용하기 위해서 addTarget() 에서 self 를 사용하면 이는 예상못할 수 있기 때문에 lazy 하게 만들어야 안전합니다. --- .../BottomSheet/CardShareBottomSheetViewController.swift | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index fd0670f8..ecfdab2b 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -55,7 +55,8 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { return label }() - private let nearBySwitch: UISwitch = { + lazy + private var nearBySwitch: UISwitch = { let nearBySwitch = UISwitch() nearBySwitch.onTintColor = .mainColorNadaMain nearBySwitch.addTarget(self, action: #selector(touchSwitch), for: .valueChanged) @@ -86,7 +87,8 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { return label }() - private let copyButton: UIButton = { + lazy + private var copyButton: UIButton = { let button = UIButton() button.setImage(UIImage(named: "iconCopy"), for: .normal) button.addTarget(self, action: #selector(copyId), for: .touchUpInside) @@ -102,7 +104,8 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { return stackView }() - private let saveAsImageButton: UIButton = { + lazy + private var saveAsImageButton: UIButton = { let button = UIButton() button.setImage(UIImage(named: "buttonShareImg"), for: .normal) button.addTarget(self, action: #selector(saveAsImage), for: .touchUpInside) From 4127d92f4d091bb2633b9943b1ec144034a3a088 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Thu, 19 Jan 2023 18:56:03 +0900 Subject: [PATCH 22/24] =?UTF-8?q?refactor:=20=EB=AA=85=ED=95=A8=EC=9D=98?= =?UTF-8?q?=20=ED=99=9C=EC=84=B1=ED=99=94=20=EC=9C=A0=EB=AC=B4=EB=A5=BC=20?= =?UTF-8?q?=EA=B0=80=EC=A7=80=EA=B3=A0=20UI=20=EB=A5=BC=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=ED=95=B4=EC=A3=BC=EB=8A=94=20=ED=95=A8=EC=88=98?= =?UTF-8?q?=EB=A1=9C=20=EB=A6=AC=ED=8E=99=ED=86=A0=EB=A7=81=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CardShareBottomSheetViewController.swift | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index ecfdab2b..e5c059e8 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -143,8 +143,13 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { idLabel.text = cardDataModel?.cardID ?? "" - guard let isActivate else { return } + setCardActivationUI(with: isActivate ?? false) + setupLayout() + setQRImage() + } + + private func setCardActivationUI(with isActivate: Bool) { nearByBackgroundView.backgroundColor = isActivate ? .mainColorNadaMain.withAlphaComponent(0.15) : .card nearByImage.image = isActivate ? UIImage(named: "icnNearbyOn") : UIImage(named: "icnNearbyOff") @@ -156,9 +161,6 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { lottieImage.isHidden = isActivate ? false : true _ = isActivate ? lottieImage.play() : lottieImage.stop() - - setupLayout() - setQRImage() } private func setupLayout() { @@ -361,14 +363,6 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { } @objc func touchSwitch(_ sender: UISwitch) { - nearByBackgroundView.backgroundColor = sender.isOn ? .mainColorNadaMain.withAlphaComponent(0.15) : .card - - nearByImage.image = sender.isOn ? UIImage(named: "icnNearbyOn") : UIImage(named: "icnNearbyOff") - - nearByLabel.text = sender.isOn ? "내 근처의 명함 ON" : "내 근처의 명함 OFF" - nearByLabel.textColor = sender.isOn ? .mainColorNadaMain : .tertiary - - lottieImage.isHidden = sender.isOn ? false : true - _ = sender.isOn ? lottieImage.play() : lottieImage.stop() + setCardActivationUI(with: sender.isOn) } } From 6dafb5fb0863c201f41fc0cf0f9f1ca5b37ea67a Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Fri, 27 Jan 2023 20:31:25 +0900 Subject: [PATCH 23/24] =?UTF-8?q?chore:=20Podfile=20=ED=8A=B9=EC=A0=95=20?= =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EC=98=B5=EC=85=98=20=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Podfile | 4 ++-- Podfile.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Podfile b/Podfile index b1962aa6..135c0f99 100644 --- a/Podfile +++ b/Podfile @@ -6,7 +6,7 @@ target 'NADA-iOS-forRelease' do use_frameworks! # Pods for NADA-iOS-forRelease -pod 'Moya', '~> 14.0' +pod 'Moya' pod 'SkeletonView' pod 'SwiftLint' pod 'VerticalCardSwiper' @@ -14,7 +14,7 @@ pod 'KakaoSDKCommon' pod 'KakaoSDKUser' pod 'KakaoSDKAuth' pod 'IQKeyboardManagerSwift' -pod 'Kingfisher', '~> 7.0' +pod 'Kingfisher' pod 'NVActivityIndicatorView' pod 'Firebase/DynamicLinks' pod 'lottie-ios' diff --git a/Podfile.lock b/Podfile.lock index 175d2123..8090923d 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -31,10 +31,10 @@ PODS: - KakaoSDKUser (2.13.1): - KakaoSDKAuth (= 2.13.1) - Kingfisher (7.5.0) - - lottie-ios (4.0.1) - - Moya (14.0.0): - - Moya/Core (= 14.0.0) - - Moya/Core (14.0.0): + - lottie-ios (4.1.2) + - Moya (15.0.0): + - Moya/Core (= 15.0.0) + - Moya/Core (15.0.0): - Alamofire (~> 5.0) - NVActivityIndicatorView (5.1.1): - NVActivityIndicatorView/Base (= 5.1.1) @@ -50,9 +50,9 @@ DEPENDENCIES: - KakaoSDKAuth - KakaoSDKCommon - KakaoSDKUser - - Kingfisher (~> 7.0) + - Kingfisher - lottie-ios - - Moya (~> 14.0) + - Moya - NVActivityIndicatorView - SkeletonView - SwiftLint @@ -91,14 +91,14 @@ SPEC CHECKSUMS: KakaoSDKCommon: a16807e19984a0a208c3117c7ef117f101a9a128 KakaoSDKUser: 92d34cf6af7b123c22a7ee44424332123e356901 Kingfisher: b9c2a4a4af2990a768445c277359b27bde287d71 - lottie-ios: 54d22edf55b839f0929cabbfe609c9aa548b1145 - Moya: 5b45dacb75adb009f97fde91c204c1e565d31916 + lottie-ios: b3846a9fa8ca1a1a3bebfa256ebe8b6fd4aaaaad + Moya: 138f0573e53411fb3dc17016add0b748dfbd78ee NVActivityIndicatorView: 1f6c5687f1171810aa27a3296814dc2d7dec3667 PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb SkeletonView: 5a050f6411e697abd4cda0a8d767013399dccd69 SwiftLint: 77f7cb2b9bb81ab4a12fcc86448ba3f11afa50c6 VerticalCardSwiper: 68df635b354500f86934ea044ade37a264c044c6 -PODFILE CHECKSUM: 77369aa0dd29c6f58c0bba7ac4391df0cdca3f56 +PODFILE CHECKSUM: c87bc7a537bbc6b538c187e4ea3a7f8dc58e258f COCOAPODS: 1.11.3 From fa042904f46a45ca79eb93f334c75159d93a072e Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Mon, 30 Jan 2023 18:56:34 +0900 Subject: [PATCH 24/24] =?UTF-8?q?chore:=20GoogleService-info.plist=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EC=9D=B4=20=EB=B9=A0=EC=A0=B8=EC=9E=88?= =?UTF-8?q?=EC=96=B4=20=EB=8B=A4=EC=8B=9C=20=EC=B6=94=EA=B0=80=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index a7ec4af0..52f97224 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -123,6 +123,7 @@ F87122762733046300A24E74 /* Card.swift in Sources */ = {isa = PBXBuildFile; fileRef = F87122752733046300A24E74 /* Card.swift */; }; F871227827330A3800A24E74 /* CardCreationRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F871227727330A3800A24E74 /* CardCreationRequest.swift */; }; F8719DDB274F92E90081AD51 /* UITextField+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8719DDA274F92E90081AD51 /* UITextField+Extension.swift */; }; + F88101F92987CBAF007266B5 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = F88101F82987CBAF007266B5 /* GoogleService-Info.plist */; }; F8915A22275728F20013D609 /* SelectBirthBottomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8915A20275728F20013D609 /* SelectBirthBottomViewController.swift */; }; F8915A23275728F20013D609 /* SelectMBTIBottomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8915A21275728F20013D609 /* SelectMBTIBottomViewController.swift */; }; F8A9FE1A2743DC6B00BC60CE /* CardListInGroupRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A9FE192743DC6B00BC60CE /* CardListInGroupRequest.swift */; }; @@ -272,6 +273,7 @@ F87122752733046300A24E74 /* Card.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Card.swift; sourceTree = ""; }; F871227727330A3800A24E74 /* CardCreationRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardCreationRequest.swift; sourceTree = ""; }; F8719DDA274F92E90081AD51 /* UITextField+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+Extension.swift"; sourceTree = ""; }; + F88101F82987CBAF007266B5 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; F8915A20275728F20013D609 /* SelectBirthBottomViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectBirthBottomViewController.swift; sourceTree = ""; }; F8915A21275728F20013D609 /* SelectMBTIBottomViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectMBTIBottomViewController.swift; sourceTree = ""; }; F8A9FE192743DC6B00BC60CE /* CardListInGroupRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CardListInGroupRequest.swift; sourceTree = ""; }; @@ -814,7 +816,7 @@ F8FC439926C01E2B0033E151 /* Resouces */ = { isa = PBXGroup; children = ( - F837AB7C2965582C00A8804A /* GoogleService-Info.plist */, + F88101F82987CBAF007266B5 /* GoogleService-Info.plist */, F857FC8A26C03A5C00A48D01 /* Assets */, 39DA4D7B2747D7060082D572 /* Font */, F8562C94296ADC0A00DA1109 /* Lottie */, @@ -1028,6 +1030,7 @@ files = ( F8518058275D042B006BD5ED /* Onboarding.storyboard in Resources */, F8FC43BF26C025180033E151 /* .swiftlint.yml in Resources */, + F88101F92987CBAF007266B5 /* GoogleService-Info.plist in Resources */, 397B75142763A916004AEB03 /* OpenSourceTableViewCell.xib in Resources */, F85711A7274A6B3400F59F0B /* CardCreationPreview.storyboard in Resources */, 77607EDB274A68BE00204CD2 /* GroupCollectionViewCell.xib in Resources */, @@ -1068,7 +1071,6 @@ F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */, 39369937274A4FCB00684420 /* NotoSansCJKkr-Medium.otf in Resources */, 392F7FB5274621F1008CDBF5 /* MoreListTableViewCell.xib in Resources */, - F837AB7D2965582C00A8804A /* GoogleService-Info.plist in Resources */, 7770315927500C49002CBD19 /* QRScan.storyboard in Resources */, 390515B82706CEBB00C5F7A5 /* Colors.xcassets in Resources */, );