From 0fe7ebcee0863388b92ee5d874652ea55fc7ffd9 Mon Sep 17 00:00:00 2001 From: Kaiyin Zhong Date: Sat, 17 Dec 2016 15:28:21 +0100 Subject: [PATCH] fixed incorrect iphone contents.json issue --- .../UserInterfaceState.xcuserstate | Bin 23489 -> 24934 bytes genicon/dataModels.swift | 10 ++++++++-- genicon/generateJson.swift | 8 ++++---- genicon/main.swift | 12 ++++++------ 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/genicon.xcodeproj/project.xcworkspace/xcuserdata/kaiyin.xcuserdatad/UserInterfaceState.xcuserstate b/genicon.xcodeproj/project.xcworkspace/xcuserdata/kaiyin.xcuserdatad/UserInterfaceState.xcuserstate index be176a112b9c22f654632588798769744cdb1c05..5b44ceb75b9ea4cfc13d6a95e32c8b7db4a321b8 100644 GIT binary patch literal 24934 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
m z%#dLr*&(?hB_X3iYD4Nm8bTUFEFm*O7KN+{xiw^M$hwd_L+%cFC}eNQQz1`>JQH#_ z3TB*k<^t74|Ys+gmgtC+7?s92;}saUVrptx7DNztR&s@SG@Q1O`Jkm8u) zxZ;H3l;Vuytl}NTdy20V-zdIS{Gj+*@tfj`;?Kc&aKzw@!8L;y4Bj~SnZfT5{&Mi2 zp*WNdWkdN;*HHIR&rt7BpHRQh=+KzZxKM3qVrX(`YG`_BM(EJctk9fLbLi^OeWAxg zFAvcS$s00dNav6pL-q_gJmlFSuMYWO$frXtD_NzlGDI1zj8VoZwMv~*ugq5#DJzwA zN{g~xxk$NOxl(zPa*gs1<$C2^%6pU>l|9NQln0e3l;@ORDSr#YVRRT9#)r9vxrh0N zsl$@PhK6N_<%Si9RfbiEO%0nFwjk`*u(e@#gsl(T6t+L?P}qsEPr|+o`yuRdI33P~ zyM()i4+)PBPY6#9&ki3KJ|%p9_}cJ0!ncI)3f~|8RQPk@$HGsBp9}vi{EP6f!ha0^ zIs6wDqvBPrDi4*n%15PAC8|8easmMTY8sH#$pQPrp>s3xnXs7xwBb&G1NYP)Ku z>JinWs>fCPR8Of6st&83Q@yBqU-g0NW7T=pXR0q%U#l*uzE}OI`dRgx>i3925$cG7 zh?juX>YuxB9I5GxgO-_eifupGg16z{sG;*vO2? z%*dgUS&>zdQzGjlr$$;Ln<85x=S9wsToAb^a!us=$h#vqMsAAiirf+TP~;<#k48Qo z`9$Q2$RDEEDF3LisEDYjsF@ z#3sk4#b(3~i_M8Gi5(tW5j!%rDt1h4P3+>>4YAM0{u~z=7a5ljml~HIml>B8R}wcW zt~#zJZhTy8+{`#z+^o3HxcPCrSgX>;Xydhs+7xY?)}SrYmT1egmD(!p7;TMqhSsJPw9BQ zeM$ExbtiqCbSdd_(jUnvnNH@CU6cKj1CxW32PZ3&Rmtk)>SU6?xhLhJl;bIHr+k|7Rm#Pb z?^1qF`7Py2%GFdpRgtPrjZTe)`(1NVi&M)|%Tq_Dj!s>ddSB{})Lp5MrS46AD)nIM z;nZhSkER|^y^wk_%_}V+EiJ7qttM?;+W54IX_mC6wAQrtw2rjdX-m_Vr>#s|o%VLx zr)l4%{h0Pk+U2xA(owp5x>veSx_|nh^q};R^z`(R>2uPTr$3UuFa2=(Yw2gwKS{r; z!#YOC>)dpnI+@N-H%J$xQ|N~1!gXq0o-SWks4LM8*H!37>8f=#x(T|;I+LzJ*Qm4T zX6feW=IR#cUemp;dsp|q?!%0tjL{imGHNm=WNgaVnelMOu8hYr{>XI8^vLwe^ciX% z+CJ1abk@+$p+60yhB3pqVXnhUhK(6kGi>~@NyD}bdvw^IVS9(|&yr`Uv!b#zS#epm zEFo)2*0QXXS+8fkll5NKxvY<}qq0-8)3YE`M*@v^A%YH5UjqDTI zr?TJ5emnceoRAz%&d8kcIrTYBIh{F+bC%_-%vqgtOU_+68*=W;xj&~nXG_kZoKJIp z%vI#7bG5m;+=AQ@xs|z9xnpw2<<{kzbEoA_&uz|a&Alo2(cDA1pXGj=dpVEF^Ujm! zh2(|ih2=%$#pfmFrR1gMW#kRb%g-C0SDjavHzThlZ)Tn?Z+0HZTavdtZ)M)4>E(KrK2e{k&(i1W4SJ)#Tt8AjT0cf#qaUxY*Ei`q^^5gO^~?1u^*8D7 z(BG-QN54_ONxxbDp#BN{Vg2j+Gy1docl7V+&*?wYf2sdQe@Xwn{zv^E2F~DZP#DyP zXhW<)Ye+H-HDnv|3^krwnHdZyVk_sI9km*xBB`{xhNSLUno)%nr+ zG5IO^x%nmeWAbbB>+;R{)ADEJ+wy1U&&{8ozYso^Se1W!{{8vg`CIe1=kLsaIRB~q zr}Ll5KT;4@pe;x$NG;G63@ykis3|ZNG!!%zSPJGA+)=Q;;O>Hr1)B=48hNA4m|#pd zRvTv+=NRW17a9fQQsZ*tI^!nePUF+YL&j%~FBo4ozG^&XeA9T!c)|F&@k`^^#!JTU zjXxQGHC{GeDdY-$3S$cOg<}e56fP;ew{Uym>xHKZPZypq{I2kF;U7h)h%Vxayo-E` z0*d5CAw`3WVv6F5v_(lpvx}A%EiYPGw7Td_(I-V0iasm)vN)+Yr#P?JP;4w-R(yN$ zUBw%U?;(f)3i;otcDSo&3T=7T6pB8^n{B`lg;$KRb64w%s67LfK zlE9MS5=Du+B)LRaGPESS#86@^DK053sVbRL(pWORq`9Q6WOm8ik_9ECWO2#flH(;` zlzd4h7X9Er5(y68EN)MMFEj?a(w)8^j z*QJ+Azc2l%^h)WUWmFkk#+S*;e9Poz>aw`9gtFwaw6d(S+%iL%v8<@9vaG6XQrYyf znPs-J*=2LfgtDb&E6Q#vTT`~a?B24iWe=D8mIsuFmdBN+ln*U0Dj!`wwtRf~r1B}{ z_2pB`t>v@I=akPYUsz7c7nd(Bf3W;m`L7k>6|og56fNiaixiRP3*Kq2i^AqZO}J23JN^YARzZwUxsv svnz8e4VBv~_g3z!e6sTCk*bktBZrR6lR{_|CH-{i{V6>`Oxf`N0PcZ#AOHXW delta 13178 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 Contents { +public func generateContents(sizes: [Int], scales: [Int], platform: Platform) -> Contents { var contents = Contents() for sz in sizes { for sc in scales { - let img = ImageInfo(size: sz, scale: sc) + let img = ImageInfo(size: sz, scale: sc, platform: platform) contents.images.append(img) } } @@ -21,5 +21,5 @@ public func generateContents(sizes: [Int], scales: [Int]) -> Contents { public let macSizes = [16, 32, 128, 512] public let macScales = [1, 2] -public let iosSizes = [20, 29, 40, 60] -public let iosScales = [2, 3] +public let iphoneSizes = [20, 29, 40, 60] +public let iphoneScales = [2, 3] diff --git a/genicon/main.swift b/genicon/main.swift index ba4f5de..59e8bc0 100644 --- a/genicon/main.swift +++ b/genicon/main.swift @@ -10,7 +10,7 @@ import Foundation let args = CommandLine.arguments if args.contains("--help") || args.contains("-h") || args.dropFirst().isEmpty { - print("\n genicon: A command line tool for generating icons for Cocoa apps.\n", "© Kaiyin Zhong 2016\n\n", "Usage: \n", "genicon [options] INPUT OUTPUT_FOLDER\n\n", "--help, -h Print this message.\n", "--mac Generate icons for macOS.\n", "--ios Generate icons for iOS. When neither --mac nor --ios is given, mac icons are generated by default.\n") + print("\n genicon: A command line tool for generating icons for Cocoa apps.\n", "© Kaiyin Zhong 2016\n\n", "Usage: \n", "genicon [options] INPUT OUTPUT_FOLDER\n\n", "--help, -h Print this message.\n", "--mac Generate icons for macOS.\n", "--iphone Generate icons for iPhone. When neither --mac nor --iphone is given, mac icons are generated by default.\n") exit(0) } @@ -39,11 +39,11 @@ do { // generate Contents.json var contents: Contents = Contents() -// when neither --mac nor --ios is given, mac icons are generated by default. -if args.contains("--mac") || !args.contains("--ios"){ - contents = generateContents(sizes: macSizes, scales: macScales) -} else if args.contains("--ios") { - contents = generateContents(sizes: iosSizes, scales: iosScales) +// when neither --mac nor --iphone is given, mac icons are generated by default. +if args.contains("--mac") || !args.contains("--iphone"){ + contents = generateContents(sizes: macSizes, scales: macScales, platform: .mac) +} else if args.contains("--iphone") { + contents = generateContents(sizes: iphoneSizes, scales: iphoneScales, platform: .iphone) } let jsonFilename = "Contents.json"