Added support for loading resolution independent images ([UIImage imageWithContentsOfFile:] is broken) via UIImage

category and updated NSBundle additions to leverage the support.
2026-06-17 05:29:58 +08:00 · 2012-02-24 18:03:23 -05:00
parent 5ae94287e9
commit eeecff7bd0
5 changed files with 93 additions and 1 deletions
--- a/Code/Support/NSBundle+RKAdditions.m
+++ b/Code/Support/NSBundle+RKAdditions.m
@@ -20,6 +20,7 @@

 #import "NSBundle+RKAdditions.h"
 #import "NSString+RestKit.h"
+#import "UIImage+RKAdditions.h"
 #import "RKLog.h"
 #import "RKParser.h"
 #import "RKParserRegistry.h"
@@ -73,7 +74,7 @@
        return nil;
    }

-    return [UIImage imageWithContentsOfFile:resourcePath];
+    return [UIImage imageWithContentsOfResolutionIndependentFile:resourcePath];
 }
 #endif

--- a/Code/UI/UI.h
+++ b/Code/UI/UI.h
@@ -31,5 +31,6 @@
 #import "RKTableView.h"
 #import "RKRefreshTriggerView.h"
 #import "RKObjectManager+RKTableController.h"
+#import "UIImage+RKAdditions.h"

 #endif
--- a/Code/UI/UIImage+RKAdditions.h
+++ b/Code/UI/UIImage+RKAdditions.h
@@ -0,0 +1,42 @@
+//
+//  UIImage+RKAdditions.h
+//  RestKit
+//
+//  Created by Blake Watters on 2/24/12.
+//  Copyright (c) 2012 RestKit. All rights reserved.
+//
+
+#if TARGET_OS_IPHONE
+#import <UIKit/UIKit.h>
+
+/**
+ Provides useful extensions to the UIImage interface.
+
+ Resolution indepdence helpers borrowed from:
+ http://atastypixel.com/blog/uiimage-resolution-independence-and-the-iphone-4s-retina-display/
+ */
+@interface UIImage (RKAdditions)
+
+/**
+ Creates and returns an image object by loading the image data from the file at the specified path
+ appropriate for the resolution of the device.
+
+ @param path The full or partial path to the file, possibly including an @2x retina image.
+ @return A new image object for the specified file, or an image for the @2x version of the specified file,
+ or nil if the method could not initialize the image from the specified file.
+ */
+ (UIImage *)imageWithContentsOfResolutionIndependentFile:(NSString *)path;
+
+/**
+ Initializes an image object by loading the image data from the file at the specified path
+ appropriate for the resolution of the device.
+
+ @param path The full or partial path to the file, possibly including an @2x retina image.
+ @return The initialized image object for the specified file, or for the @2x version of the specified file,
+ or nil if the method could not initialize the image from the specified file.
+ */
+- (id)initWithContentsOfResolutionIndependentFile:(NSString *)path;
+
+@end
+
+#endif
--- a/Code/UI/UIImage+RKAdditions.m
+++ b/Code/UI/UIImage+RKAdditions.m
@@ -0,0 +1,36 @@
+//
+//  UIImage+RKAdditions.m
+//  RestKit
+//
+//  Created by Blake Watters on 2/24/12.
+//  Copyright (c) 2012 RestKit. All rights reserved.
+//
+
+#import "UIImage+RKAdditions.h"
+
+#if TARGET_OS_IPHONE
+
+@implementation UIImage (RKAdditions)
+
+- (id)initWithContentsOfResolutionIndependentFile:(NSString *)path {
+    if ( [[[UIDevice currentDevice] systemVersion] intValue] >= 4 && [[UIScreen mainScreen] scale] == 2.0 ) {
+        NSString *path2x = [[path stringByDeletingLastPathComponent]
+                            stringByAppendingPathComponent:[NSString stringWithFormat:@"%@@2x.%@",
+                                                            [[path lastPathComponent] stringByDeletingPathExtension],
+                                                            [path pathExtension]]];
+
+        if ( [[NSFileManager defaultManager] fileExistsAtPath:path2x] ) {
+            return [self initWithCGImage:[[UIImage imageWithData:[NSData dataWithContentsOfFile:path2x]] CGImage] scale:2.0 orientation:UIImageOrientationUp];
+        }
+    }
+
+    return [self initWithData:[NSData dataWithContentsOfFile:path]];
+}
+
+ (UIImage *)imageWithContentsOfResolutionIndependentFile:(NSString *)path {
+    return [[[UIImage alloc] initWithContentsOfResolutionIndependentFile:path] autorelease];
+}
+
+@end
+
+#endif
--- a/RestKit.xcodeproj/project.pbxproj
+++ b/RestKit.xcodeproj/project.pbxproj
@@ -662,6 +662,10 @@
 		25EC1B1314F8079800C3CF3F /* grayArrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1AE314F8022600C3CF3F /* grayArrow@2x.png */; };
 		25EC1B1414F8079800C3CF3F /* whiteArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1AE414F8022600C3CF3F /* whiteArrow.png */; };
 		25EC1B1514F8079800C3CF3F /* whiteArrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 25EC1AE514F8022600C3CF3F /* whiteArrow@2x.png */; };
