From 8c544aab46caf53c694c8bac0b51c2809fd0cfa1 Mon Sep 17 00:00:00 2001 From: Juhyeoklee Date: Tue, 10 Nov 2020 19:44:58 +0900 Subject: [PATCH 1/2] [fix] theme view --- .../themeInfoBoxBlur.imageset/Contents.json | 23 +++++ .../themeInfoBoxBlur.png | Bin 0 -> 1031 bytes .../themeInfoBoxBlur@2x.png | Bin 0 -> 2663 bytes .../themeInfoBoxBlur@3x.png | Bin 0 -> 4912 bytes .../themeInfoBoxBlur2.imageset/Contents.json | 23 +++++ .../themeInfoBoxBlur2.png | Bin 0 -> 1601 bytes .../themeInfoBoxBlur2@2x.png | Bin 0 -> 4922 bytes .../themeInfoBoxBlur2@3x.png | Bin 0 -> 10089 bytes .../Resource/Storyboard/ThemeInfo.storyboard | 92 +++++++++++------- Mongle/Mongle/Source/VCs/ThemeInfoVC.swift | 3 +- 10 files changed, 103 insertions(+), 38 deletions(-) create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur.imageset/Contents.json create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur.imageset/themeInfoBoxBlur.png create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur.imageset/themeInfoBoxBlur@2x.png create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur.imageset/themeInfoBoxBlur@3x.png create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur2.imageset/Contents.json create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur2.imageset/themeInfoBoxBlur2.png create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur2.imageset/themeInfoBoxBlur2@2x.png create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur2.imageset/themeInfoBoxBlur2@3x.png diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur.imageset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur.imageset/Contents.json new file mode 100644 index 0000000..bb4976a --- /dev/null +++ b/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "themeInfoBoxBlur.png", + "scale" : "1x" + }, + { + "filename" : "themeInfoBoxBlur@2x.png", + "scale" : "2x", + "idiom" : "universal" + }, + { + "filename" : "themeInfoBoxBlur@3x.png", + "scale" : "3x", + "idiom" : "universal" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur.imageset/themeInfoBoxBlur.png b/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur.imageset/themeInfoBoxBlur.png new file mode 100644 index 0000000000000000000000000000000000000000..d86e46b985c3bfec2e517b4dca02a95444e2915f GIT binary patch literal 1031 zcmeAS@N?(olHy`uVBq!ia0y~yU@Ql+O*zEakt!T9!$ zZFX>?1Y5%5uo4Y1mn*(+7deLq76znG{MWs!V|L!FCy!K`ept)QiD4-$C=it?DG5C2 z8E9}X-_t2L*wgFaGt29Z?UU!|pDW(mK6|=JX8w7z>2>?-O_s-b&h^$^?zhZuDc^D( z77hUggV_hR%ls=0kl$1{x$5HUulv$$KVO>tw1?$ar%b(ZsqR*z(>wcA9U2%Kb2;~% zjXWRhFZ5;pvb~2w9@=qyy}k2A)T;|y#LHzEnOHd9%sB8p=4IxqhbD^u&liZlvNqGu za{+3cDf`c^ZM56rdmbzy*{xwYBqcaxqicImbj;V>(n09 z=kD3OSNc9roc+0|4gL)qI~f?6b_YBNdbjfFw;M)c?`Ce@e*XGx^CXC$?U}Nh|H$3_ z_#%1c8;f~s-*SIpcdy>70P`#ZzrNpk-=cW`eA%YjxVDS6LO{2~Ecnaz z@?62?UuSGLf4hA1gWcBr9fxNDZDM)mmtayYf9}rvWvmD7${)XI;{=AR+J&_D-)~Jz z+%aGN_FG<%U(c*Q@U-ml-Wru+wb$iuds{(Ty*TFN8h^hkv^Jv&#BF0*{rmH(zpw9Y zj5p)`9wiKP)PWeTHCqbey|(V(5Csa81#Jg{xW6Z_lsEl#kriaDOM>kk@z00O-2Dvl zffZAC?z4Z^s&`)Vtnvee(S<{?8>$6>tNc#~z{~?s- YFJzv3VfFRBmY@vj>FVdQ&MBb@07^TC3;+NC literal 0 HcmV?d00001 diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur.imageset/themeInfoBoxBlur@2x.png b/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur.imageset/themeInfoBoxBlur@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..6ddb3017e63068742b1a5177a9c8b8e393182c6f GIT binary patch literal 2663 zcmeAS@N?(olHy`uVBq!ia0y~yV0s5+XK}Cr$;XSY=mIIm;vjb?hIQv;UIIB5sS%!O zzP=1vKsE;hV|yk83rGnNO93%Z`vNAI2-CX-%rG`X7D&?0+*X5uf%C4Xi(^OyiC6eU6;bCqF?h8(|+{MtK4l|{w}$W&*t;);&<<#?wr55vc}^2%v&Z0 z4Q*}r>h|w9-Kf4%dt-cFfy@l2q-u-9N5A7?*wz5?;j)S!`E})U0%6z z<^AG0CuZDwv3yy?e!cU1>_0j@>O1nR#jydVXTh!mGgW>hKAL-^Q{?0Q+>}Gf`gej? z#Lwct!u2I=#rCGZzmOC^a1#GvCci-Rqpshw3IEII$Yo4AO8_} z=L|=v@i=nYQ^ugnr59+}Owm;t0vu$qbS!LGW|6Fe0{_N>=abH@X zIneJA^L89y&GY`J9<027Zp8FhjqGdT z$4|(97kLxhxw!JvYEIYRC%hjxLBo@w@&8VT)l=jB-qtL+dSP+hwTXIXn72P^JTA=N z|106TAi`P>)_Z5t?dH7u9l!eTo7H-Eg15Xs;e5~Q&c0jimh<6WWoY!3Kk{Ir$ou8t z$s1Q4vUUBvb?49Bone(UkSB)xzw->;lO1ZG5iV_5ZesXf-aWWSf(zAYdAYejXd zCz6AYX%;BNeh+?bm$0$#_vYvGUX&wAnz=mqc`x|f>mAE)*MYDOvxxuB4*rI+7oAb{sH%Zdd5|a9-YTXUm0e^UaYp&N(o5<=OYLc6A5CX72f! zdT&oAs%{^b2O--|%gm_$RP%7&qP@O#hTq$i;R%?LNm%^G^hbYRPdi$$`b<;UpCiFj z5Fy9Nl&k&wjD*;`&y$Put%Tq~rC<=)_*1GjZMDy~lW+X2>{Xv_Kj&j&%dZX#O9h7o zoIdL7&Xvua|J>>wf11<9dl@{4uqb7T>aAO`)Hr;{`Rxy0KhY3INUsKzg6qYO@<<;;T}BOWQz_{Y5eKa(2?Cxnh9@IImh~TVlG&SMOSz|&fEs+B Lu6{1-oD!M<8=!BH literal 0 HcmV?d00001 diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur.imageset/themeInfoBoxBlur@3x.png b/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur.imageset/themeInfoBoxBlur@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..9d17b67a957033550e0a5179b849305da4aaece6 GIT binary patch literal 4912 zcmeHLX;hO}8ct$RARwtA6akGW5)>3eWkuAbI$a~m)zXE_ul7u-uHQL zPQIZy+RDprkVPO6@}w_qoDc{!4Ibx9uZCYK#l8gi4H@QSYlSFnQy+yt7}H!ybO#5- zc6cm}KqehSpqE47X9N5o5U2vw$_$!Tuxe$D$Y1`F12IAoh;=NIjipNzan@m=7SDy{_&!w6y|L51@T0~XBVVT9mWZ3ldo5g#%Q@>u4`^3 ze+TpJk?A$<0vCbF%*J=Y|EmBMga&2Y}};@;sp(QC8F zj8bDV3Q^r}Pz5`~t=;)n^q4O~4L@q-Vak?Z%k=C_Ed zy6oBes^%U(d`PW$_O|6=oVq0{OD(J~Qf|!mk=})4&(DMFjptE%l?y&&3hZI0cI}%B z9*^GnyUkO!A<5a3p_+T-4)=(9VhbmZ$o%`r<+B-Xn7X{x?L~%GSBv8_3s|i`xILyF zwuUS}4~u`w^=G>@k222@WPCEtP7ih&Ic;)BV+AYXtpuw_F@#$h`$-m1!qDmNqb*ht znh;6rNG%LvZ>Vedz1;8$Vwsdz^9U!yd+3R5Vr1*xWBt& z$MNlV`C3d8E=>2JsIzOvg8H4}$H{;zg04Ls>KIEs10D1e{PNx}Z(-bC#irFzE6`S$vqk8*eBCJ|(O_g>wx80}x!x#J`O+?jZh zn|-V|&Tk0X*&8X!UJi!N$86V18-2agMCIc`$5C`TLQ|+)-`*)}IX|MyY)Bs%4ISMDrZTipONGHRaapEa-H9d&V6b;1+Wpl`RA^dR_=!U? zVh70c!Eo5-NkOuiOjPaX%rHr<@#Ps|`E9}cN^{>a+JS3i6y!X*7|xS}*ujidpiyG+ z)BT>aeKPdCTwzbqTH3k?IbU`PZ{NG!X&9+4fn^gWr==?1ypcauq zqY3Hw-b|pM7(YNY8QjUpBv+D^c)l5YC}-)7jm88Sv=`hriq_OLm)h2j3o=80F*IY< z|Ip<{{aym4w5M)|7u7URkR^_r8TvVX(w_yh8dMkGU=rz-H%b6^As89iISwhI-9h+> z^}Lrh{p2c0vLq3V8I<;H_m&r&hUr!sm1|k^zli&kB4WHa2u(O^>4lr4ToU%J)r^kX}VYZ2JiV+N-t{6g25B-Uh-X zZwt}9Tb(m_ndXU~oz{x!0Ryl&{fk_ItwwnBxPA1=(Ugh#r#Ev0w@8F#xfaydc6lB4 zFCzr*yg}!g-&rV8kfa*3{%HDapms&aGo5x%`f&)wocgbmUE4^JHQTtV5rKTE>9#Fed})J z^9LwWx$=6<8XYYrq;O{^s0CwNNIK>ISx{+g7KghZALbyss$&p;S_2T8A(r**r1Oed zi)Itzz3Ba*3;0y;szkyh^+@)ASgn5S8b8zy-`StUeE{ygfYGg{u&z+(;(60`fEG*Z zjk{3L6()tnQD9sGm6}y?-R(>lk4P*-8`61MS}!bt-O$o}H||t3U)9qL)Rd@*+hrVdeX8H9&p&d7Zzu$6%<`fGyJh&!k{JevoyNFXv2C@jPw zdr-Lq%6$Wn1s0FR@{|e!NFY2|<=(h+$&gon+*xe^%`KSDSFc4N z$$Dih?~O>PW)3i=XyKUb%L4E=9;t%q3#$7EfLdT|hm&*VkA9kdO{i~JT73YJz(q!y zcI)LFc!{0T!!bwaCXJ#1c?;~|qS7kc1%T`bfKM$8<}`wq_zEuA?a{FyNH2^u?NsbL z`8=R3Zmz@fT;S^l0Qtt9i0>Tl4W0%{j(7zY!On{cf)v1~{{KkNQ05iSxpTovK%%5j z^iNgwf3}ttSAW9R@`*$Syt_g~;!arU$`TC{a3SE~Kll0H(Z|(=@gC{f=282!F(_vF PpDWT|9BoRiywCg!t!PWr literal 0 HcmV?d00001 diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur2.imageset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur2.imageset/Contents.json new file mode 100644 index 0000000..068abd3 --- /dev/null +++ b/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur2.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "themeInfoBoxBlur2.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "themeInfoBoxBlur2@2x.png" + }, + { + "filename" : "themeInfoBoxBlur2@3x.png", + "scale" : "3x", + "idiom" : "universal" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur2.imageset/themeInfoBoxBlur2.png b/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur2.imageset/themeInfoBoxBlur2.png new file mode 100644 index 0000000000000000000000000000000000000000..1972f97ffd94ffe59dfd8808034859d552406f72 GIT binary patch literal 1601 zcmeAS@N?(olHy`uVBq!ia0y~yU@Ql+CvmU=$$fTR)j*1|ILO_JVcj{Imq3n1YJ_K+ zuP=iZkj=rs*q+J20#X9RQb5eWz_fq~Cc;?0fEmVSm;{ncn5R3Bfq`|qr;B4q1>@U0 zj(MSm0u1l(4K$UYHzb%b_mML{}WJfXkcJuV&R}I4NRb}n|Dyd4H9`sw z4_Fxs>mPRA13Ip75p|%RI01q0;_F`U0_AtG z9Qn)i(G#de9LQ?bu3`q8SxCB(KRS2+7yZ=g4K{%f=qh`IKPnCl2eg?U{X3<)w;AZz z_J$qu5_KS_iUOVbbkaRXpuNrxcldeiIRz9xbT#bQU*!277}f_A72dJ8f!*&4bpOsJ zEHMgwFt eh0rQ5{9*rY$Z0#X>}4&eDED;rb6Mw<&;$T6Y7U$L literal 0 HcmV?d00001 diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur2.imageset/themeInfoBoxBlur2@2x.png b/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur2.imageset/themeInfoBoxBlur2@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..1ef712f2cb3dc0fd98c562d72afa6465253d6938 GIT binary patch literal 4922 zcmeAS@N?(olHy`uVBq!ia0y~yV0y>Ez^KB(1{5i1+tLc87>k44ofy`glX(f`SfoaH zruq6ZXaU(A421&4-F#^4Nu_nbBM z^Uoizwtux8DV}~zIq?3!{;!``^gmZ430L?(FufE1|F1G4J{5Ex9JP(<%Rt1k-+}Jm zoK!r{5n(n5=<>-QRN(<8Aok&roSwT0!cg@GNB`2n z84uBd{9lOL(1j4_A0mlEA|A{b2#TR1nDEl6ZGEZix~+3mY)C{VuRTWN{N# zp6_Y;L5RXhg7I*zg$$y6o5j>ty;*!ELPt--LpvEhL=oW2czEy4?hu3yw*v+8eC&ww zZ&|~`dv9E|5IU3-cJQ}1!#(8?e4rrzo02F(hoHfo_QQ^FPXU8r$7nEsQp0F4D2xUJ zBqNQc25^Zp8VsYsFj`ZLR+ykRQR8SZj0VGSYehcbUl7GMMdZS%`Jgc@Pgg&ebxsLQ E07oH`5dZ)H literal 0 HcmV?d00001 diff --git a/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur2.imageset/themeInfoBoxBlur2@3x.png b/Mongle/Mongle/Resource/Assets.xcassets/themeInfoBoxBlur2.imageset/themeInfoBoxBlur2@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..d1a5b224520d054ca309c5d0ece9169eeb311988 GIT binary patch literal 10089 zcmeAS@N?(olHy`uVBq!ia0y~yU`b_QVBE&R1{AqgVO;^F7>k44ofy`glX(f`SfoaH zruq6ZXaU(A42P_3au3d;)aOT+G*H7IW7#NvYI0O_NMj4}lFq#qubuMT< z@VjzedEp6OjCg7k{_*$R`M+B+Gcs4>e~r(qPj z35~)ZeqM@!)7f!w~lanzDHVhU;fGOvmAt zpl3Qd=yp1&DV$2dYWQ<+tZvayHOgwouvA^))SOmV^n`GNrDorhKx-FtaSKNM)N_ZF z(2LI$rbRw(Zw1iH)(1dSO2ov_g%yN91gR}9>p+i-0;WZ0u!i|_Z|qToJy;$r#qO3N z5dRvJv4;74{khnpXwQ_BD`YX^VorlbG1f5u8H6>8a0E+*CU&B zVzeX~Ew>S+<7jn*C?}yKD5I78XqyCHM2xloM;oq4!snMp?Xj2MQI*!(oqqXE{ zEeUK$H;xYPjE+jdJ5-}%fTKf~hz7!FEjc>AjVK(4Y+v#NJHHG2gSmPtOF&EBJYD@< J);T3K0RXK^4SWCq literal 0 HcmV?d00001 diff --git a/Mongle/Mongle/Resource/Storyboard/ThemeInfo.storyboard b/Mongle/Mongle/Resource/Storyboard/ThemeInfo.storyboard index f3000d4..91e1924 100644 --- a/Mongle/Mongle/Resource/Storyboard/ThemeInfo.storyboard +++ b/Mongle/Mongle/Resource/Storyboard/ThemeInfo.storyboard @@ -1,9 +1,11 @@ - + - + + + @@ -50,14 +52,14 @@ - + diff --git a/Mongle/Mongle/Source/VCs/ThemeInfoVC.swift b/Mongle/Mongle/Source/VCs/ThemeInfoVC.swift index e058b44..696d8f4 100644 --- a/Mongle/Mongle/Source/VCs/ThemeInfoVC.swift +++ b/Mongle/Mongle/Source/VCs/ThemeInfoVC.swift @@ -58,6 +58,7 @@ class ThemeInfoVC: UIViewController { func setInitLayout(){ themeBackgroundView.backgroundColor = .clear + if hasTheme { self.themeNameLabel.text = themeText ?? "" @@ -80,7 +81,7 @@ class ThemeInfoVC: UIViewController { $0.leading.equalToSuperview().offset(16) } } - + writeInThemeButton.makeRounded(cornerRadius: self.writeInThemeButton.bounds.height * 33 / 253) curatorProfileImageView.makeRounded(cornerRadius: curatorProfileImageView.frame.width / 2) sentencesBackgroundView.layer.cornerRadius = 25 sentencesBackgroundView.clipsToBounds = true From cfcb8b5d0b3c75c3ebc04d629c92bf459f4fa31d Mon Sep 17 00:00:00 2001 From: Juhyeoklee Date: Tue, 10 Nov 2020 19:52:43 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[fix]=20main=20view=20=EC=86=A1=ED=8E=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resource/Storyboard/MainTabMain.storyboard | 18 +++++++++--------- .../Resource/Storyboard/ThemeInfo.storyboard | 2 +- .../Source/Cell/MainPopularCuratorCVC.swift | 6 ++++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Mongle/Mongle/Resource/Storyboard/MainTabMain.storyboard b/Mongle/Mongle/Resource/Storyboard/MainTabMain.storyboard index 2818566..b70b73c 100644 --- a/Mongle/Mongle/Resource/Storyboard/MainTabMain.storyboard +++ b/Mongle/Mongle/Resource/Storyboard/MainTabMain.storyboard @@ -67,7 +67,7 @@ - + @@ -84,7 +84,7 @@