From 9aebc4d1ee0642fdc8d136b64418ecd57bb912c7 Mon Sep 17 00:00:00 2001 From: ChoiysApple Date: Thu, 4 Aug 2022 10:52:45 +0900 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=EB=8B=A4=EB=A5=B8=20=EC=9C=A0?= =?UTF-8?q?=EC=A0=80=EC=9D=98=20=EC=A7=81=EC=97=85/=EA=B4=80=EC=8B=AC?= =?UTF-8?q?=EC=82=AC=EA=B0=80=20=EB=B3=B4=EC=9D=B4=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8A=94=20=EC=9D=B4=EC=8A=88=20#183=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProfileScene/Profile/ViewModel/ProfileViewModel.swift | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Weekand/Weekand/Presentation/ProfileScene/Profile/ViewModel/ProfileViewModel.swift b/Weekand/Weekand/Presentation/ProfileScene/Profile/ViewModel/ProfileViewModel.swift index d3ce58d1..9281ea83 100644 --- a/Weekand/Weekand/Presentation/ProfileScene/Profile/ViewModel/ProfileViewModel.swift +++ b/Weekand/Weekand/Presentation/ProfileScene/Profile/ViewModel/ProfileViewModel.swift @@ -21,7 +21,7 @@ class ProfileViewModel: ViewModelType { private let profileUseCase: ProfileUseCase private let disposeBag = DisposeBag() - var userDeatil = BehaviorRelay(value: UserDetail.defaultData) + var userDeatil = PublishRelay() var buttonState = BehaviorRelay(value: ProfileButtonType.edit) var errorMessage = BehaviorRelay(value: nil) @@ -169,6 +169,7 @@ extension ProfileViewModel { }, onFailure: { error in print("\(#function) Error: \(error)") self.errorMessage.accept("\(error)") + self.userDeatil.accept(UserDetail.defaultData) }, onDisposed: nil) .disposed(by: disposeBag) } @@ -177,7 +178,7 @@ extension ProfileViewModel { private func followUser(id: String) { self.profileUseCase.createFollowee(id: id).subscribe(onSuccess: { _ in - BehaviorRelay.just(.following).bind(to: self.buttonState).disposed(by: self.disposeBag) + self.buttonState.accept(.following) }, onFailure: { error in print("\(#function) Error: \(error)") self.errorMessage.accept("\(error)") @@ -190,7 +191,7 @@ extension ProfileViewModel { private func unfollowUser(id: String) { self.profileUseCase.deleteFollowee(id: id).subscribe(onSuccess: { _ in - BehaviorRelay.just(.follow).bind(to: self.buttonState).disposed(by: self.disposeBag) + self.buttonState.accept(.follow) }, onFailure: { error in print("\(#function) Error: \(error)") From 4d5419cbc544384e14fa3a1afc4ebda039f6bf5e Mon Sep 17 00:00:00 2001 From: ChoiysApple Date: Thu, 4 Aug 2022 11:28:27 +0900 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20radioButton=20=EA=B7=B8=EB=A6=BC?= =?UTF-8?q?=EC=9E=90=20=EB=AC=B8=EC=A0=9C=20#185=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../radio.disabled.imageset/Contents.json | 4 ++-- .../radio.disabled.imageset/radio_disabled.png | Bin 1502 -> 926 bytes .../radio_disabled2x.png | Bin 4331 -> 0 bytes .../radio_disabled3x.png | Bin 8211 -> 0 bytes .../radio_disabled@2x.png | Bin 0 -> 666 bytes .../radio_disabled@3x.png | Bin 0 -> 362 bytes 6 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled2x.png delete mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled3x.png create mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled@2x.png create mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled@3x.png diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/Contents.json b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/Contents.json index c4aba994..e2fc2492 100644 --- a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/Contents.json +++ b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/Contents.json @@ -6,12 +6,12 @@ "scale" : "1x" }, { - "filename" : "radio_disabled2x.png", + "filename" : "radio_disabled@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "radio_disabled3x.png", + "filename" : "radio_disabled@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled.png index dd6b54102dd98f37e10343002af030d2402e220f..1253acf09987a7104fd70237fef32531c637c3be 100644 GIT binary patch delta 910 zcmV;919AM`3!VoyiBL{Q4GJ0x0000DNk~Le0000;0000;2nGNE09Ea?M*si-32;bR za{vG#H~;`4H~~eLF<_B4AAbWgNklAmhmv>(Kj096v8>b6-ASg70y3FQCX=zsJ1oy- zZLYD4+BVIYbUt^i?N9Ufv9^cW_RZMY;RU# zYqlA(k6R>wpugjX+De=RowC28`L4bvLa-8oevW!49pY2;-2VY9h$IL*w^S{-M!5DZ zE>bA1mJV$}_=I_%rhlY&Z$brmhxOQD<-&axaG=Ecl+b;gE$sz*u9rxM5_)YE%)nQq znN|!f-6}-p3-l{Qs%RGzhlm`oaJWW7z{^6kC~{b#;6=pyIBOJDu$Nk0SgK8qA^}%_ z3p+UQONq#7b_pJq0()r3Gk+@0*uBp^?7}jF&S$?@ zzHCFrzr!xf_fKpCO`s2C+;Rjxknsz)fhLfU@t?2@6NqJtDiAANN7#iuwx&f|dp7?( zVjBw#Ixa1OGROi2$pQt?1Uiy&fn9`*AK3<)K!Yp30fdaxrYudMM>4*FU4)F&d%H0a zWLY5QJG+5Y1%KL;@sF?z^L^CMr|8oIDy9vPl$*EKMRX>ZjFGY)+{x& zQg)U^%WVg(6YdT(AkZ7AZjcV%7v|?L%vct*PKi`R(tpJ9w#Ce>-YBUMYA{{IH(!uL zZNLXC-v%7==?4}>kWM3cpG7oJNVMC&jixQ)~ydch}nGP+l+xz8uQW02Ua&9O@rV1v#l3*aB%RsPp$Z$^J$Z=ndy{nva@qF!ET+ zp?{r-B~OflK^*2?s|@RRC)ae9ET k$Cf36eRR91007*qoM6N<$f>%?hT>t<8 delta 1491 zcmV;^1uXiW2i^-diBL{Q4GJ0x0000DNk~Le0000S0000U2nGNE06)ckp8x;=32;bR za{vGf6951U69E94oEVWdAAbdNNklz0 z3vuJ7EO6N_42cU8OWYY2MiHW zJ2UtCdxrPIfD~KZdXtm)-uL4?=bZOB=UmJB|2cTNkhhSpkqsm;vVURb?jUv$1h(}b zA1RnZ_F6z5Cjy`P*P!O${T78kJB~9QjYe;zQmGyZb7Pv*TFbusPX(&Yv$L}fuOAo% zIpkgwoe0eU3aR{Xne$H9(fJL53AK` zj3>gn8*Z)DYR!@PhJWXI)kq|g;oO(ZrI9z-`>}1?L92e}B-rTasLP@E%+!Y{`wg&E zGMP-U9%oK~5hFx68Uw72F$LhJ&X}|Bo3J~l0t#$wY%H?8yeyJjMjin61>PnFf;Y0X zfyHH{#P>em61nNi0DxnRU+FB;Su7S`H-`NU5FNI&xVWeTw||-oj`JNx!~}%(H32Y} zM`;013fyT`qjc=z#f$F5#6;v6Ad0O_CgXN>bw&BSYBoRAx{y#@ zMDm0-+uhxr-QVBOo;!Cg4`K4>&z~1)k^TF%gG;r2-~ZL^q- z_LLs1J!7uykx8R48iyfGAU#TC#vhEryRwe4V`O9`dRFz2r&6fU>I_l2YYh64d%mLd z&~*r_8P|b<0h@aYnY3)i+j!^q^z`^MGc*3l1a5s4V(v89-Q5*P1Jc|!^FLvXiiK0D zR79GltA92YM3qBqOt9%s##gO_5|$%OzYww-Df3uBJ?rc14j#r}<(nv;Wa3g=PjUbx8~7lfDG?gM}NipGm{!uRov6*bhj|fK1=bB=)!qb zM;Ov(S;zaQ)=^$AS_h5xS_ou1#T~QO+=ro`sD()f73g`RGksWX6jJk{#P3rGc)zYZ zl(#6D;d|5i=LVc(@4F^KGFXN+!wD&m65klBQ8}1|*6nnQG=?-|t{Q2|)-A~N3UkBA zC4X~HhO7bffVFRUSFXmWIzD+_frz=z&dyRcn=PZSCZ-?uHsb3qEG&3*i%LgFN0gLs zIH2|;U=`)>8NWrjC+h1yMS12#`xuEISK*eCFuO*$E3m(c1K#-fcq2@!LlT7TX?1lq zv9q(2B(&|!B}~V#QRZ_eb>7vAeAWX%WPg;aE@2&15;bLyu}og8;Fr-=F;&WH_0TdF zNSW8$+Z$|eZ#TcW11V8|k~gXrKJQ|zZwz+K9X6P+;@LiVS1y%GW$w& z>i(|rDvGigYa&*dkJ{G2BOg-KF|J0HsnT#g>ZU4_?%6t763_abYbvGxx%qrP0uiFr zN*5wDqf#gov>rgP21N4r_V#L_=hlff_N0J^dkBk-#m?5&mLqUVSRm0NL<;))`h4B{ t{QUfxMgFOuFqGC2S&sdCKFJU8UliVG_RKHk!zus(002ovPDHLkV1gMs+0Os~ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled2x.png deleted file mode 100644 index 7580bd0b0276c64a7f38f639ee55d0b7dc849bac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4331 zcmV+qBSmy62od`2DQ?Tc`V+dvAMhTLu$WvarhX80$@B7@9No+I{{R;aOMd9App$!4Ye9VnZ;K?|SH|u(j z<_gV$$&)8fV~!g)Za{y3E=iKRbp5gB{!4u4(T5*?IDS7t#t^CNt`P|Ovk1RK*Xa`{ zPMpP@Fk!+Rrk?d)XKT)yG-=WdG2@;~0NpiZ$`s7ty>p5|YH)J|aHljM2mmxcrnwMl zRpug_1Fp2Ok894?oHu^___<=nOx@pW-x>lE8jOxnkJ@M!g^!{pQ4~F@+go~;9H`gp zch+jPLs^#f2|zqJI2iZ!^`TmEv)S~E8jXftkG!twH)qdt-RBzF`Sa)N{r&wvPt){o z?RNWT`fWjFk6YM#{rdG^*EjR?i1(k??|IlpYtjH#+ofXEY^{4z&puh*Osf1%G2<}-Ew*mmdRd^O z5jVs}+IX=D|BWlvDvSe?+81SWM*yVX6J2Wn6Hov`cq~E#gPcGX2DXsIoK!Q{?*$Wp zdMDL8neH>)_v`-Gu3M6)#L!QiJ$v@J%q8EnX%kwNUyAr)M@8S0<;#~t{6jt9P7BBAThkwK_oc91}?NEY<{EhhYL2OC1vdV@-|sz%M|3y7o0neMagDG7Q)0QcsbZ!Qvm*Smg<X_Lc z!BKSfv^9mh$mGaWH@D}gtMImRG4U>`<%8AzwfEd*%a$FJ2QId6-_AZoX-VB9>3v`} z7w_1ygFkEUyz@>Zd-#s)b}R?A?m;A`-@ICiIHcr>m6O3~pf;U}T}dboXQKN|3<`iz zPo8@lmAV6ztCOQj^nIT1(si{fJ+3nbwZwow?b@{qf{V3l*A|aF^2iW?(Qp8@&^w1M zTec)`yzvGA{-wDvtPyb!h@fBU7M+WO^Kd39Z4O7Vrz||fPVkx{Dl*WKevgAgLIe1g z*(>)2lGNYcE(LI<<}(#iPtBb>ci!Q{hy7l9KlOlmoKCF=oCBPs7r*`X+X=2-oV-mR zURaf$Z09AZPTdFz;BX4L5!6OXB0iHe*)Y?$3f)I~*AsB!#EBS{(!{=@1EBSw1@^a> zs`g4uirC_0`+dsMqepKS$n65jcQ}%UIGZkjro-5s-$X>!^wHaT-q~pz!fhA4pZ?Cy zojaFdHvmE<1t!yj zN3-m+imLu7fB=JGg`L$MDaJh#jHJuaYp=Z)Y4b$Jjf6ha1Cac!h8L_zF2&;kPS>WS zenE3kL=TF9K>-*PIDm7qH%0IuQx2k~HBEtOO6>;)wux6U@0r3h&D_+M{r=rU%guZC z>`7LvSb?XHbS?(-a>D`i&gIORGtt1nK!n-|AZj?J`hvh5=4vkA696%ytF3n=puyJE zsZ*OeDm)-SpFDZ8HGlqm4{ptxH7!ZA$usRWxOC~#=FFKhVFEx0wFZnW?Zf+=mATH! zV9WpL1qicWef8BuDqq{YdGipTQmaVM+n>%92S-FeEUv?Vs{P^Zj#Lg-oJZR@-jv$4 zB#HFk!GrDDvu9@lnh9vJaN$C~UUr=eXrh_non=ErIT7lK?MiEMQ{51upq_QK1y$9z z&WY(&a;9iKXJ{%WMF@wpk?=6k*pVRMcJJO@NP3Al5=*~p;v6bE*>#Kgj4M4Lb_TQC z0_DL;E!)}zNwua=pWfEDQhDKY-MV!d6DM%fO*f^Q{_K(|v{$ZNnX-1;v}wH876^aU zH@ze|4qSPjavq-T5zu77NEpeXLxhu~?D4SBnk%_jTz?{5f9 zpP1Zlv29;;{xYZt?Je6Z)YI!dU#I4t&F(z`0?X-O=pv!ux#yO~GXL;7CL1I`GyS}QlcQh=$jldsc7)QH_Q;@=k~l#L>0?sV|nCg#*7)90{;AT zRqaGo^aE1smwMtgXSp(hU!wV2*PVDiB!J6xy+Lz6Nvgdw&Xos$?5=!36m*QUZ_Y#o zb-iAD-Y8A^S`RIMmzTc5)_6LkLH%F}C5|}Q0kNlCxK~#ZO+4unRyXwQ0hpH_?pvGs zb5J&vOA5|i464UGpoJ7Dd|y)Gh~S=Qg|zGT>U!<{3gMp7+{yNd#Ee<~^yj09)*U!- zAZ!#7aoD0)dg!=AD${Ws!M+H=@QzmlkZ*~WLa9(e_$B8-h!@U4#;Tt6uUImjh!K(O zFj}x+f#ZFtyVsYPZNDP(=DvhPkJvvqdX4wnaj?7c{5H z`xZp=qdE6RG5kS|KX7Fn{DSKa7Y|8#KO`B3w!jxtWL z)|H9wzwU-8A_Cz-*CfstJrfT!9LTKP1PG^gV*aiADVTYBvWZrn>C%1 z9qL6i!XJu7vBR`ygOFKA0{&H9_w>+6X!V4mi2t~<0zPU<+IhQHx4+Z;uDjR?4uie! z4rLNorcYkGOw&@czdRff!6C$zO~}tUe|RCAGiQ#ktB6CsvgIz;D{%nl^zjY4e|8vp z2Q;77yL&aC(*5V%#TIrLQ*GTw&BwIvxXk1Cu55Ytj%T&k7j!*qwbbxDw;;Sty+?GX z<_tTKJkXwxCDP&gzJ2=|5_vle2lP&MhQ6~Iq5oA_5kO*YdcQMnfySW z9Y;exNTJJ_7PZMo_4@^qZFyB+8WGU;>eZ{;@+aPZbO8(nU*&W)3QkhdhCViqZjpXt zf`+8CS}gWCn~0br2>|j=cMXP!eo91d*8by{n#I~fw5#7DS4wbE)%#6?^%@IrQ`Xlby5GD#G5G+Cn8VPlZdq$(rj6; zFE#IkAw}RcdmA>; z(LIp}Y6&AdsSh9n!>!omD+-FhGHRpLeR{dpWrL_GX$BFwI6{r2t`Y)vSXYG8r$gO$ zeI(7AHCf_NUboF#RRXAH!{umMS6o2 zrSz^ZP|0t!ks<=PWa-|1^oc7)Bc2Hu^$v2aUE1jg++GTJ&wR@aVEhMaD zDwb!ukdldD-oRF_G`K6zHcgkffNBhZ`mr9rm0uheNeE*3r>0 zMsRJ2sD_9{ko59G|Ie8^c}^Qaf$KyZ8Er0kW#77HUm_4=R&1?+Q10j|8Ud2vb(la8^GT7 zq+x|(*LH{KVE_(W0ka&@m-8s)sTiBdQ~7!&)oZvYHKpd;G@I}QxUyl=4%|0TzW?XS zHnnGjwYU?LRsiH}jNT%XCXTQ*0Y|^Xz_CY@in+WzVOd5{9a6sGunY?@6q7>0st@II z!+5Yv(rkss3KeaQ3xOEQ>~P)GDhrKJyC;_Q_Nn8b+Wqw^ZQZH1HC_Doq>>lt=E#2O zNYSM6T_>ChbWxz9xa=-b=(=1m9NC9_8WU_%oTT%VP@p<>>J-xO)nz;n4vPP_z#Ezq za-pedHW+&J;onF?{ODuf5IpM`p@HhpI^s;2W`}u3?n>RpD(B&U0ImpNCnK=tj0dTV zA(6@^l4|H@)I<<~X=KKnYvCV(TzP!N=3JuSY|s#EX=et?9|bf_0Y|-6rjW|9agd`y zIFw9#S0#4YD&A%P)2UjzbLL$!ZmDfbncOzSKFKm5&ete8X86Y-SEg5G>Jpco0>Dxd z;d~?*pc8E6N1vjZBk?xL-()m^Glq|7Z&w7cI?O0BY`*~#CHv5Ai>{DbSlPSpzMBxO z$Zis<%>c4KBLE|TcRHl0iupdECqgM2y+ql!|2}yg;U1+!w4RbA?Y2uflWPL7QdFV> z9Vu?*zAd|;*qQ^**?&-o>nTMnR9w|A4^Z~nu@?a%WXlwd05*T?t+xuPVli*typ$HY zvmk->^5n%>fnCet?M$khFezCmxl{002ovPDHLkV1mwzW_$nu diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled3x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled3x.png deleted file mode 100644 index 2a5c0b6a1d0c9679545f35450eae474822cef1dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8211 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 FV1iIAbcp}} diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled@2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..b8199a788889ed98e701531d9f9b2769d2434a4d GIT binary patch literal 666 zcmV;L0%iS)P)|7Pq~A@ zdpr_&00RU6nYE(KAh6C!S86Z&_Wg%!-uiOrggVeZh@h{KrPugPJCaHobTykEoDLe48Z z3ypZC4bt(>$~mtf88Bw$52WLhl}EgSWB_07-$=)Xm0!>T9(R3wb=#8R#zK~kl;;+8 zV$wLCXFNEP0Vh^Y9YWXevE97^ij@z%f@A=Hb>&EhV&zsd@Wsj_q+`O$+cu4IblijV z0N<14Z5!U)gG8W!$DV8sGxHD|?){}pWBvv7I-7Q&5c*eeq{RIkDV@AulL-&nqu=j> zLf}M#bT-|gpP8^_|EBPyM7qRQi9py=i{9RWJ=+~DwMaB2cgb^I49Q_;9ipVXzR-K{Sgd=h`oZ}Vne;zN9y*!6 zQ>T&rC(}nJ|LF(j*7z_#uCKnnV5dxtbZyj;Ia1Q<9f2MBqPs<36s); Date: Thu, 4 Aug 2022 11:40:58 +0900 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=EC=8B=9C=EC=9E=91=20=EC=98=88?= =?UTF-8?q?=EC=A0=95=20=EC=9D=BC=EC=A0=95=20=EC=95=84=EC=9D=B4=EC=BD=98=20?= =?UTF-8?q?=EC=95=88=EB=B3=B4=EC=9D=B4=EB=8A=94=20=EC=9D=B4=EC=8A=88=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Weekand/Weekand/Domain/Enum/Status.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Weekand/Weekand/Domain/Enum/Status.swift b/Weekand/Weekand/Domain/Enum/Status.swift index c7ec316e..3f553130 100644 --- a/Weekand/Weekand/Domain/Enum/Status.swift +++ b/Weekand/Weekand/Domain/Enum/Status.swift @@ -10,7 +10,7 @@ import UIKit /// 일정 상태 정보 enum Status: String { - case upcoming = "UNCOMPLETED" + case upcoming = "NOT_YET" case completed = "COMPLETED" case incompleted = "INCOMPLETED" case undetermined = "UNDETERMINED" From 5e3e53334a03c1c975853ca079686956c0db0a10 Mon Sep 17 00:00:00 2001 From: ChoiysApple Date: Thu, 4 Aug 2022 11:51:52 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20186=20=EB=A9=94=EC=9D=B8=20=EC=9D=BC?= =?UTF-8?q?=EC=A0=95=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EC=99=84=EC=A0=84=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0=20(=EB=94=94=EC=9E=90=EC=9D=B8=20=EA=B2=80?= =?UTF-8?q?=EC=88=98=20=EC=99=84=EB=A3=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix: 메인 일정 아이콘 크기 수정 #186 Revert "fix: 메인 일정 아이콘 크기 수정 #186" This reverts commit ab4a0ff87c474878676294f817fe3a390cdf9b8b. Revert "Revert "fix: 메인 일정 아이콘 크기 수정 #186"" This reverts commit 5f6195ffbe230598d8f2008d3cc541fd540f3a20. --- .../Common/View/WCategoryTitleLabel.swift | 12 ++++++--- .../MainScene/Common/View/WIconLabel.swift | 6 ++--- .../Common/View/WStatusTimeLabel.swift | 5 ++++ .../box.filled.imageset/Contents.json | 23 ++++++++++++++++++ .../box.filled.imageset/rectangle.png | Bin 0 -> 236 bytes .../box.filled.imageset/rectangle@2x.png | Bin 0 -> 343 bytes .../box.filled.imageset/rectangle@3x.png | Bin 0 -> 478 bytes .../state.completed.imageset/Contents.json | 6 ++--- .../state.completed.png | Bin 242 -> 0 bytes .../state.completed2x.png | Bin 341 -> 0 bytes .../state.completed3x.png | Bin 437 -> 0 bytes .../work_completed.png | Bin 0 -> 241 bytes .../work_completed@2x.png | Bin 0 -> 340 bytes .../work_completed@3x.png | Bin 0 -> 433 bytes .../State/state.hold.imageset/Contents.json | 6 ++--- .../State/state.hold.imageset/state.hold.png | Bin 339 -> 0 bytes .../state.hold.imageset/state.hold2x.png | Bin 570 -> 0 bytes .../state.hold.imageset/state.hold3x.png | Bin 787 -> 0 bytes .../state.hold.imageset/work_beforecheck.png | Bin 0 -> 332 bytes .../work_beforecheck@2x.png | Bin 0 -> 553 bytes .../work_beforecheck@3x.png | Bin 0 -> 777 bytes .../state.incomplete.imageset/Contents.json | 6 ++--- ...te.incomplete.png => work_uncompleted.png} | Bin ...complete2x.png => work_uncompleted@2x.png} | Bin ...complete3x.png => work_uncompleted@3x.png} | Bin .../state.proceeding.imageset/Contents.json | 6 ++--- .../state.proceeding.png | Bin 264 -> 0 bytes .../state.proceeding2x.png | Bin 408 -> 0 bytes .../state.proceeding3x.png | Bin 513 -> 0 bytes .../work_ongoing.png | Bin 0 -> 265 bytes .../work_ongoing@2x.png | Bin 0 -> 409 bytes .../work_ongoing@3x.png | Bin 0 -> 514 bytes .../state.upcomming.imageset/Contents.json | 6 ++--- ...ate.upcomming.png => work_prearranged.png} | Bin ...pcomming2x.png => work_prearranged@2x.png} | Bin ...pcomming3x.png => work_prearranged@3x.png} | Bin 36 files changed, 55 insertions(+), 21 deletions(-) create mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/Contents.json create mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle.png create mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle@2x.png create mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle@3x.png delete mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed.png delete mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed2x.png delete mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed3x.png create mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/work_completed.png create mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/work_completed@2x.png create mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/work_completed@3x.png delete mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold.png delete mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold2x.png delete mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold3x.png create mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/work_beforecheck.png create mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/work_beforecheck@2x.png create mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/work_beforecheck@3x.png rename Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/{state.incomplete.png => work_uncompleted.png} (100%) rename Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/{state.incomplete2x.png => work_uncompleted@2x.png} (100%) rename Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/{state.incomplete3x.png => work_uncompleted@3x.png} (100%) delete mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/state.proceeding.png delete mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/state.proceeding2x.png delete mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/state.proceeding3x.png create mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/work_ongoing.png create mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/work_ongoing@2x.png create mode 100644 Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/work_ongoing@3x.png rename Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/{state.upcomming.png => work_prearranged.png} (100%) rename Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/{state.upcomming2x.png => work_prearranged@2x.png} (100%) rename Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/{state.upcomming3x.png => work_prearranged@3x.png} (100%) diff --git a/Weekand/Weekand/Presentation/MainScene/Common/View/WCategoryTitleLabel.swift b/Weekand/Weekand/Presentation/MainScene/Common/View/WCategoryTitleLabel.swift index 79ccdc3b..c28f4516 100644 --- a/Weekand/Weekand/Presentation/MainScene/Common/View/WCategoryTitleLabel.swift +++ b/Weekand/Weekand/Presentation/MainScene/Common/View/WCategoryTitleLabel.swift @@ -24,10 +24,10 @@ class WCategoryTitleLabel: WIconLabel { self.label.font = WFont.body1() self.label.textColor = .gray900 - self.stack.spacing = 7 + self.stack.spacing = 0 icon.snp.makeConstraints { make in - make.height.equalTo(10) + make.height.equalTo(24) make.width.equalTo(icon.snp.height) } @@ -47,7 +47,13 @@ class WCategoryTitleLabel: WIconLabel { extension WCategoryTitleLabel { public func editValue(color: UIColor, title: String) { - self.icon.backgroundColor = color + + if let categoryBox = UIImage(named: "box.filled")?.withTintColor(color) { + self.icon.image = categoryBox + } else { + self.icon.backgroundColor = color + } + self.label.text = title } } diff --git a/Weekand/Weekand/Presentation/MainScene/Common/View/WIconLabel.swift b/Weekand/Weekand/Presentation/MainScene/Common/View/WIconLabel.swift index b163de2f..8b8caca0 100644 --- a/Weekand/Weekand/Presentation/MainScene/Common/View/WIconLabel.swift +++ b/Weekand/Weekand/Presentation/MainScene/Common/View/WIconLabel.swift @@ -14,7 +14,7 @@ class WIconLabel: UIView { lazy var icon = UIImageView().then { $0.setContentHuggingPriority(.required, for: .vertical) - $0.contentMode = .scaleAspectFit + $0.contentMode = .scaleAspectFill } lazy var label = UILabel().then { $0.textAlignment = .left @@ -26,14 +26,14 @@ class WIconLabel: UIView { $0.addArrangedSubview(label) icon.snp.makeConstraints { make in - make.height.lessThanOrEqualTo(label.snp.height) make.width.equalTo(icon.snp.height) + make.centerY.equalToSuperview() } $0.axis = .horizontal $0.distribution = .fill $0.alignment = .center - $0.spacing = 5 + $0.spacing = 10 } override init(frame: CGRect) { diff --git a/Weekand/Weekand/Presentation/MainScene/Common/View/WStatusTimeLabel.swift b/Weekand/Weekand/Presentation/MainScene/Common/View/WStatusTimeLabel.swift index 13429d17..b95a1ec7 100644 --- a/Weekand/Weekand/Presentation/MainScene/Common/View/WStatusTimeLabel.swift +++ b/Weekand/Weekand/Presentation/MainScene/Common/View/WStatusTimeLabel.swift @@ -23,6 +23,11 @@ class WStatusTimeLabel: WIconLabel { self.label.font = WFont.body2() self.label.textColor = .gray400 + self.stack.spacing = 0 + + self.icon.snp.makeConstraints { make in + make.height.equalTo(24) + } } init(status: StatusIcon, title: String) { diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/Contents.json b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/Contents.json new file mode 100644 index 00000000..61e8851c --- /dev/null +++ b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "rectangle.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "rectangle@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "rectangle@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle.png new file mode 100644 index 0000000000000000000000000000000000000000..1e7329501b690e8187b18a10d3aee65051a3f766 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#Mo$;VkP61PmpAe@C4r!H^!{O7!a~DnB&1Iu2RexYR dv*#y4^~XOYg-+_OH32$?!PC{xWt~$(69A<8QxE_E literal 0 HcmV?d00001 diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle@2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..b6b661260c2c8a1b57d6cdefee68a78f0eaef4ae GIT binary patch literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36l5$8 za(7}_cTVOdki(Mh=8s$D<}cMsiOy17(DzT4FPA#jazO8fz00XWKlw!TT%1RkgI? zmk{3u-+zk_NU3YQ)P9h1fBEM2NvYg#C!D%;_{+@okbQ#M6UFHpxV8ywT-eySbLpHT_Y(HS>F-{6?s@u* jRTAP&9YF9xe=pgTe~DWM4f!!m|Q literal 0 HcmV?d00001 diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle@3x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..88bd5e20441451bd995dfe26c86a19436af7e314 GIT binary patch literal 478 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG zjZ5$n7!{E?0;VFrMLTGq7n1&cut_nVDN{- zu{FfJaNWdnmt>#6eC^`wV)|05H|}eMzVlk9H;t=qTU_)j|83BI<&|sqFRLv^o7h%` z70!CM!B779ryI*cx2{<4q%0i0pzf)Q?P>Anm(A8LnVGHH`$TB1_Vd*n`!2`dI3lEx zdtz!^-Vx^|f7jZx@Yra-@R;iL+Rx*3s;yt>t%v?6=V@OEdFq?;;P#UL989SK8qE%p zETLkb!C~n zgw*m?b0_KRhx{%KF#jm=D`5ZI!*9L>=pS~21<-^473{hu0rva36`4U|p00i_>zopr E0Lbsd{{R30 literal 0 HcmV?d00001 diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/Contents.json b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/Contents.json index 915ffe64..931fa322 100644 --- a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/Contents.json +++ b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "state.completed.png", + "filename" : "work_completed.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "state.completed2x.png", + "filename" : "work_completed@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "state.completed3x.png", + "filename" : "work_completed@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed.png deleted file mode 100644 index 54583be692177555493265be7bb48ea021cf208b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#c25__kP61P6HaqB7zntq=N=H+#^Sv}#rguD z&QYN~RhRjKn$rDuJz{fhauhyz*iPa^|MWyg*TA3_N14MjE%&~5Y%-`kelq3nj5Esj zXX(!o)Hf6=y3?y{5qPgg&ebxsLQ01UuSHvj+t diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed2x.png deleted file mode 100644 index 12b22cbcc0c9b036cd55521c336055ac78d5d9ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36l5$8 za(7}_cTVOdki(Mh=B%##6I(y^%%2$eW4+jMzQ+$F%$0;~zg1U0 zudq|z9C!aPpXI^-i-S&F;IPgyeAt@PY5nKn(+2nVUl-P_4O-=>D01zsioDWhz4V1_ dU`IZE#q0aL>dmh`OF^N);OXk;vd$@?2>`_LgT4R& diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed3x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed3x.png deleted file mode 100644 index 5a25febbe07fad402fb0991efc74816fef233f27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG z<@N{g}=^r9d^n$!i1i z8wM*6s|$Qfn7u&6n*%~0!j4=tys6wMxnuYL{Aaa3X%#zltS17^gn}mtlAi@P_uo9i z^3Z*?v*G^FYBiBB>Mf6-3ANOI@FVK$(!irmXZ#L7eG{^AL5Zc~)LBP!Ok?`?7KNUd z`^|mddS|%W8%?uaYr^U*=Nbuo`7XNSijBr1nakg~B0Pnuh`FtFKK>y=cQH74>K!~PygnIGr~Ndu*jcll}wjB R*OUbyAx~F7mvv4FO#rImv+V!? diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/work_completed.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/work_completed.png new file mode 100644 index 0000000000000000000000000000000000000000..8d48afed0c50c124e8ab2fc71d329f1a54792d44 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#HcuDFkP61P6HaqB7zntq=N=H+#^Sv}#rlGu z&OxC)RhwI;Jh(Y|-3~=dmS(l4_Sz2$_G*Wjx)x3GXpT6X_eQ2FKtZ=ANjuVhSy#*a zv*l$6y?Zp00i_>zopr0GmNkv;Y7A literal 0 HcmV?d00001 diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/work_completed@2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/work_completed@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4e87606450aaae3dfbea05b5008626fe12f72e1c GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36l5$8 za(7}_cTVOdki(Mh=#u;BFQXt7$r zcfj${g37viJ3MRWf@e5O(0>Rw=KgO|5#>z0)^`A8dN`ltnaaVI4#N)a3Os z7dIdOcZlClZYoE0*VJ{Zr^Wj%W?}g|pa1$S_Q)y8QM~+TTc1Ur)_?BGDfwHl*!=d= zKSh&n&)9qPZRq8e6Myw=XPR%E`2WajRSS;fKApa$ zXkD)I^{`V1?(}|-oIZEo5*FXt%3FFVdQ&MBb@0Q(WQPXGV_ literal 0 HcmV?d00001 diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/Contents.json b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/Contents.json index 3e238ad2..8a968e55 100644 --- a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/Contents.json +++ b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "state.hold.png", + "filename" : "work_beforecheck.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "state.hold2x.png", + "filename" : "work_beforecheck@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "state.hold3x.png", + "filename" : "work_beforecheck@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold.png deleted file mode 100644 index bcd320d2ef7568f706d1a6b73d5f413869bf5b76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#7oIMTAr*{oCmZrL8Hlvq&zALwv1sbcD@pmn zB6m>x0p}C8D&|MLAK3DGc37SgoZ&O!g1TyQdZC^_@C1F0`I0*&Puo+qh7>(U0#Ov*NVM z-3$w~QW~P)1%&*M`d;NQyJ2>kPQ{IB+BF+b$>=bD^>vvS#vE_(HJsxkUl}`l&(rnH zD_-W$y0`UjZr-H}3@&A%$(;SplS*8*W-z~*9mH@hieF;Y>_-bT{TIC3>7w`QQ_|cS g4Ekz2j~emnH$_DFe>=n81N1Y4r>mdKI;Vst0B-1m0{{R3 diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold2x.png deleted file mode 100644 index 05dc625c88727cc9f58bad477a27b420a55c1ed4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A_P)fC>l|02R;zbifS|pcs(gn3RwMj}XN>c#{LM zPu{T=ADHi8$(DA#voFm6LI@#*5dW7#Mz;^|dnIieq|`n@l{9Ulp9aw*2z&apR$J~M z19kwdR(r9J?-LLmAq%C>JJqSctfT%8ky2E%aXa~ixw zgzBhIcg`zt+j_5PGVMe+9TSEJGv$RK%`DzOzBHiAXUQ{TLQ}78uie0b^9pDRoAEEI z-&D!u3D^Tg?%{UoPp~2%g)xy z6_{qqgCOy#0!OSvoEN(a$f(c&@*n{eO#&#I1W>fh0ocqG1>&RMa#ms3MwiaUzbQo%2*8+R?o;X0SL^=qEmbCI2X4zy+Xji;$Cj9I z#Hz^do?g$D(uc@VRMcGTZmv3)r>sLftp`n8lp{CvJgw)NU|t<807*qo IM6N<$f@l)=!2kdN diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold3x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold3x.png deleted file mode 100644 index bbda757f88712b0ee812ca080f09f38df5bd0f49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 787 zcmV+u1MK{XP)8W%rez7$1vBLx3tE zRjfot2KLs8yOe3^qF&z|BC(_ab+bXWByuj01`;p^pXXzHnldPhM0(lXv6Xq2Dx5$B z@9krkUEka_kw}t&`q|*bKTc=zu`}|%rbQ5!^^~)~Cl6KK{;gNartX6wIf&#TgTHO3?QJ-cwLA|y)bjBQp zeNkTj*!@s@tEmN4Hugul<3VMxb3|58PGy1&UNyd{adsO zC5ro?{Ka{{wsng{mMr#FC`q=Hekd4F1Otj-KoJZmf&oP^pa=#O!GIzdPy_>tU_cQJ zC_?k!{4lSz+yB}?B0YZuThOI)ni!}BD+c0wIdd_faXrFatAOt z?sf-NC=2J(C_20sTtbOjKpS>iRFA6o>StRsq(23Mc2U1f%>|UG*2R3$upKTa6!nMm z>Ddge{oU108N2;Kqg=*;lXz zsMc}?F9c9P*TrbPP+WwQ77e^cK!Ndcq;jwnttcme{)5|Vdp z;REv>qGY7CJ>G|A0vKbAF~LzfbbdMg>E4-T%bVweyK`Q9$eZ`8G}OYBP}KZsXDU9m%$|wouEd{ zxZ2-d3vN$Un|R5MyHKpx-$+Zj+6}`f6~|(00000NkvXXu0mjfPA}^M literal 0 HcmV?d00001 diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/work_beforecheck@3x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/work_beforecheck@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..068d75e9e8128f4a5dbc344fad6647ce0f585f28 GIT binary patch literal 777 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG z-nldZe)Zt&H0PPZDiZDecJQ#ui=ShX-BPHxFdnMPLL zj7h0)Bew6;yx_{9^kbh>otV)Ijz*u&k^UwpomwBSeAN9StgN>BzPo~B+6CWlzqbU) zCNwKeJQ(-u9nY~d%%6U=i)%{lUy?i+n!+Z0+|C#w-X62c&HYv(w{;Oj;hd=(=`N#6_nl)1YqgB#Y z&x&;DJaRnr_}@6yBX&pUZ>~wvKBClakR%qs`1T49uV7d8{7~6zv)uD#(-^Pronybu zx}4+5#ObxtZcT5O#B;MaNv~)V8+fo+>jDiT2f^ET4};c?So;m-?wH;80wV2 zkhvQELTSR()&AFcW=@Sb!xXhLE>u>0;=J{Wha)1VuhYD@TeE~yIgN2|=d`JRSG4;b zK4G-vf7iFECa3fhj%?94`&(&WwdU%Z*O%X&FSx7qSY>vpuuHqP?ypi&pL*W%f5H-# zslCqEt0ynbe0-r~rhfelv1fljss|hXzjU}pe#`#f5BCJzt?>9a>soE4{*CXB*SGKg zHQ|NHm&ajd{CCfA3igTrVb;38etm4;{FAyI$y5KRJYf%!{>iewrc&9mto+v2*q6_N4c0?_00G76q()bI`MAvAEd-<$t~Yh7UY; z{mA<^YstC zZ=af2VNOx@w_jP?7rs8h{`R1c^K>DJeUEhKtqdt!&OW!-HK~#7F?by*x z!$1sx;U5-&5pDw*;YR2P9ibaE8^8u+1el4A_>(O4p^ofIWKGbLS&Q zY6V2}*X?}Q=`gtSoGKL{Nj*^>7a65M1GEB4OPafG^1v$5I$P@cGsfehkp&zoVY;L> z9p%KESkgIqjF$A0pH*aWg5zF8-vmL4 zgVG1s-m-0A%()d zx#Ctk-hRvNES)_|@8e4Dew$QBOQ|jT3r+-H3+9&6{utxXxjbjKP45P_DLOCL9PwuE zl98SILy=K+9-r5r84XJAm7U>FZ!`$?*Uo0sDq7VrN%d#LwU8%Q7+w4Rm|1ES_B9Bd zFA10@yklwH$J}3iFMU@&oAOCU+GIg=&J^y=PO7$9uY9V@AC=39TAD4WNZEbt+dtvM zk}J+EWIQTVcSy`C1mP+yB0rToZXYWpAv0^Qx%BenP)xA`V1brE% zeDk$M>T{Mjhfc6L8`te@zRjUXZU3$|NiWtAh4*RERh5TJ;^$1U+TmgMcc0z*GX^q6 zCe?z+70uJu#@8P4^!~T_uB7CPkj8gfag%IAx9+l^C~k63=d8;Xpi3D%UHx3vIVCg! E0FcyN`~Uy| literal 0 HcmV?d00001 diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/work_ongoing@2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/work_ongoing@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..e56a0a80a330dd49d3c93a1a5e7a72be513469e0 GIT binary patch literal 409 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36l5$8 za(7}_cTVOdki(Mh=73>BImQ34i$4E6 zA!+g>v!l^n;bBff|2zzP9vQnPuvXQn*URXe#C4QZt!Sxv-sjdk`EBIQ%$~_26JJig zc~M|(!aMQs-@&sM={>CeY(*o_R~(*jsssN*(W7b@OIz4t8Nb0nJQjBY~vy{~tEc1(<76#QFg z9ban2v(DzY7pq5*|CHmdZkiVu);3(4^laViI~%;VoSU}mU(d%K87YkIUNiJEecdfT zs!c2DlUuB6`#f7T^3IRXk#Vc{Jf2ew^ya@S=JQV9JQ(OZmm3(844$rjF6*2Ung9fr BsF?r& literal 0 HcmV?d00001 diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/work_ongoing@3x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/work_ongoing@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..673ac3ab916191450ea535e17937b1c37b6a75c8 GIT binary patch literal 514 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG z@Faeu5+C zLJouU1>OYa8w-?Mcweyf1eh^IuVU5mti8KTblZ9LyX{`JCoi7$%o25hgEi}RtdX`a zue8ZMg(N$YY`{SJk zCUFNa3u{YScsvK#{YYiC<=8HGDs>?(0!W}Ruh;K0OtYVL~X1Ou)Z z%Z8liS*ICZF?(NXRq!^EM>5h^7DnexIb62SBw)f$rdd{(@6G=p>+a~st08lf@5a4) zCkxqDOS1(5hx~6eac*9AA$dYF)2kD|d9MX-nA0Fr+5Sgc%fea-9{CDN3S@0pv_ETFsh5R Date: Thu, 4 Aug 2022 15:26:36 +0900 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=EC=98=A4=EB=A5=B8=EC=AA=BD=20naviga?= =?UTF-8?q?tionItem=20=EA=B0=84=EA=B2=A9=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Main/View/MainViewController.swift | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Weekand/Weekand/Presentation/MainScene/Main/View/MainViewController.swift b/Weekand/Weekand/Presentation/MainScene/Main/View/MainViewController.swift index 159c4bf7..e34a0f66 100644 --- a/Weekand/Weekand/Presentation/MainScene/Main/View/MainViewController.swift +++ b/Weekand/Weekand/Presentation/MainScene/Main/View/MainViewController.swift @@ -30,9 +30,16 @@ class MainViewController: UIViewController { var headerView = MainViewHeader() var tableView: UITableView! - lazy var foldButton = UIBarButtonItem(image: UIImage(named: "emptyImage")!, style: .plain, target: self, action: nil) + lazy var foldButton = UIBarButtonItem(image: UIImage(named: "emptyImage")!, style: .plain, target: self, action: nil).then { + let foldButtonImage = UIImage(named: "chevron.up") ?? UIImage(systemName: "chevron.up") + $0.setBackgroundImage(foldButtonImage?.withTintColor(.gray900), for: .normal, barMetrics: .default) + } lazy var searchButton = UIBarButtonItem(image: UIImage(named: "search") ?? UIImage(systemName: "magnifyingglass"), style: .plain, target: self, action: nil) lazy var alarmButton = UIBarButtonItem(image: UIImage(named: "alarm") ?? UIImage(systemName: "bell"), style: .plain, target: self, action: nil) + let spacer = UIBarButtonItem(barButtonSystemItem: .fixedSpace, target: nil, action: nil).then { + $0.width = 4 + } + lazy var floatingButton = UIButton().then { $0.backgroundColor = .mainColor @@ -67,10 +74,9 @@ class MainViewController: UIViewController { private func configureUI() { // Navigation Bar - let foldButtonImage = UIImage(named: "chevron.up") ?? UIImage(systemName: "chevron.up") - foldButton.setBackgroundImage(foldButtonImage?.withTintColor(.gray900), for: .normal, barMetrics: .default) - navigationItem.leftBarButtonItem = foldButton - navigationItem.rightBarButtonItems = [alarmButton, searchButton] + + navigationItem.setLeftBarButtonItems([spacer, foldButton], animated: false) + navigationItem.rightBarButtonItems = [spacer, alarmButton, searchButton] // Content View [ collectionView, headerView, tableView ].forEach { self.view.addSubview($0) } @@ -409,7 +415,7 @@ extension MainViewController { } if let safeImage = buttonImage { - navigationItem.leftBarButtonItem?.setBackgroundImage(safeImage.withTintColor(.gray900), for: .normal, barMetrics: .default) + foldButton.setBackgroundImage(safeImage.withTintColor(.gray900), for: .normal, barMetrics: .default) } UIView.animate(withDuration: 0.25) {