+		25EC1B3914F84B5D00C3CF3F /* UIImage+RKAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 25EC1B3714F84B5C00C3CF3F /* UIImage+RKAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		25EC1B3A14F84B5D00C3CF3F /* UIImage+RKAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 25EC1B3714F84B5C00C3CF3F /* UIImage+RKAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		25EC1B3B14F84B5D00C3CF3F /* UIImage+RKAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 25EC1B3814F84B5C00C3CF3F /* UIImage+RKAdditions.m */; };
+		25EC1B3C14F84B5D00C3CF3F /* UIImage+RKAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 25EC1B3814F84B5C00C3CF3F /* UIImage+RKAdditions.m */; };
 		25FABED014E3796400E609E7 /* RKTestNotificationObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 252EFAFD14D8EB30004863C8 /* RKTestNotificationObserver.m */; };
 		25FABED114E3796400E609E7 /* RKTestNotificationObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 252EFAFD14D8EB30004863C8 /* RKTestNotificationObserver.m */; };
 		25FABED214E3796B00E609E7 /* RKTestNotificationObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 252EFAFC14D8EB30004863C8 /* RKTestNotificationObserver.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1134,6 +1138,8 @@
 		25EC1B0014F8078100C3CF3F /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
 		25EC1B1E14F821B500C3CF3F /* RestKitResources-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RestKitResources-Prefix.pch"; sourceTree = "<group>"; };
 		25EC1B1F14F8220800C3CF3F /* RestKitResources-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "RestKitResources-Info.plist"; sourceTree = "<group>"; };
+		25EC1B3714F84B5C00C3CF3F /* UIImage+RKAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+RKAdditions.h"; sourceTree = "<group>"; };
+		25EC1B3814F84B5C00C3CF3F /* UIImage+RKAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+RKAdditions.m"; sourceTree = "<group>"; };
 		25FABED414E37A2B00E609E7 /* RKTestResponseLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RKTestResponseLoader.h; path = Testing/RKTestResponseLoader.h; sourceTree = "<group>"; };
 		25FABED514E37A2B00E609E7 /* RKTestResponseLoader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RKTestResponseLoader.m; path = Testing/RKTestResponseLoader.m; sourceTree = "<group>"; };
 		49A66B0814CEFB0400A6F062 /* LICENCE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENCE; path = XMLReader/LICENCE; sourceTree = "<group>"; };
@@ -1947,6 +1953,8 @@
 				25B6E91D14CF778D00B1E881 /* UIView+FindFirstResponder.m */,
 				25EC1A2A14F6FDAC00C3CF3F /* RKObjectManager+RKTableController.h */,
 				25EC1A2B14F6FDAC00C3CF3F /* RKObjectManager+RKTableController.m */,
+				25EC1B3714F84B5C00C3CF3F /* UIImage+RKAdditions.h */,
+				25EC1B3814F84B5C00C3CF3F /* UIImage+RKAdditions.m */,
 			);
 			path = UI;
 			sourceTree = "<group>";
@@ -2191,6 +2199,7 @@
 				25EC1A6314F7402A00C3CF3F /* RKManagedObjectMappingCache.h in Headers */,
 				25EC1ABC14F8019F00C3CF3F /* RKRefreshGestureRecognizer.h in Headers */,
 				25EC1AC014F8019F00C3CF3F /* RKRefreshTriggerView.h in Headers */,
+				25EC1B3914F84B5D00C3CF3F /* UIImage+RKAdditions.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2308,6 +2317,7 @@
 				25EC1A6514F7402A00C3CF3F /* RKManagedObjectMappingCache.h in Headers */,
 				25EC1ABD14F8019F00C3CF3F /* RKRefreshGestureRecognizer.h in Headers */,
 				25EC1AC114F8019F00C3CF3F /* RKRefreshTriggerView.h in Headers */,
+				25EC1B3A14F84B5D00C3CF3F /* UIImage+RKAdditions.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2705,6 +2715,7 @@
 				25EC1A4514F7393D00C3CF3F /* RKObjectMappingProviderContextEntry.m in Sources */,
 				25EC1ABE14F8019F00C3CF3F /* RKRefreshGestureRecognizer.m in Sources */,
 				25EC1AC214F8019F00C3CF3F /* RKRefreshTriggerView.m in Sources */,
+				25EC1B3B14F84B5D00C3CF3F /* UIImage+RKAdditions.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2878,6 +2889,7 @@
 				25EC1A4614F7393E00C3CF3F /* RKObjectMappingProviderContextEntry.m in Sources */,
 				25EC1ABF14F8019F00C3CF3F /* RKRefreshGestureRecognizer.m in Sources */,
 				25EC1AC314F8019F00C3CF3F /* RKRefreshTriggerView.m in Sources */,
+				25EC1B3C14F84B5D00C3CF3F /* UIImage+RKAdditions.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};