From 89137ee48b75af62b01a45b7a53acaa5c433e645 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Mon, 20 Feb 2023 09:14:37 +0900 Subject: [PATCH 01/13] =?UTF-8?q?chore:=20=EB=AA=85=ED=95=A8=20=EB=A7=8C?= =?UTF-8?q?=EB=93=A4=EA=B8=B0=20=EB=B7=B0=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EC=97=90=EC=85=8B=20=EC=B6=94=EA=B0=80=20(#372)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../icnBasic.imageset/Contents.json | 23 ++++++++++++++++++ .../icnBasic.imageset/icnBasic.png | Bin 0 -> 1446 bytes .../icnBasic.imageset/icnBasic@2x.png | Bin 0 -> 2833 bytes .../icnBasic.imageset/icnBasic@3x.png | Bin 0 -> 4589 bytes .../icnBasicDark.imageset/Contents.json | 23 ++++++++++++++++++ .../icnBasicDark.imageset/icnBasicDark.png | Bin 0 -> 1396 bytes .../icnBasicDark.imageset/icnBasicDark@2x.png | Bin 0 -> 2905 bytes .../icnBasicDark.imageset/icnBasicDark@3x.png | Bin 0 -> 4864 bytes .../icnFan.imageset/Contents.json | 23 ++++++++++++++++++ .../icnFan.imageset/icnFan.png | Bin 0 -> 1442 bytes .../icnFan.imageset/icnFan@2x.png | Bin 0 -> 2896 bytes .../icnFan.imageset/icnFan@3x.png | Bin 0 -> 4285 bytes .../icnFanDark.imageset/Contents.json | 23 ++++++++++++++++++ .../icnFanDark.imageset/icnFanDark.png | Bin 0 -> 2280 bytes .../icnFanDark.imageset/icnFanDark@2x.png | Bin 0 -> 4279 bytes .../icnFanDark.imageset/icnFanDark@3x.png | Bin 0 -> 6735 bytes .../icnOffice.imageset/Contents.json | 23 ++++++++++++++++++ .../icnOffice.imageset/icnOffice.png | Bin 0 -> 966 bytes .../icnOffice.imageset/icnOffice@2x.png | Bin 0 -> 1450 bytes .../icnOffice.imageset/icnOffice@3x.png | Bin 0 -> 2108 bytes .../icnOfficeDark.imageset/Contents.json | 23 ++++++++++++++++++ .../icnOfficeDark.imageset/icnOfficeDark.png | Bin 0 -> 658 bytes .../icnOfficeDark@2x.png | Bin 0 -> 1079 bytes .../icnOfficeDark@3x.png | Bin 0 -> 1427 bytes 24 files changed, 138 insertions(+) create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/Contents.json create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/icnBasic.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/icnBasic@2x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/icnBasic@3x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasicDark.imageset/Contents.json create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasicDark.imageset/icnBasicDark.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasicDark.imageset/icnBasicDark@2x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasicDark.imageset/icnBasicDark@3x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/Contents.json create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/icnFan.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/icnFan@2x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/icnFan@3x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/Contents.json create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/icnFanDark.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/icnFanDark@2x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/icnFanDark@3x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/Contents.json create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/icnOffice.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/icnOffice@2x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/icnOffice@3x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOfficeDark.imageset/Contents.json create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOfficeDark.imageset/icnOfficeDark.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOfficeDark.imageset/icnOfficeDark@2x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOfficeDark.imageset/icnOfficeDark@3x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/Contents.json new file mode 100644 index 00000000..a5243ec0 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "icnBasic.png" + }, + { + "scale" : "2x", + "idiom" : "universal", + "filename" : "icnBasic@2x.png" + }, + { + "scale" : "3x", + "filename" : "icnBasic@3x.png", + "idiom" : "universal" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/icnBasic.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/icnBasic.png new file mode 100644 index 0000000000000000000000000000000000000000..63c639b27213f20ccc00d00244714eaf5a69d071 GIT binary patch literal 1446 zcmV;X1zGxuP)Px#z)(z7MMrQAt-H;wy3POp|E;^ut-8&oq28~$#{B&J;pgtIy3WAL*`=Y~t-H;p zq20W?*#7?h^78Vfq22%g|E;>sD=jhhaAu#J&?ze~^mS{Sn8)Gh@b!Ln?rvl;GdLzF zEY;rVmz2i+@9y=HiTcRIKtWAtXNONuWFaCZa&VRQo|pBxwd!?j{MFL4z|yq8(tCNJ z^{J!C#@~vExO*|Xp#T5?9&}PpQvf?)Ar~ex1PuLleSYuX?U3)kLB#jJho7+D;GwY1 ze62hH00de|L_t(&-tF26bDBUH24E^C90D43GD#){6j6eL2*D#Y$^ZXXT@K}1_CRc= zGrp6KX_N8kx4V41s0?$UQLa>QPe(_&O1&K& zm*;D+3YOJJKT)i%Keo?46R6JxCF?Jwr@Q~y~lR)5M5X*!rEVWn|jL#02Kz<-^C zu&c#lu_`|hvFunQ$tw$E7g5R&B&^ie$kLZMuC;02zwE*7^WjR40~UQL9-&?s_owEmEVHmIwJcU{5LiIrJpI0d+j*+2Yh~(mYOOJB;bcX;t#goKb1Jl4 zILpfvhnOn6F0fPUlaK}FDok^BUt-s!EH8I1VBd!3 z8`dq1vbnAH<+))9YE6Wp$TngN<-&?ZvQeJcCTz}y_hcNa3Stvh^OF7ub|9FFXH`{f z!fLJ;@3%YnK2N~nTu!482`jMltm}H-ZnyK`rwbxh9n!I`_nFRY6l?3b%~+LYn?G#9 zRcjXe#rDvM6^U8*v$PMS@Y;p5hQG0Ac5rm4N13ZVSJdzIC)S@VXR`^&<_KY52w8Vu zqsAj$W&QWqjAHu`myE5gHQ9)^Wj4&ziEW2X*)2*1u2*CodpXHsZ;XcQ8-`sM*?h6^ zVQz&rOYA0JEMS9%?4FKY7TL+BA-l#5@~+6fmsq>$N=B7ynz@$IMzz@;pS#_gb+Phi z8>fZ29aHani?~|9w33f>EdAa5SIipAfEjQ0#XwSr)nl z_)Bo4WMlXK{{9ytjuV+ltw!)(MByz1fBzM^5nP{niURf9hN0EVm*94jk6}cNs5d3* ztWGVRZAfl&0Sx5&q-K1Es#S|F*=>C+r|Bkty4k-75gA=L!8<|)4a=uv6S*2bc{o2= z`BYIUmyqot-f@-(@jFi7iHq)$ literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/icnBasic@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/icnBasic@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..7a11a1787b710a95388807d54378eced496b6006 GIT binary patch literal 2833 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 D_ZYKl literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasicDark.imageset/icnBasicDark@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasicDark.imageset/icnBasicDark@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..eac6ada8732376849491c7f3033451f45ef52529 GIT binary patch literal 4864 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 literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/Contents.json new file mode 100644 index 00000000..198cfbd7 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "icnFan.png", + "scale" : "1x" + }, + { + "scale" : "2x", + "idiom" : "universal", + "filename" : "icnFan@2x.png" + }, + { + "scale" : "3x", + "idiom" : "universal", + "filename" : "icnFan@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/icnFan.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/icnFan.png new file mode 100644 index 0000000000000000000000000000000000000000..46306f4acb9fca8f84c424c36c62176e90051511 GIT binary patch literal 1442 zcmV;T1zq}yP)Px#>QGEnMMrQ#zp$Ci=Zl!fL+MoFx>&P7K}MMg)Qo7kI;>Wr17-{a}tfq!^^i>k5Ii+bjTbLFL} z*0-Ojf^p=3ZsOhD-J7SkMMq9VMof2Yx9@y*K|)CK^77Wx+J9~1|NsB?aArP0Mp9K> zK|@MMNl;BtSA}%sfpFuCdghLQ=9h=)@Z8?V(A`^Bh^D8iwYIoxWtZWbo7kE|IeR}WY&I};K9CFAZhx|w3{st;`%<(0C^&S9g ztkPyX0LHwatf~tYSQD!2n=S*JEmB?Byu+4hPR>2BS*p)e8#tjjLTS}i!APgZ7CjZ1 znPgT`Rm;WoeZpfCnV@1GSeBXZwAG^f&)@mfgeGWJm<3~+ckN~2DnOFN1aU}VD;!mm znV>wtC6NhIvFs?3!M($>iA+!t*XF%U5GRVVD8^~CWoFtt&5&G@6n>RzR_2i794D*d zmSv`@JesV${J%&A3*cjpI%RPSRO8npi8qV#bwCo!99_oTIb?;8N*(}0Io2|#_~;O| z*_8=P<|G~$9gxSG+z_c%9-n*+muR;nQscClj7{-G(PK23U~x-iDtWo)_`HO_?rMZ= zh7cWHba@TCZ)8b}B}6mbH>FQlSag^-QjqpTnbqwS%`4cx6JUa_IqU_G&gS|S2 zvDICls0P@kT4gg!qzb`eEsKQZW3vK`_nSswM9t^fED84Pir3=gL^#(q79L7pPCeFh15Z@Wxn^|*K5ntz>Iw)uHP+o0y0p!xQ!9mizh`fdg10?gO{Yi3x|>6u z<6)Gl;6E{P-WMESd-H0bS-Igo4h_jiC-yx~Sh*)3#(EZR6X|iUxl4=v%e!=6!qlbP zLbs@$Rm2Tf7jBNU$E2#y{cdc^Q4Z;GYY(dXv6OIp73unpfeol8$NLT|OX9k0ZNpVJ z8~d|XQNp|KUh&AKLSRW|wuqQjaIVwi`r?j&o|;-}D|987BuUxq{&0G1?{IQTsw%vu zRI{b+P3Ma=_6vp`ye9Gm-bVMg-Qx;F)19L|rsU4w?H)fd6y3QyJ{5+ZJNNdAB)=FA zxO4kG7t9kw%{{FRy)BBN<$kTyE00gf_ZW4d%BC5Ht-RI-wK_w|wN>~BX*xe}z<%?q w^nTERElDNnDh$ikS^6qm&NO}WkbfzE03j@G?X2dYLjV8(07*qoM6N<$f+C>d_5c6? literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/icnFan@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/icnFan@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..35039a994d9ad16d812b2900fcc6adf5bed46c6e GIT binary patch literal 2896 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 QM<+4TGrRjv$0hlH00(176#xJL literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/Contents.json new file mode 100644 index 00000000..194164a9 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "icnFanDark.png" + }, + { + "filename" : "icnFanDark@2x.png", + "scale" : "2x", + "idiom" : "universal" + }, + { + "filename" : "icnFanDark@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/icnFanDark.imageset/icnFanDark.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/icnFanDark.png new file mode 100644 index 0000000000000000000000000000000000000000..abda44f5cb435d24024a5bccf234272a494f54a2 GIT binary patch literal 2280 zcmVP)Px$hEPmYMICm4g46iRdmaK}bVzmV*D3g#VR-{*{9NBPK0NMt7Ei{}vV&mW2P* z*Wg%Cj(>!fP)dJ8KxlV;k%5Y#Y+f9rT_%1}#wKs{rTOiFh{ zM6|ZPW^R0Haf6b9>uF!ENk(#iZR6eG>Gp7DYjT8+n6ZFv<7se!gK^}BcI9t(i;R5c zhmog?m91uNeSUeqL`P6zXLosdtBQ}gu$P;1b()Kc#+;$8Tw-x}e4eVUxrA0&re0j9 z((Ok8003rmQchE|y$!eo2(|zLw7|O#A^y0=DHJqJx5z#O8UE1z%ftTu--W)N7FuxB zs4b{|*-Igj=k;S((EZ5#_s*=6W&Snta_95m&FI$T_suTHF7E8iD$rkizve@}d2eRkyxlA_`M(5n$KJ7bY$pr` z!vqS0VVo?WI-MCp2lCihq?-K}i^cCW>u3`m0z08|S{yE~*X8hoJ0_M_UGDXr-;$w0v(t&% zkxszj>^R)pTOGFAdRA~z?kPsa<}o`h7Kg)u`jHdaI(}gfO5GR<3mp)8k=yM?{YbF= z4sUm1g{{2g9Wu)o)SEuoSzF&;D)6=o{uPDvmXxL3%JeMk*>n}6-gx?!w+rsVl33;Y zlw;_u!z-N6jtzOI*LOs!niE9N!lo6aR;>fwcv_OM!U-}Ane`r&6hp-cqTb1{w%+Y6 zWw-SV?J3=afq2`~vpT;^d|KqPZCJPAHgHnFD$XtH4Nn!_hIM`04MT<#^)W@6$g;6) zDjSntari2~T}!`v_sYf3RZ63zBAd#Dql^%_#3qYw8^W%tH&*hCfuQG)_xnQ1s#!Lk zW5mJf6Ne5`nbFB=-J4%1dO}C<_sv+B!JHd5;3Zcl_!w0{pbUBgvGF_ zC?gY`O%p0UDN(>EDSOz4Z65MdkFt&1Mig=Hd#XQRZvNVt4> zRx8U!@hqW3*^EKyRSS<`RoZMB)hyRvS_#=$S-E#srOZ|}d;h`5hu=RU^i4WN0IvR!RO^Ez1C(jnQU6^Y=@m~HpOlO&u-#bR!N;H zPcOs1Lcwu!NIhvovds#(-Jz~-4dB?A!o?THst-Sx%e>1UVN<`xl}e@A^aS#qYy%A+?Xk(oKcc`q z4!u!NuJPaq*T4FH>Y4wZ|1(=IOWYZ8jcYX%oM?M74+BjxB)_x?<;k%(!*P##^*uj7 zpD9aR?TLha0i&HM67qP0cK(hhCwpx?kIS-^vcz5P9Uq~_Xrwf0BIrQdv@(+g6DK_t zu-yjvV{ct+=jYR9iThZR?CEoKJ@H4{rj?s#m?%qp^y)qrOg-wKSBVPlTw7A(&ZH%r zXt@$+DIPR468GWfvP>Me#rt^RVkVbZ_GvyYa^=V27Yv4kSlZhA`mx05no4nYKC87j(wg&q+7Z*~>NN>&LM(W0| zv9p35_qhko z{qwJj)BO>$@-9;MM*4A!oQu@j52IzTyS!RE9Py_-gRY?7w8r$T)cx}U)XI%(tm6OX z#qOIIfL0{EVq|RJ{eClh`0LBc%h!{mXZ!hr%KC2ib&4uhaEG9({J6!(zWVuf>h`Ki z*5G4fvDocZ)t~Yhd_JFHa_sD+VR8uS-RG6#i2ne%zn{vu;+pXQ0000NdP)Px$M^H>uMIE+i%{cWc7vYhpPt zHI#z?lY#q@fc2Gv{y;-Zd1}*ydC!)E|JmH+TRJ?OSXYUC*nw~5#KFj9VvCW4-_>Sc zmWK2sCoqR}?1^~lnv3k2itkWWV{3ASMnr08ZhyJE!$3Y`T3~KuX?bd2vUzLEXK#MX z&eycIzsSqe&Cu4dv$}t6o#ZcaCRneusDEij%8@a^#JE z=9Gl!gpH(kew3V!>V1ZsetWrhc%?u_Pm7JhprWl+S75PVUGa8qNV;_{0000}bW%=J zvkwTow*|QX0=2^yzzZH9C&stFG0Qv1)zQwPL{8uR{w-cs{%lx@KIr{#r5@O z)x-7q?e|Um_pN-r*XYaK;e5iKrP7yrnRvLWp`DP6_R;D901mH7L_t(|+U(r>R}#%1 z2k@K^rGe&$J%6{=2 zd!6@Zt~)CV{vS2;h<(I9Vjr=O*hlOm_7VGteZ)RuClecj24ANg8yap?jm5yHYLk*L znk4BHXfyD^jd`aN3u!)?!EF{kGc!ahI$AU_xk9Kjv$Ox;HaiPm30gEM!7}PI(!fi# z(}yM96|5j#SXfwszrdX(r7X7JqRGkiAD}L+;I_21K(&ISMU!HM3I=L6U$57;vn!f* zy0CO?!nv+w*Xw(|-r(xpW|nFNM~fz-!%}PhZKv7kTn?^IsFoxfnkKByT5pnuwd*TO zG}-# z!$(R%lmD?*hgGoZ2sPQsQYkq~BIhgYNGTN5ohpTtCGlv7Wpht;UHAxv5yVZkVJD zq324^l#@e3#x;y**u$ntQ-)))t79aih?!(%C7aEzufrE|uA~>^FZes4!|s`3Vc&Bi zeszo__HEOSg2f%%?;u-&l_jD39%;$e zo1U7KxktjHf}XT&c06P2+uCtzXhN}1X7Fg7f9nm4=N{5&>7kntubf2%-llHudBehR zTvblWb!QzDmn^B{e9cp|1iMY5on`k)Jl~EIpDeB81+&u@m!0;c2GJ6&Ag+Y{tQu`~ z&+7gzA(IF2hc(D{ z9dj4Rxz3DM&VK|Oi?5YwTZ=1otgNE)H7|vH*~8q=pFjTx?e%Lzyru{560xyz;V6Sh zo1_0^N`-RF;yENoxUh&G9Bk#1sZ@G#Iq~u1>1#Szspb4o*tKE_nYU75O&g<*y=gIb zuvqA=F_PFMa* zr*cgpZ75#MJ&h~(bR}V9MdY-F{h*CTmea{fQxI2;mvE!=r*5-#gt zMpG#FphCIP`HyjTmy+FJoyV$aBZ);(g{*n6wsNU7ggfsmx{B60HdaE&y;f);>$nHG zG|tv{6n`S2jN=*PwgEN(g}j&&SIF96byHbfjzoQdO#G?vWI3#o3R&F~RTgoypcRef zvC?QI6tbdC;a(f?XW~M!AwH`v+N2C@j?}R~>{yHB?kqQGl%o@3Tn_i;l!#i^xmUI&DLA z6>lxl(U@RSQ3N)Q1YyN4qF@b`#7n4vpJ7p405;>zO3N7fY(@0)IHd+lwGO&1l3K)M zqellQvDDpM8m!P`$zY5e7BZ4r#BAyjw}eutDPo=1TOG_lW3UAzsEQjRsmT=Gz58&F z4Qt1m-mq&zf)%tA(5Mh=B06G4Xw4J0BqG>|ki!aP*RCGQ;Ql&n9UCqBJAxgdnpww2 zi)5{xL!jD!Shq>|1`Vhx-8&>}ZB^XG##rTWb( zn9a4k*zzCmu@=;D*vdL)h(huf6n?+QV3m25tsxvx5h`$EGlKRz4G(+Pg9=#5(opNG zc0Y73!-rk-TEuJ%z~5tG&$_Evb$!)VYg@-i)}~#+P>eU|cpc2PH&!FC^YIu-S}F<% z7Go>8zbacf2UPoY1(MQb#mun`%g!Uh&VF=;2OIZX#a@G@*tB|H>afK*uw~CZcHZma z37?kYDkgh$$3MHwfi3>=U>TNFv2&~42!$jpDZ24*LyuD-X?DqQlyTaYF!$uweTjH^@ zY{T?!TV#2$qC~odFVCjZjM~4u?nAQQzB6sZ8oTTkTjE$j6}YU5)=#daf;QRM1!#^) z7Z)k^3_kt-HAMRrnq{_}*duux0i%^_!-_Vs3_{!%@rCz93PbUqKE{6g2Gk4qd^a7W z2sZ5+TadP&9kr_30MSMgiDldpiAW?8{cuLKXIM+I7tly4cSK=}vQ8?@tW4`C+W9DW zNsHoVG~dpYro-ZB&9dbz<24R!jN3}Iq}u`)yz{`E_s#o!fxwv=mS#JuV~MrR!o9sUyVnKSd0)W!2^8n)Vu9QGW`A`RYw@YW3U?qgCA2+H<^f&}#{H+2y7u&U?+E%bPQ{x0`E|85qSel7`sTwEK+mE1@D>;4}$SZ$Q*k5sYNW4q7k$(6bZPNnD@-}Cg@Y}o7W&H>gW+8vW|iDG~J zY_)8%eKlIeN*M$8J;v%b!MM?zdw%D^#ynw7qTR8oVoNO3DqWVAv2J*xRjgjIfn8w~ z?}DTFHjvN71%q)tcKka6B?o1!B)i|T(awD^AB)>`EM`yt=$;>Mg7F^M7jR?Eczz*b zJ+i`P6-3d~&btfdx&mPG3AUERpAiwZHZqSru*HxRupc zv4>U;ioqJ^pCRqey+f;}HL2nauU03o9Xfn7+FJX&?br$pYmHl3lPZ>Fb@%bA7RKCui>E#7vorWC*#Ry?ZINLa&ct4M13O8}eGw#83L7cm-M zbDt@=amxB+TSlb__KBWb{0PcYb1C$mZ%ng!%Gk_AyOYtD^y1>8*dm>06na+w$<>4) z(no#lcf_^jO6QNp$MUN%((V$0-GIXyWG1^exS zrj}b}7v~{jHM5mg=UqG?RzurZ9e44NCq#7CDy!oz9u(VA+gSNt5rV~b%vM+YlME%?V_JDjVSeURAcEV2B2|Hm` Z{Q!5E#Ho>pg?In}002ovPDHLkV1k()gv0;< literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/icnFanDark@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/icnFanDark@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..d5b32b9a241f14bfd68f0192e3acf21e114714db GIT binary patch literal 6735 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 literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/Contents.json new file mode 100644 index 00000000..6a302c8c --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "icnOffice.png" + }, + { + "scale" : "2x", + "filename" : "icnOffice@2x.png", + "idiom" : "universal" + }, + { + "idiom" : "universal", + "filename" : "icnOffice@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/icnOffice.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/icnOffice.png new file mode 100644 index 0000000000000000000000000000000000000000..11c12e93658df58a6b40f58ab06a418d85cb51f7 GIT binary patch literal 966 zcmV;%13CPOP)Px#kWfriMMrQ<^4enZ;Cf+;_|(<6@!Dhm|Nml*_hgLt zWQ+Il+hb&o_ww6ft-8(s{qyqLV`Po@|NsB;+h_RgukzYq@!Mjpy3MV+&Sj1H`t;EM z|Nmr;`2YX^|NsB**<@sn`2YX^`0TJ`jrXm(%{^t#|NsB-+GA9G=0t4POmyB|hVX!& z=aj45q_xs(k@WTBiVH4|ga7~lB6LztQviS@BM{?XVSqtEzmRD6%jwpl{a|q4&!0e~ zzrTBc&yc^G=2V>k00O2-L_t(&-tC&}a-$#=fKjm;V>B`MG}(5^VrrUX-~a6vfjZ&{ zk_)lh;p>m~w1ls~IY*i)02YhIVzF2(Kag3}i`Mu1u+H<`dA`;4^W2Be^EnPZ)5syX zab6?t7#ygrXsBH~xj;v=dhO66ttx~r$V6=n zBGoRlJw6^NM`jWNoose|2c)9bC*M>g6&L-X99YDHLicbZzwC&416s;6gW6eBJ54ag zo8Lqm8Pt*o0NG@}l44Gh8QtVEjiai5Dl5hl*RYng$A*=7p>Zu=Zc^9comghUYRF-8 z9~r16($q$PHpjn$6;E`V|E=9IbwK$jn2K6l+vO0UhihGWnORShhIYGs=XvEJ1KJtc zVCSVNWp(tT*M)DvZ8$h1lA0b8)@d|cfE zEXAmHBC}46YIid2&Zrhn!P04VLx?iwO0G>w15Y?{cs7woQ9E)iy*qU?J7+J2-tdIi1CmPz{i37kh&&Z#&z2 oQRURqlyot&|A1hzSpFma0dDCT1fV-ufdBvi07*qoM6N<$f^7}=Bme*a literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/icnOffice@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/icnOffice@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..cb126351b9f08c9f517a3e0273f43e86bc0b335f GIT binary patch literal 1450 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 literal 0 HcmV?d00001 From cd5cdbc98b525cee91b63c416cf2965e158acc41 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Mon, 20 Feb 2023 09:15:02 +0900 Subject: [PATCH 02/13] =?UTF-8?q?chore:=20=EB=AA=85=ED=95=A8=20=EB=A7=8C?= =?UTF-8?q?=EB=93=A4=EA=B8=B0=20=EB=B7=B0=20=EC=BB=AC=EB=9F=AC=20=EC=97=90?= =?UTF-8?q?=EC=85=8B=20=EC=B6=94=EA=B0=80=20(#372)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Contents.json | 38 +++++++++++++++++++ .../Contents.json | 38 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/cardCreationClicked.colorset/Contents.json create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/cardCreationUnclicked.colorset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/cardCreationClicked.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/cardCreationClicked.colorset/Contents.json new file mode 100644 index 00000000..6669b616 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/cardCreationClicked.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "215", + "green" : "209", + "red" : "202" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "55", + "green" : "49", + "red" : "45" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/cardCreationUnclicked.colorset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/cardCreationUnclicked.colorset/Contents.json new file mode 100644 index 00000000..f0f03dfc --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/cardCreationUnclicked.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "239", + "green" : "232", + "red" : "224" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "79", + "green" : "70", + "red" : "64" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} From 24c6a6e75072957acb83d0f058c090bb00a1cab2 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Mon, 20 Feb 2023 09:16:27 +0900 Subject: [PATCH 03/13] =?UTF-8?q?add:=20UIColor+Extension=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20(#372)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 명함 만들기 버튼 배경 색의 평소와 선택시 컬러를 다크모드 대응하여 추가함 --- .../Extensions/UIColor+Extension.swift | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift b/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift index d8ae07f1..edd1c831 100644 --- a/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift +++ b/NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift @@ -162,6 +162,34 @@ extension UIColor { } } + @nonobjc class var cardCreationUnclicked: UIColor { + if #available(iOS 13, *) { + return UIColor { (traitCollection: UITraitCollection) -> UIColor in + if traitCollection.userInterfaceStyle == .light { + return UIColor(red: 224.0 / 255.0, green: 232 / 255.0, blue: 239.0 / 255.0, alpha: 1.0) + } else { + return UIColor(red: 64.0 / 255.0, green: 70 / 255.0, blue: 79 / 255.0, alpha: 1.0) + } + } + } else { + return UIColor(red: 224.0 / 255.0, green: 232 / 255.0, blue: 239.0 / 255.0, alpha: 1.0) + } + } + + @nonobjc class var cardCreationClicked: UIColor { + if #available(iOS 13, *) { + return UIColor { (traitCollection: UITraitCollection) -> UIColor in + if traitCollection.userInterfaceStyle == .light { + return UIColor(red: 202.0 / 255.0, green: 209 / 255.0, blue: 215.0 / 255.0, alpha: 1.0) + } else { + return UIColor(red: 45.0 / 255.0, green: 49 / 255.0, blue: 55 / 255.0, alpha: 1.0) + } + } + } else { + return UIColor(red: 224.0 / 255.0, green: 232 / 255.0, blue: 239.0 / 255.0, alpha: 1.0) + } + } + @nonobjc class var harmonyRed: UIColor { return UIColor(red: 239.0 / 255.0, green: 115.0 / 255.0, blue: 115.0 / 255.0, alpha: 1.0) } From 45644a7764030a11adb655809ef28e7e355678c9 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Mon, 20 Feb 2023 11:55:04 +0900 Subject: [PATCH 04/13] =?UTF-8?q?add:=20CardCreationCategoryViewController?= =?UTF-8?q?=20=EC=83=9D=EC=84=B1=20(#372)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 카드 만들기 뷰 컨트롤러 생성. --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 4 +++ .../CardCreationCategoryViewController.swift | 29 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationCategoryViewController.swift diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 85205a02..58aa580e 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -117,6 +117,7 @@ F8518055275D040C006BD5ED /* OnboardingCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F8518053275D040C006BD5ED /* OnboardingCollectionViewCell.xib */; }; F8518058275D042B006BD5ED /* Onboarding.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F8518057275D042B006BD5ED /* Onboarding.storyboard */; }; F851805B275D047C006BD5ED /* OnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F851805A275D047C006BD5ED /* OnboardingViewController.swift */; }; + F855AEF129A3185000312D20 /* CardCreationCategoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F855AEF029A3185000312D20 /* CardCreationCategoryViewController.swift */; }; F8562C96296ADD1000DA1109 /* nearby.json in Resources */ = {isa = PBXBuildFile; fileRef = F8562C95296ADD1000DA1109 /* nearby.json */; }; F8562C98296ADD6700DA1109 /* Lottie.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8562C97296ADD6700DA1109 /* Lottie.swift */; }; F85711A5274A6B2200F59F0B /* CardCreationPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85711A4274A6B2200F59F0B /* CardCreationPreviewViewController.swift */; }; @@ -274,6 +275,7 @@ F8518053275D040C006BD5ED /* OnboardingCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = OnboardingCollectionViewCell.xib; sourceTree = ""; }; F8518057275D042B006BD5ED /* Onboarding.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Onboarding.storyboard; sourceTree = ""; }; F851805A275D047C006BD5ED /* OnboardingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewController.swift; sourceTree = ""; }; + F855AEF029A3185000312D20 /* CardCreationCategoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardCreationCategoryViewController.swift; sourceTree = ""; }; F8562C95296ADD1000DA1109 /* nearby.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = nearby.json; sourceTree = ""; }; F8562C97296ADD6700DA1109 /* Lottie.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Lottie.swift; sourceTree = ""; }; F85711A4274A6B2200F59F0B /* CardCreationPreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardCreationPreviewViewController.swift; sourceTree = ""; }; @@ -693,6 +695,7 @@ children = ( F84BAF9C26FDB417004CA335 /* CardCreationViewController.swift */, F85711A4274A6B2200F59F0B /* CardCreationPreviewViewController.swift */, + F855AEF029A3185000312D20 /* CardCreationCategoryViewController.swift */, ); path = CardCreation; sourceTree = ""; @@ -1256,6 +1259,7 @@ 39D88B6B274600B100A72164 /* CommonBottomSheetViewController.swift in Sources */, 7734D5B627779EF0004360E4 /* QRCodeView.swift in Sources */, 3918F66727719C4B00984648 /* UserReissueToken.swift in Sources */, + F855AEF129A3185000312D20 /* CardCreationCategoryViewController.swift in Sources */, 7705CF3E2752C7DB005195DF /* CardView.swift in Sources */, F8FC43BA26C022900033E151 /* ViewController.swift in Sources */, 39D13568273FDCB800B1A148 /* UserWithTokenRequest.swift in Sources */, diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationCategoryViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationCategoryViewController.swift new file mode 100644 index 00000000..dc761a97 --- /dev/null +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationCategoryViewController.swift @@ -0,0 +1,29 @@ +// +// CardCreationCategoryViewController.swift +// NADA-iOS-forRelease +// +// Created by kimhyungyu on 2023/02/20. +// + +import UIKit + +class CardCreationCategoryViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} From 1ab488ed37ef9522fa5c5345a8bc6e00f31ad4a9 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 22 Feb 2023 18:59:27 +0900 Subject: [PATCH 05/13] =?UTF-8?q?add:=20CardCreationCategoryViewModel=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20(#372)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 뷰 모델 역할을 할 파일 생성 --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 12 ++++++++++++ .../ViewModels/CardCreationCategoryViewModel.swift | 8 ++++++++ 2 files changed, 20 insertions(+) create mode 100644 NADA-iOS-forRelease/Sources/ViewModels/CardCreationCategoryViewModel.swift diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 58aa580e..cac1ccdf 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -108,6 +108,7 @@ F83206AA26F61E3700D61711 /* FrontCardCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F83206A826F61E3700D61711 /* FrontCardCell.swift */; }; F83206AB26F61E3700D61711 /* FrontCardCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F83206A926F61E3700D61711 /* FrontCardCell.xib */; }; F835EF6F29800F51001ABAAF /* UIApplication+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F835EF6E29800F51001ABAAF /* UIApplication+Extension.swift */; }; + F843DD6D29A5F83000D8D20D /* CardCreationCategoryViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F843DD6C29A5F83000D8D20D /* CardCreationCategoryViewModel.swift */; }; F84BAF9D26FDB417004CA335 /* CardCreationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F84BAF9C26FDB417004CA335 /* CardCreationViewController.swift */; }; F84BAFAD26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F84BAFAB26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift */; }; F84BAFAE26FDB543004CA335 /* FrontCardCreationCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F84BAFAC26FDB543004CA335 /* FrontCardCreationCollectionViewCell.xib */; }; @@ -266,6 +267,7 @@ F83206A826F61E3700D61711 /* FrontCardCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrontCardCell.swift; sourceTree = ""; }; F83206A926F61E3700D61711 /* FrontCardCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FrontCardCell.xib; sourceTree = ""; }; F835EF6E29800F51001ABAAF /* UIApplication+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIApplication+Extension.swift"; sourceTree = ""; }; + F843DD6C29A5F83000D8D20D /* CardCreationCategoryViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardCreationCategoryViewModel.swift; sourceTree = ""; }; F84BAF9C26FDB417004CA335 /* CardCreationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardCreationViewController.swift; sourceTree = ""; }; F84BAFAB26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrontCardCreationCollectionViewCell.swift; sourceTree = ""; }; F84BAFAC26FDB543004CA335 /* FrontCardCreationCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FrontCardCreationCollectionViewCell.xib; sourceTree = ""; }; @@ -668,6 +670,14 @@ path = CardCell; sourceTree = ""; }; + F843DD6B29A5F81700D8D20D /* ViewModels */ = { + isa = PBXGroup; + children = ( + F843DD6C29A5F83000D8D20D /* CardCreationCategoryViewModel.swift */, + ); + path = ViewModels; + sourceTree = ""; + }; F84BAF9E26FDB425004CA335 /* CardCreation */ = { isa = PBXGroup; children = ( @@ -887,6 +897,7 @@ F8C83FB9272F9F030009DF0D /* NetworkModel */, F8FC439E26C01EF70033E151 /* NetworkService */, F8FC439F26C01EFC0033E151 /* Protocols */, + F843DD6B29A5F81700D8D20D /* ViewModels */, F8FC43A026C01F040033E151 /* ViewControllers */, F8FC43A126C01F1F0033E151 /* Views */, ); @@ -1232,6 +1243,7 @@ 770E58862778A78900498C2E /* Status.swift in Sources */, F851805B275D047C006BD5ED /* OnboardingViewController.swift in Sources */, 392BAF7B2793E90D0013DCB3 /* KeyChainKey.swift in Sources */, + F843DD6D29A5F83000D8D20D /* CardCreationCategoryViewModel.swift in Sources */, 39C1E88F270EC762006D2089 /* UIColor+Extension.swift in Sources */, F8C83FC9272FA3190009DF0D /* GroupAPI.swift in Sources */, F8FC43B826C0227D0033E151 /* Const.swift in Sources */, diff --git a/NADA-iOS-forRelease/Sources/ViewModels/CardCreationCategoryViewModel.swift b/NADA-iOS-forRelease/Sources/ViewModels/CardCreationCategoryViewModel.swift new file mode 100644 index 00000000..7ec0fc84 --- /dev/null +++ b/NADA-iOS-forRelease/Sources/ViewModels/CardCreationCategoryViewModel.swift @@ -0,0 +1,8 @@ +// +// CardCreationCategoryViewModel.swift +// NADA-iOS-forRelease +// +// Created by kimhyungyu on 2023/02/22. +// + +import Foundation From 778f1167900ba86b4890699509965ad8d1156c03 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Tue, 7 Mar 2023 22:02:10 +0900 Subject: [PATCH 06/13] =?UTF-8?q?delete:=20deleteTabBar=20notification=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20(#372)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - deleteTabBar 노티를 관찰하지도 않고, 이로 인한 동작이 탭바의 삭제인데 메인에서 푸시되면서 어차피 탭바가 사라지기 때문에 아무런 영향이 없어서 삭제. --- .../Sources/ViewControllers/Main/FrontViewController.swift | 2 -- 1 file changed, 2 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift index 18b6ac1d..5dc1f660 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift @@ -88,8 +88,6 @@ class FrontViewController: UIViewController { // 명함 리스트 뷰로 화면 전환 @IBAction func pushToCardListView(_ sender: Any) { let nextVC = UIStoryboard(name: Const.Storyboard.Name.cardList, bundle: nil).instantiateViewController(identifier: Const.ViewController.Identifier.cardListViewController) - - NotificationCenter.default.post(name: NSNotification.Name("deleteTabBar"), object: nil) self.navigationController?.pushViewController(nextVC, animated: true) } From 663cb61030d9d90d1a7a9952924ec4d80b37b449 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 8 Mar 2023 11:34:01 +0900 Subject: [PATCH 07/13] =?UTF-8?q?feat:=20FrontViewController=20=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=ED=99=94=EB=A9=B4=20=EC=A0=84=ED=99=98=20(#372)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - CardCreationCategoryViewController 로 화면전환. --- .../ViewControllers/Main/FrontViewController.swift | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift index 5dc1f660..02950ed6 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift @@ -77,12 +77,9 @@ class FrontViewController: UIViewController { // MARK: - @IBAction Properties // 명함 생성 뷰로 화면 전환 - @IBAction func presentToCardCreationView(_ sender: Any) { - let nextVC = UIStoryboard(name: Const.Storyboard.Name.cardCreation, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.cardCreationViewController) - let navigationController = UINavigationController(rootViewController: nextVC) - navigationController.modalPresentationStyle = .fullScreen - - self.present(navigationController, animated: true, completion: nil) + @IBAction func presentToCardCreationCategoryViewController(_ sender: Any) { + let nextVC = CardCreationCategoryViewController() + self.navigationController?.pushViewController(nextVC, animated: true) } // 명함 리스트 뷰로 화면 전환 From 58248795dd2ab7492206bcf35afdc9267c1af651 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 8 Mar 2023 11:34:47 +0900 Subject: [PATCH 08/13] =?UTF-8?q?fix:=20Front=20=EC=8A=A4=ED=86=A0?= =?UTF-8?q?=EB=A6=AC=EB=B3=B4=EB=93=9C=EC=97=90=EC=84=9C=20=EC=95=A1?= =?UTF-8?q?=EC=85=98=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD=20(#327)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - FrontViewController 에서 변경한 액션 이름 연결. --- NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard index ffb6b292..1d92e620 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard @@ -48,7 +48,7 @@ - + From 6b74bb2d7d9ed3edc7831db7677c76056409a527 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 8 Mar 2023 11:35:07 +0900 Subject: [PATCH 09/13] =?UTF-8?q?fix:=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EC=97=90=EC=85=8B=20=EB=8B=A4=ED=81=AC=20=EB=AA=A8=EB=93=9C=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20(#327)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../icnBasic.imageset/Contents.json | 51 ++++++++++++++---- .../icnBasicDark.png | Bin .../icnBasicDark@2x.png | Bin .../icnBasicDark@3x.png | Bin .../icnBasicDark.imageset/Contents.json | 23 -------- .../icnFan.imageset/Contents.json | 49 ++++++++++++++--- .../icnFanDark.png | Bin .../icnFanDark@2x.png | Bin .../icnFanDark@3x.png | Bin .../icnFanDark.imageset/Contents.json | 23 -------- .../icnOffice.imageset/Contents.json | 47 +++++++++++++--- .../icnOfficeDark.png | Bin .../icnOfficeDark@2x.png | Bin .../icnOfficeDark@3x.png | Bin .../icnOfficeDark.imageset/Contents.json | 23 -------- 15 files changed, 123 insertions(+), 93 deletions(-) rename NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/{icnBasicDark.imageset => icnBasic.imageset}/icnBasicDark.png (100%) rename NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/{icnBasicDark.imageset => icnBasic.imageset}/icnBasicDark@2x.png (100%) rename NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/{icnBasicDark.imageset => icnBasic.imageset}/icnBasicDark@3x.png (100%) delete mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasicDark.imageset/Contents.json rename NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/{icnFanDark.imageset => icnFan.imageset}/icnFanDark.png (100%) rename NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/{icnFanDark.imageset => icnFan.imageset}/icnFanDark@2x.png (100%) rename NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/{icnFanDark.imageset => icnFan.imageset}/icnFanDark@3x.png (100%) delete mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/Contents.json rename NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/{icnOfficeDark.imageset => icnOffice.imageset}/icnOfficeDark.png (100%) rename NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/{icnOfficeDark.imageset => icnOffice.imageset}/icnOfficeDark@2x.png (100%) rename NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/{icnOfficeDark.imageset => icnOffice.imageset}/icnOfficeDark@3x.png (100%) delete mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOfficeDark.imageset/Contents.json diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/Contents.json index a5243ec0..61c254d8 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/Contents.json @@ -1,23 +1,56 @@ { "images" : [ { + "filename" : "icnBasic.png", "idiom" : "universal", - "scale" : "1x", - "filename" : "icnBasic.png" + "scale" : "1x" }, { - "scale" : "2x", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "icnBasicDark.png", "idiom" : "universal", - "filename" : "icnBasic@2x.png" + "scale" : "1x" + }, + { + "filename" : "icnBasic@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "icnBasicDark@2x.png", + "idiom" : "universal", + "scale" : "2x" }, { - "scale" : "3x", "filename" : "icnBasic@3x.png", - "idiom" : "universal" + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "icnBasicDark@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasicDark.imageset/icnBasicDark.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/icnBasicDark.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasicDark.imageset/icnBasicDark.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/icnBasicDark.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasicDark.imageset/icnBasicDark@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/icnBasicDark@2x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasicDark.imageset/icnBasicDark@2x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/icnBasicDark@2x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasicDark.imageset/icnBasicDark@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/icnBasicDark@3x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasicDark.imageset/icnBasicDark@3x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasic.imageset/icnBasicDark@3x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasicDark.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasicDark.imageset/Contents.json deleted file mode 100644 index e379c566..00000000 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnBasicDark.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "icnBasicDark.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "icnBasicDark@2x.png" - }, - { - "idiom" : "universal", - "filename" : "icnBasicDark@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/Contents.json index 198cfbd7..b2aae938 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/Contents.json @@ -1,23 +1,56 @@ { "images" : [ { - "idiom" : "universal", "filename" : "icnFan.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "icnFanDark.png", + "idiom" : "universal", "scale" : "1x" }, { - "scale" : "2x", + "filename" : "icnFan@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "icnFanDark@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icnFan@3x.png", "idiom" : "universal", - "filename" : "icnFan@2x.png" + "scale" : "3x" }, { - "scale" : "3x", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "icnFanDark@3x.png", "idiom" : "universal", - "filename" : "icnFan@3x.png" + "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/icnFanDark.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/icnFanDark.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/icnFanDark.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/icnFanDark.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/icnFanDark@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/icnFanDark@2x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/icnFanDark@2x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/icnFanDark@2x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/icnFanDark@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/icnFanDark@3x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/icnFanDark@3x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFan.imageset/icnFanDark@3x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/Contents.json deleted file mode 100644 index 194164a9..00000000 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnFanDark.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "icnFanDark.png" - }, - { - "filename" : "icnFanDark@2x.png", - "scale" : "2x", - "idiom" : "universal" - }, - { - "filename" : "icnFanDark@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/icnOffice.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/Contents.json index 6a302c8c..594d8e06 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/Contents.json @@ -1,23 +1,56 @@ { "images" : [ { + "filename" : "icnOffice.png", "idiom" : "universal", - "scale" : "1x", - "filename" : "icnOffice.png" + "scale" : "1x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "icnOfficeDark.png", + "idiom" : "universal", + "scale" : "1x" }, { - "scale" : "2x", "filename" : "icnOffice@2x.png", - "idiom" : "universal" + "idiom" : "universal", + "scale" : "2x" }, { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "icnOfficeDark@2x.png", "idiom" : "universal", + "scale" : "2x" + }, + { "filename" : "icnOffice@3x.png", + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "icnOfficeDark@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOfficeDark.imageset/icnOfficeDark.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/icnOfficeDark.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOfficeDark.imageset/icnOfficeDark.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/icnOfficeDark.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOfficeDark.imageset/icnOfficeDark@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/icnOfficeDark@2x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOfficeDark.imageset/icnOfficeDark@2x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/icnOfficeDark@2x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOfficeDark.imageset/icnOfficeDark@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/icnOfficeDark@3x.png similarity index 100% rename from NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOfficeDark.imageset/icnOfficeDark@3x.png rename to NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOffice.imageset/icnOfficeDark@3x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOfficeDark.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOfficeDark.imageset/Contents.json deleted file mode 100644 index 7d064681..00000000 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnOfficeDark.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "scale" : "1x", - "idiom" : "universal", - "filename" : "icnOfficeDark.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "icnOfficeDark@2x.png" - }, - { - "idiom" : "universal", - "filename" : "icnOfficeDark@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file From 5a352ad6d7b093417b60d7c7b961772b9d7a2d6f Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 8 Mar 2023 11:36:13 +0900 Subject: [PATCH 10/13] =?UTF-8?q?move:=20CardCreation=20=ED=8F=B4=EB=8D=94?= =?UTF-8?q?=20=EB=82=B4=EC=97=90=20VC,=20ViewModel=20=EC=83=9D=EC=84=B1=20?= =?UTF-8?q?=EB=B0=8F=20=ED=8C=8C=EC=9D=BC=20=EC=9D=B4=EB=8F=99=20(#327)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 34 +++++++++++-------- .../CardCreationCategoryViewController.swift | 29 ---------------- .../CardCreationPreviewViewController.swift | 0 .../{ => VC}/CardCreationViewController.swift | 0 .../CardCreationCategoryViewModel.swift | 8 ----- 5 files changed, 20 insertions(+), 51 deletions(-) delete mode 100644 NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationCategoryViewController.swift rename NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/{ => VC}/CardCreationPreviewViewController.swift (100%) rename NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/{ => VC}/CardCreationViewController.swift (100%) delete mode 100644 NADA-iOS-forRelease/Sources/ViewModels/CardCreationCategoryViewModel.swift diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 32581eed..c3e3ec82 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -792,14 +792,6 @@ path = Widgets; sourceTree = ""; }; - F843DD6B29A5F81700D8D20D /* ViewModels */ = { - isa = PBXGroup; - children = ( - F843DD6C29A5F83000D8D20D /* CardCreationCategoryViewModel.swift */, - ); - path = ViewModels; - sourceTree = ""; - }; F84BAF9E26FDB425004CA335 /* CardCreation */ = { isa = PBXGroup; children = ( @@ -825,9 +817,8 @@ F84BAFB326FDB8AA004CA335 /* CardCreation */ = { isa = PBXGroup; children = ( - F84BAF9C26FDB417004CA335 /* CardCreationViewController.swift */, - F85711A4274A6B2200F59F0B /* CardCreationPreviewViewController.swift */, - F855AEF029A3185000312D20 /* CardCreationCategoryViewController.swift */, + F885C8A929B827120079FA35 /* ViewModel */, + F885C8A829B827030079FA35 /* VC */, ); path = CardCreation; sourceTree = ""; @@ -945,6 +936,24 @@ path = WidgetsBundle; sourceTree = ""; }; + F885C8A829B827030079FA35 /* VC */ = { + isa = PBXGroup; + children = ( + F84BAF9C26FDB417004CA335 /* CardCreationViewController.swift */, + F85711A4274A6B2200F59F0B /* CardCreationPreviewViewController.swift */, + F855AEF029A3185000312D20 /* CardCreationCategoryViewController.swift */, + ); + path = VC; + sourceTree = ""; + }; + F885C8A929B827120079FA35 /* ViewModel */ = { + isa = PBXGroup; + children = ( + F843DD6C29A5F83000D8D20D /* CardCreationCategoryViewModel.swift */, + ); + path = ViewModel; + sourceTree = ""; + }; F8915A1F275713A10013D609 /* CardCreation */ = { isa = PBXGroup; children = ( @@ -1075,7 +1084,6 @@ F8C83FB9272F9F030009DF0D /* NetworkModel */, F8FC439E26C01EF70033E151 /* NetworkService */, F8FC439F26C01EFC0033E151 /* Protocols */, - F843DD6B29A5F81700D8D20D /* ViewModels */, F8FC43A026C01F040033E151 /* ViewControllers */, F8FC43A126C01F1F0033E151 /* Views */, ); @@ -2060,7 +2068,6 @@ isa = XCConfigurationList; buildConfigurations = ( F8FC439426C01CDE0033E151 /* Debug */, - 77B4E7402990DFB7006098DC /* Beta */, F8FC439526C01CDE0033E151 /* Release */, ); defaultConfigurationIsVisible = 0; @@ -2070,7 +2077,6 @@ isa = XCConfigurationList; buildConfigurations = ( F8FC439726C01CDE0033E151 /* Debug */, - 77B4E7412990DFB7006098DC /* Beta */, F8FC439826C01CDE0033E151 /* Release */, ); defaultConfigurationIsVisible = 0; diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationCategoryViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationCategoryViewController.swift deleted file mode 100644 index dc761a97..00000000 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationCategoryViewController.swift +++ /dev/null @@ -1,29 +0,0 @@ -// -// CardCreationCategoryViewController.swift -// NADA-iOS-forRelease -// -// Created by kimhyungyu on 2023/02/20. -// - -import UIKit - -class CardCreationCategoryViewController: UIViewController { - - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - } - - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destination. - // Pass the selected object to the new view controller. - } - */ - -} diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationPreviewViewController.swift similarity index 100% rename from NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift rename to NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationPreviewViewController.swift diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationViewController.swift similarity index 100% rename from NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift rename to NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationViewController.swift diff --git a/NADA-iOS-forRelease/Sources/ViewModels/CardCreationCategoryViewModel.swift b/NADA-iOS-forRelease/Sources/ViewModels/CardCreationCategoryViewModel.swift deleted file mode 100644 index 7ec0fc84..00000000 --- a/NADA-iOS-forRelease/Sources/ViewModels/CardCreationCategoryViewModel.swift +++ /dev/null @@ -1,8 +0,0 @@ -// -// CardCreationCategoryViewModel.swift -// NADA-iOS-forRelease -// -// Created by kimhyungyu on 2023/02/22. -// - -import Foundation From 688115cf24250e94fdc4859768839965515cbafd Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 8 Mar 2023 11:36:38 +0900 Subject: [PATCH 11/13] =?UTF-8?q?add:=20CardCreationCategoryViewModel=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(#327)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewModel/CardCreationCategoryViewModel.swift | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/ViewModel/CardCreationCategoryViewModel.swift diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/ViewModel/CardCreationCategoryViewModel.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/ViewModel/CardCreationCategoryViewModel.swift new file mode 100644 index 00000000..7ec0fc84 --- /dev/null +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/ViewModel/CardCreationCategoryViewModel.swift @@ -0,0 +1,8 @@ +// +// CardCreationCategoryViewModel.swift +// NADA-iOS-forRelease +// +// Created by kimhyungyu on 2023/02/22. +// + +import Foundation From 180d8cccbcdbe843b786a0f91b036e3fea8514e2 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 8 Mar 2023 11:37:18 +0900 Subject: [PATCH 12/13] =?UTF-8?q?add:=20CardCreationCategoryViewController?= =?UTF-8?q?=20=EC=83=9D=EC=84=B1=20(#327)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 생성 및 UI Components 추가 --- .../CardCreationCategoryViewController.swift | 151 ++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationCategoryViewController.swift diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationCategoryViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationCategoryViewController.swift new file mode 100644 index 00000000..df816eba --- /dev/null +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationCategoryViewController.swift @@ -0,0 +1,151 @@ +// +// CardCreationCategoryViewController.swift +// NADA-iOS-forRelease +// +// Created by kimhyungyu on 2023/02/20. +// + +import SnapKit + +import UIKit + +class CardCreationCategoryViewController: UIViewController { + + // MARK: - Components + + private let navigationBarView: UIView = { + let view = UIView() + view.backgroundColor = .white + + return view + }() + + private let backButton: UIButton = { + let button = UIButton() + button.setImage(UIImage(named: "iconArrow"), for: .normal) + + return button + }() + + private let titleLabel: UILabel = { + let label = UILabel() + label.text = "명함 만들기" + label.textColor = .primary + label.font = .title02 + + return label + }() + + private let basicBackgroundView: UIView = { + let view = UIView() + view.backgroundColor = .cardCreationUnclicked + view.layer.cornerRadius = 15 + + return view + }() + + private let basicTextlabel: UILabel = { + let label = UILabel() + label.text = "기본" + label.textColor = .primary + label.font = .title02 + + return label + }() + + private let basicImageView: UIImageView = { + let imageView = UIImageView() + imageView.image = UIImage(named: "icnBasic") + + return imageView + }() + + private let jobBackgroundView: UIView = { + let view = UIView() + view.backgroundColor = .cardCreationUnclicked + view.layer.cornerRadius = 15 + + return view + }() + + private let jobTextlabel: UILabel = { + let label = UILabel() + label.text = "직장" + label.textColor = .primary + label.font = .title02 + + return label + }() + + private let jobImageView: UIImageView = { + let imageView = UIImageView() + imageView.image = UIImage(named: "icnOffice") + + return imageView + }() + + private let diggingBackgroundView: UIView = { + let view = UIView() + view.backgroundColor = .cardCreationUnclicked + view.layer.cornerRadius = 15 + + return view + }() + + private let diggingTextlabel: UILabel = { + let label = UILabel() + label.text = "덕질" + label.textColor = .primary + label.font = .title02 + + return label + }() + + private let diggingImageView: UIImageView = { + let imageView = UIImageView() + imageView.image = UIImage(named: "icnFan") + + return imageView + }() + + private let checkMarkImageView: UIImageView = { + let imageView = UIImageView() + imageView.image = UIImage(named: "iconDone") + + return imageView + }() + + private let contentTextlabel: UILabel = { + let label = UILabel() + label.text = """ + "다크모드를 켜고 아이콘의 재미있는 포인트를 찾아보세요👀 + (더보기 > 다크모드 스위치 활성화) + """ + label.textColor = .mainColorButtonText + label.font = .textRegular05 + + return label + }() + + // MARK: - View Life Cycle + + override func viewDidLoad() { + super.viewDidLoad() + + setUI() + setLayout() + } +} + +// MARK: - Extension + +extension CardCreationCategoryViewController { + private func setUI() { + + + } + + private func setLayout() { + + } +} From 80379e9754b2ff4087037fff8cb71d42143b8600 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 8 Mar 2023 14:19:33 +0900 Subject: [PATCH 13/13] =?UTF-8?q?feat:=20CardCreationCategoryViewControlle?= =?UTF-8?q?r=20=EA=B5=AC=ED=98=84=20(#327)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - UI 와 layout 구현 --- .../CardCreationCategoryViewController.swift | 95 ++++++++++++++++++- 1 file changed, 90 insertions(+), 5 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationCategoryViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationCategoryViewController.swift index df816eba..b67c00fc 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationCategoryViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationCategoryViewController.swift @@ -118,9 +118,10 @@ class CardCreationCategoryViewController: UIViewController { private let contentTextlabel: UILabel = { let label = UILabel() label.text = """ - "다크모드를 켜고 아이콘의 재미있는 포인트를 찾아보세요👀 + 다크모드를 켜고 아이콘의 재미있는 포인트를 찾아보세요👀 (더보기 > 다크모드 스위치 활성화) """ + label.numberOfLines = 2 label.textColor = .mainColorButtonText label.font = .textRegular05 @@ -141,11 +142,95 @@ class CardCreationCategoryViewController: UIViewController { extension CardCreationCategoryViewController { private func setUI() { - - + view.backgroundColor = .white } - +} + +// MARK: - Layout + +extension CardCreationCategoryViewController { private func setLayout() { - + view.addSubviews([navigationBarView, basicBackgroundView, jobBackgroundView, diggingBackgroundView, checkMarkImageView, contentTextlabel]) + navigationBarView.addSubviews([backButton, titleLabel]) + basicBackgroundView.addSubviews([basicTextlabel, basicImageView]) + jobBackgroundView.addSubviews([jobTextlabel, jobImageView]) + diggingBackgroundView.addSubviews([diggingTextlabel, diggingImageView]) + + navigationBarView.snp.makeConstraints { make in + make.leading.trailing.equalToSuperview() + make.top.equalTo(view.safeAreaLayoutGuide) + make.height.equalTo(50) + } + + backButton.snp.makeConstraints { make in + make.centerY.equalToSuperview() + make.leading.equalToSuperview().inset(24) + make.height.width.equalTo(24) + } + + titleLabel.snp.makeConstraints { make in + make.centerY.centerX.equalToSuperview() + } + + basicBackgroundView.snp.makeConstraints { make in + make.bottom.equalTo(view.snp.centerY).offset(-63) + make.leading.trailing.equalToSuperview().inset(24) + make.height.equalTo(basicBackgroundView.snp.width).multipliedBy(117.0 / 327.0) + } + + basicTextlabel.snp.makeConstraints { make in + make.leading.equalToSuperview().inset(18) + make.bottom.equalToSuperview().inset(14) + } + + basicImageView.snp.makeConstraints { make in + make.trailing.equalToSuperview().inset(24) + make.top.equalToSuperview().inset(11) + make.bottom.equalToSuperview().inset(9) + } + + jobBackgroundView.snp.makeConstraints { make in + make.top.equalTo(basicBackgroundView.snp.bottom).offset(12) + make.leading.trailing.equalToSuperview().inset(24) + make.height.equalTo(basicBackgroundView.snp.width).multipliedBy(117.0 / 327.0) + } + + jobTextlabel.snp.makeConstraints { make in + make.leading.equalToSuperview().inset(18) + make.bottom.equalToSuperview().inset(14) + } + + jobImageView.snp.makeConstraints { make in + make.trailing.equalToSuperview().inset(24) + make.top.equalToSuperview().inset(11) + make.bottom.equalToSuperview().inset(9) + } + + diggingBackgroundView.snp.makeConstraints { make in + make.top.equalTo(jobBackgroundView.snp.bottom).offset(12) + make.leading.trailing.equalToSuperview().inset(24) + make.height.equalTo(basicBackgroundView.snp.width).multipliedBy(117.0 / 327.0) + } + + diggingTextlabel.snp.makeConstraints { make in + make.leading.equalToSuperview().inset(18) + make.bottom.equalToSuperview().inset(14) + } + + diggingImageView.snp.makeConstraints { make in + make.trailing.equalToSuperview().inset(24) + make.top.equalToSuperview().inset(11) + make.bottom.equalToSuperview().inset(9) + } + + checkMarkImageView.snp.makeConstraints { make in + make.top.equalTo(diggingBackgroundView.snp.bottom).offset(10) + make.leading.equalToSuperview().inset(24) + } + + contentTextlabel.snp.makeConstraints { make in + make.leading.equalTo(checkMarkImageView.snp.trailing).offset(5) + make.top.equalTo(checkMarkImageView).offset(3) + } } }