From f511efdb0ba08a57c89ab6b7e4cad7630a6a145c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesu=CC=81s=20A=2E=20A=CC=81lvarez?= Date: Mon, 6 Jun 2016 19:29:53 +0200 Subject: [PATCH] match floppy icons with mac icons --- .../floppy.imageset/floppy.png | Bin 265 -> 241 bytes .../floppy.imageset/floppy@2x.png | Bin 508 -> 411 bytes .../floppy.imageset/floppy@3x.png | Bin 798 -> 661 bytes .../floppyV.imageset/Contents.json | 23 ++++++++++++++++++ .../floppyV.imageset/floppyV.png | Bin 0 -> 279 bytes .../floppyV.imageset/floppyV@2x.png | Bin 0 -> 467 bytes .../floppyV.imageset/floppyV@3x.png | Bin 0 -> 731 bytes Mini vMac/InsertDiskViewController.m | 6 +++-- 8 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 Mini vMac/Assets.xcassets/floppyV.imageset/Contents.json create mode 100644 Mini vMac/Assets.xcassets/floppyV.imageset/floppyV.png create mode 100644 Mini vMac/Assets.xcassets/floppyV.imageset/floppyV@2x.png create mode 100644 Mini vMac/Assets.xcassets/floppyV.imageset/floppyV@3x.png diff --git a/Mini vMac/Assets.xcassets/floppy.imageset/floppy.png b/Mini vMac/Assets.xcassets/floppy.imageset/floppy.png index 88aea8675f60cbb6ca82555e32ebd9b82b0d9695..2d052d7ce92c58ab72506e81387520b4d933395a 100644 GIT binary patch delta 213 zcmV;`04o290`UQmB!9R`L_t(|0qxNzb^>7(1>jHpcou+~U8GvJLmZxEh4gG>TpW&` z-rsbSdf)VW&Nq$BsioW2Gjjl38%Y3el_d0sZXCc$LOC#$yOkS;{+YO?63FdhS1$I4 zX7#}ByM63$zcUcOL3<$ng?eD2uRMK=I$&bqwsaOIbwF*tH%{;m3{0)v){nKRK?J78 zk|s&UrV&_6nkHFC;8vU5{xaYnSW2CNo+YP7QYWD2$Q79@OSjt3(y8nYdtlf{d_?5w P00000NkvXXu0mjfS-fQs delta 237 zcmVTB!AFJL_t(|0qxSoRRd7~1<<=0*+K;noQ^00U%@tw#Zw72kRNyV zY|uA8@0|Pp2-!ZjtUpmay* z-Fg|0sF{4Hn><5!gbDB7M(O`_BqRZJOq_c!Tj`0%zR5tg+|#cK2cmK4soTC!L_vN! z|HSFHgsJEP8v@KBT#6?}fR>?|h?$|*{P}MQAH=N!K+C0kseenYx%1x;A`}3I;@B(j z%CQ*Eo&Q2ODF@8ND*&&=Y{B`*BISU{&)4VAS3m{)<$&_nkjUmgMCE|;PjNY*{LiQW zP>^!KrP#M>_QgdRpf82(mjUkSyO0%oq3>=PpgjIkKm}Al1yn!&$&UZ$x`OU@Uqzk)9aO2Q=coP2|34<^v)&m7kug0xF;aDxd-? zpaLr3y|}#-z%B8fbMbU1fG6UTi8$N|perVHM5F78TU!I%_Ec9RIxvtObpUW+;?f7% eQr|l_(Sc8l$6}?3fiPMC0000lbp9H#h6>eI>?8P#nFn_yPg1#}Pf zrVC&tX{4?pzcRw%S zGrHFEz6kT%_8Ej!z#HM(`q6dab@tvmAstW_CfAQ9glhJFolr^#tO~vBM?FHL$$deH zbU=vh$Ib3r184|6-30s;`qz(og?eWJ6=7=qXi_M57Vt*6zJ7E~c+*+Hg7C$8qia3q zvoN0wNdGBL2Y;mh8Knc(zhVc;`j1i?pe!6eAfd+zp_~S|DH3}t4KU!AvW7T78{WC8 zKMl~X{P}d2_-z}Qat5xYWW65{nR5swbu&5nb z5}suP%EF9xWJV}u1L{JrcBD`El?@1?T?z3A0&+kO$Xfw9AP3}t9FPNYKn}c)d9C zYq?N~q45E~T7g?%44<{8IHhPC1IeyH%ltOWWIg}IOUI*Y>}+1;g*H#e^- zY*-pp%U_;ye%mp|Z6044ds5Cf9%JP5D&?sCk}oO6dgFlf%5MwL=Bmo1aC@K3<~=+sR2-;wT6>)DOhLP1EtiTtqf+x+m(KeC Q=?p;N>FVdQ&MBb@0L1|^TmS$7 delta 774 zcmV+h1Nr=w1)c_wB!A^eL_t(|0qxvHa$7+V#_|6Xgv@Y&Ff(WG1K1~!*7hdMoWp2i zyh9jwL9=&ZGh^3;rc7gJ{4`bF;!kh7`ezhlDn*87+8AJh={(%MVGAr=M`&d_&v#u5 z6OJ$_n*>To(E#jUC|J0^D`8N=La%@`^jN=;J)Bvnzbj!vqNGQ_$$9_E4RX@GzfG{0 z`2egp|6{&TOC?ZA9bY7AWxacUo8TXil~q63#h=>4Pf4@x{cVDOK%=a>YNa1?o$3p=0%BoT;Es?Z81VG!o{|638`Y8Z_`A>Y^O0P=V7y=+G ztA4VFKedY=l4d;sJl-0uGq*--ty`lW0sij~_y_pEM}OuY;Qu~x3;+-1A21?Y7T~7} z%nfXhfcLWH4L0$=E26;MM|8 zXqEg3ao17vY??E`er_wSDw8>S-2vm0r--}KGRL?xz~m8eS7iRRtq_nmHyIS500ra^ zKmiI+fC3bt00k&O0SZun0u-PC1t>rP3Q&Lo6n~%q^LE_e07*$FU_j0k1qUdUbP(F) z%)a0NdnE0G7CCb zLG1=PVtqJFP`giNd{b#Mw9v&M6L~%M1Ov3uOokLvGvr*^z@MxuFaQ7m07*qoM6N<$ Ef>x4eBLDyZ diff --git a/Mini vMac/Assets.xcassets/floppyV.imageset/Contents.json b/Mini vMac/Assets.xcassets/floppyV.imageset/Contents.json new file mode 100644 index 0000000..6aa05a2 --- /dev/null +++ b/Mini vMac/Assets.xcassets/floppyV.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "floppyV.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "floppyV@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "floppyV@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Mini vMac/Assets.xcassets/floppyV.imageset/floppyV.png b/Mini vMac/Assets.xcassets/floppyV.imageset/floppyV.png new file mode 100644 index 0000000000000000000000000000000000000000..c930d168f1eeef324551df42f6892acd7a29c075 GIT binary patch literal 279 zcmV+y0qFjTP)kdg0002qNklPbr>Fx1;J4cjV>WMd2#|gl_ zn#?$1bH@FO=P}Wju>q)h6dqN_{Y4_!2s}E#fyZ%wkw^hC-mmCabUp?UzZFP)!~~G| zjR~NuXnl&hDWIV%)>c;|1tjy&fs%6rk*I-lrPaW>x=bpWy7Se*Kn7{TU^Nh4oA@h0 z2yndB(UQLx$hUjjJvr|K#^c@zjK{qnkn?U}t0Vu0-`JDA8z|^;sU~|DP;lywvO7KT dj_SEoegP$n^t5BS6$k(T002ovPDHLkV1g|odk+8r literal 0 HcmV?d00001 diff --git a/Mini vMac/Assets.xcassets/floppyV.imageset/floppyV@2x.png b/Mini vMac/Assets.xcassets/floppyV.imageset/floppyV@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..29b4c9ca994edd1f5b380e0a3a1b02d1ddfd9830 GIT binary patch literal 467 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7`%AFwXLHaSW+oe0x>BK-y7)^@0A} zW#u}4!4|?(fA+K<{n@i|!A}y)T1NQZL!Tj z>$|^Fjo@@G24(h7cV#5zZip993SkgSI-UIC#whs9crNj8U^HO(SLbllF@!-%=BQ{x*Xb2<0rj%inYDuWEderBFi70K==t}>8wq{x8xus&A2Vv$_#@$2+pmJd zXV?wxY!lqitT8g)SX||xo)?jt*YWO4Lr19kCM%#m24;nzKhOJW1vkF;D|U#yFA;Ff zoNdb2UdGhgWFS{2;L3J(k*~U_+^G!@&Hm`?nTOtUXt&S6?}v-E-Y=11r6-7;;=?{T0gjw54e!F+V$J$ zt~7c<>0gXs50JC&ir+?8$k|!xUyNW6kgfD_y}v@Zo+UsC^8dL42tWV=5P$##AOPiW z%=riCH>dpr^gA^60PDMy{sH=(diMbRVHJmf5@ipN2VmORR6BK_Fa*d$@JCGuZH}hy zw=4l?m^S}7V+mNmIpg@}SYQSa!WnLvJP9?yEzU@MLx6n+AOHafKmY;|0Dl#LIvvJ& z(x=xFP4I+qI@JFcU=>%HuHfS;t4abS{tKon`gp;rvVgiA`X4yS8XEMY8m!?YALLl5 zmjiSp{t*4HAt7|i0mjqpNvf!mY2V}J08i5F8mg!@Y2Qyu0Mr-b*jGa?R7(M5w%V(z z00bZa0SG_<0`M=p?6Fmi;a}#5spSOF-X9bY>xdJ49t^kRjD?sAs3Xu4@0wjK}0Er)WDFfghAkP4J2I$Woyi30< z$qukM&Ams~G}w|IU{jjAFN*@OKRdvIG&c%eby)_lfOWi1b6se0O9%(p#9|t*0S%V0 zh5Zu$7A<9I689hP8B`XBasP2s;!CyYGRA%0GvPY+1n;=bC|#PQngNmKn;-E_H;MoN N002ovPDHLkV1iG1Ret~g literal 0 HcmV?d00001 diff --git a/Mini vMac/InsertDiskViewController.m b/Mini vMac/InsertDiskViewController.m index b61d973..d609d3b 100644 --- a/Mini vMac/InsertDiskViewController.m +++ b/Mini vMac/InsertDiskViewController.m @@ -523,13 +523,15 @@ _filePath = filePath; NSString *fileName = filePath.lastPathComponent; self.textLabel.text = self.showExtension ? fileName : fileName.stringByDeletingPathExtension; - NSDictionary *attributes = [[NSURL fileURLWithPath:filePath] resourceValuesForKeys:@[NSURLTotalFileSizeKey] error:NULL]; + NSDictionary *attributes = [[NSURL fileURLWithPath:filePath] resourceValuesForKeys:@[NSURLTotalFileSizeKey, NSURLFileSizeKey] error:NULL]; if (attributes && attributes[NSURLTotalFileSizeKey]) { BOOL isDiskImage = [[AppDelegate sharedInstance].diskImageExtensions containsObject:fileName.pathExtension.lowercaseString]; if (isDiskImage) { UIImage *icon = [UIImage imageWithIconForDiskImage:filePath]; if (icon == nil) { - icon = [UIImage imageNamed:@"floppy"]; + NSInteger fileSize = [attributes[NSURLTotalFileSizeKey] integerValue]; + NSInteger numBlocks = fileSize / 512; + icon = [UIImage imageNamed:numBlocks == 800 || numBlocks == 1600 ? @"floppy" : @"floppyV"]; } self.imageView.image = icon; } else {