From 8da5afbd1e074ef5a7e2c138c6c9d09118457891 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Wed, 26 Sep 2012 13:30:46 +0200 Subject: [PATCH] Add retina icons to bundle and simplify bundle loading --- .../images/nextIcon@2x.png | Bin 0 -> 1316 bytes .../images/previousIcon@2x.png | Bin 0 -> 1294 bytes src/KTPhotoBrowser/KTPhotoBrowserGlobal.h | 20 -------------- src/KTPhotoBrowser/KTPhotoBrowserGlobal.m | 26 ------------------ .../KTPhotoScrollViewController.m | 5 ++-- 5 files changed, 2 insertions(+), 49 deletions(-) create mode 100644 src/KTPhotoBrowser/KTPhotoBrowser.bundle/images/nextIcon@2x.png create mode 100644 src/KTPhotoBrowser/KTPhotoBrowser.bundle/images/previousIcon@2x.png delete mode 100644 src/KTPhotoBrowser/KTPhotoBrowserGlobal.h delete mode 100644 src/KTPhotoBrowser/KTPhotoBrowserGlobal.m diff --git a/src/KTPhotoBrowser/KTPhotoBrowser.bundle/images/nextIcon@2x.png b/src/KTPhotoBrowser/KTPhotoBrowser.bundle/images/nextIcon@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..65691abb36c85bed941cf9be8b7ffd4421433f42 GIT binary patch literal 1316 zcmeAS@N?(olHy`uVBq!ia0vp^IzX(#!3HEhUB8h7q$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~;1FfglRhD4M^`1)8S=jZArg4F0$^BXQ!4Z zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Kep0RGSfuW&-nVFuU ziK&^Hp^k!)fuWJU0T7w#8k$&{npqi{D?ot~(6*wKG^-#NH>h1eo~=?wNlAf~zJ7Um zxn8-kUVc%!zM-Y1CCCgTBVC{h-Qvo;lEez#ykcdT2`;I{$wiq3C7Jno3Lp~`lk!VT zY?Xj6g?J&i0B&qvF*KNf0j6J(SfFpHX8`gNOrftYexnUy@&(kzb(T9Bihb;hUJ8nFkWk z1ncniwerj>E=kNwPW5!LRRWr!mzkMjW#HmuV(4OS>E`C@W@zYY=;-3+YGLBy>g?!j zVPRq91k>x1pIn-onpXnTn}X2mh*K{pG2|8iZFWg5$}CGwaVyHtRRDY1DigO`%yF6r z)tiFbEfzTS>H{644~kl(sD=pv(+`LVPq;u1Jn5(A0n>XCFkv@5dv}z9fpMCri(^Q| ztt&UqYP$r=9Q$a!J@CevW2gMgyu!j3=}eh)T}LDE)Tu*mL4O$kF|3X}amdX_Cuf6# zSX_{o=S`okSwWYssC+7`?LT)V*2nUU?e(9wUvHkBGjHAFJNIY02(ZjMs*}XFK2UeY zh8T-}Zk|VmU97d|>uwdcRB5(`N)>d80jaDF{fR(IYh#zCX6yd{7dJMjhInYioMG8E zaZ*skQs?;!rOVhve%RK4IV;W|$_k_{E$Z8TZvDmH|3&BQGhJ#UD-{w(lsnp`B-x%$J_y5iK+^YoK7s#l~p<%o3O)Z5eKr@tuve&{|H Z2?o2jar+n!CLITrTb{0dF6*2UngBJH+ywvt literal 0 HcmV?d00001 diff --git a/src/KTPhotoBrowser/KTPhotoBrowser.bundle/images/previousIcon@2x.png b/src/KTPhotoBrowser/KTPhotoBrowser.bundle/images/previousIcon@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..83bec99bbe1997a656eaf52012c5dd71b8a38fe1 GIT binary patch literal 1294 zcmeAS@N?(olHy`uVBq!ia0vp^IzX(#!3HEhUB8h7q$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~;1FfglRhD4M^`1)8S=jZArg4F0$^BXQ!4Z zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Kep0RGSfuW&-nVFuU ziK&^Hp^k!)fuWJU0T7w#8k$&{npqi{D?ot~(6*wKG^-#NH>h1eo~=?wNlAf~zJ7Um zxn8-kUVc%!zM-Y1CCCgTBVC{h-Qvo;lEez#ykcdT2`;I{$wiq3C7Jno3Lp~`lk!VT zY?Xj6g?J&i0B&qvF*KNf0j6J(SfFpHX8`gNOrftYexnUy@&(kzb(T9Bihb;hUJ8nFkWk z1ncniwerj>E=kNwPW5!LRRWr!mzkMjW$5f?Vde-V-CW%a4P6Z#UEEwPOk7-@9i1&K zER39BdR_99OLJ56N?>|Z5PDs3>IEf++ybD@E~!PCWvMA{Mftf3U{70RVsVRsi<60= zi@6(4^PqZDu($=H*TMj&UVWfr^g&UJ6xA>xVEO?u;RzSWfhYacJYae+0w(N3mJfs( z7#JHoT^vIyZr!=ztL+jfbNu7~xdMv(rmCJPi%phJnWdBC(#6W1-_SZ$lsm4mbuOzk z_oo{tDo*t+t>iAd*EnhE(XV?;{bMill%J{nA;16Eo3v%|%Zty=DVDijs(Q#Ikv&@| zcn$}5`NEFCl4GG3!WZB3Jd~U)RJ=%Ijyvb!Ne-`c_q3>|s4lz`Tp|2CV;all5AE+w zlK4+ga>~-Z)9CHv>9um{2ZncsN}6hK>}>j^zqI^#qrUF4&YlM0EgemNwt27lT^#0m zbH3Y+*|&E`h^DR#*&!=FL$p;>|4uvm6PL`U*5d`;ae*?y6>`fngrA=L(f)Q3Z>n#i zyN*|Z*PMk{ryaVcYc;vOE>&{tdZdMdXe^d_GcUNPjj$uZhXs;f4x&iU%YV5 z(<9&X`9G*N@8B+UtrAz&w_iWwz~X1p?n^IzK6jFRn}}I)32Su0R=r(WALp&&d;0se z|C(ZpuIJbG>~Buls=F&o^XJm|oEbs~OCEdaR9^V@sV!6HsO6z}CLV?pr*d5U=H-A2 OI0jEwKbLh*2~7YHchU?1 literal 0 HcmV?d00001 diff --git a/src/KTPhotoBrowser/KTPhotoBrowserGlobal.h b/src/KTPhotoBrowser/KTPhotoBrowserGlobal.h deleted file mode 100644 index 97418cd..0000000 --- a/src/KTPhotoBrowser/KTPhotoBrowserGlobal.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// KTPhotoBrowserGlobal.h -// Sample -// -// Created by Kirby Turner on 2/11/10. -// Copyright 2010 White Peak Software Inc. All rights reserved. -// - -#import - - -/** - * Returns the main bundle path concatenated with the given relative path. - */ -NSString * KTPathForBundleResource(NSString *relativePath); - -/** - * Returns the image with the given name from the KTPhotoBrowser.bundle path. - */ -UIImage * KTLoadImageFromBundle(NSString *imageName); \ No newline at end of file diff --git a/src/KTPhotoBrowser/KTPhotoBrowserGlobal.m b/src/KTPhotoBrowser/KTPhotoBrowserGlobal.m deleted file mode 100644 index ea00b1e..0000000 --- a/src/KTPhotoBrowser/KTPhotoBrowserGlobal.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// KTPhotoBrowserGlobal.m -// Sample -// -// Created by Kirby Turner on 2/11/10. -// Copyright 2010 White Peak Software Inc. All rights reserved. -// - -#import "KTPhotoBrowserGlobal.h" - - -/////////////////////// - -NSString * KTPathForBundleResource(NSString *relativePath) { - NSString *resourcePath = [[NSBundle mainBundle] resourcePath]; - return [resourcePath stringByAppendingPathComponent:relativePath]; -} - -/////////////////////// - -UIImage * KTLoadImageFromBundle(NSString *imageName) { - NSString *relativePath = [NSString stringWithFormat:@"KTPhotoBrowser.bundle/images/%@", imageName]; - NSString *path = KTPathForBundleResource(relativePath); - NSData *data = [NSData dataWithContentsOfFile:path]; - return [UIImage imageWithData:data]; -} \ No newline at end of file diff --git a/src/KTPhotoBrowser/KTPhotoScrollViewController.m b/src/KTPhotoBrowser/KTPhotoScrollViewController.m index 81062ac..eef8571 100644 --- a/src/KTPhotoBrowser/KTPhotoScrollViewController.m +++ b/src/KTPhotoBrowser/KTPhotoScrollViewController.m @@ -8,7 +8,6 @@ #import "KTPhotoScrollViewController.h" #import "KTPhotoBrowserDataSource.h" -#import "KTPhotoBrowserGlobal.h" #import "KTPhotoView.h" const CGFloat ktkDefaultPortraitToolbarHeight = 44; @@ -98,13 +97,13 @@ - (void)loadView [newView release]; nextButton_ = [[UIBarButtonItem alloc] - initWithImage:KTLoadImageFromBundle(@"nextIcon.png") + initWithImage:[UIImage imageNamed:@"KTPhotoBrowser.bundle/images/nextIcon.png"] style:UIBarButtonItemStylePlain target:self action:@selector(nextPhoto)]; previousButton_ = [[UIBarButtonItem alloc] - initWithImage:KTLoadImageFromBundle(@"previousIcon.png") + initWithImage:[UIImage imageNamed:@"KTPhotoBrowser.bundle/images/previousIcon.png"] style:UIBarButtonItemStylePlain target:self action:@selector(previousPhoto)];