Initial commit for facebook#930 fix

aroth · May 1, 2015 · 453064b · 453064b
1 parent f8a4467
commit 453064b
Show file tree

Hide file tree

Showing 8 changed files with 18,760 additions and 8 deletions.
diff --git a/Examples/UIExplorer/CameraRollExample.ios.js b/Examples/UIExplorer/CameraRollExample.ios.js
@@ -72,6 +72,7 @@ var CameraRollExample = React.createClass({
         <Image
           source={asset.node.image}
           style={imageStyle}
+          representation={'thumbnail'}
         />
         <View style={styles.info}>
           <Text style={styles.url}>{asset.node.image.uri}</Text>

diff --git a/Examples/UIExplorer/CameraRollView.ios.js b/Examples/UIExplorer/CameraRollView.ios.js
@@ -75,6 +75,7 @@ var CameraRollView = React.createClass({
         return (
           <Image
             source={asset.node.image}
+            representation={'thumbnail'}
             style={imageStyle}
           />
         );

diff --git a/Libraries/Image/Image.ios.js b/Libraries/Image/Image.ios.js
@@ -65,6 +65,15 @@ var Image = React.createClass({
     source: PropTypes.shape({
       uri: PropTypes.string,
     }),
+
+    /**
+     * Static Image (ALAsset) representation
+     *    full      -> full resolution
+     *    screen    -> full screen 
+     *    thumbnail -> thumbnail 
+     */
+     representation: PropTypes.oneOf(['full', 'screen', 'thumbnail']),
+
     /**
      * A static image to display while downloading the final image off the
      * network.
@@ -158,7 +167,8 @@ var Image = React.createClass({
       tintColor: style.tintColor,
     });
     if (isStored) {
-      nativeProps.imageTag = source.uri;
+     // aroth: TODO
+      nativeProps.imageTag = { uri: source.uri, representation: this.props.representation };
     } else {
       nativeProps.src = source.uri;
     }

diff --git a/Libraries/Image/RCTCameraRollManager.m b/Libraries/Image/RCTCameraRollManager.m
@@ -25,7 +25,7 @@ @implementation RCTCameraRollManager
                   successCallback:(RCTResponseSenderBlock)successCallback
                   errorCallback:(RCTResponseSenderBlock)errorCallback)
 {
-  [RCTImageLoader loadImageWithTag:imageTag callback:^(NSError *loadError, UIImage *loadedImage) {
+  [RCTImageLoader loadImageWithTag:imageTag representation:@"full" callback:^(NSError *loadError, UIImage *loadedImage) {
     if (loadError) {
       errorCallback(@[[loadError localizedDescription]]);
       return;

diff --git a/Libraries/Image/RCTImageLoader.h b/Libraries/Image/RCTImageLoader.h
@@ -15,6 +15,6 @@
 @interface RCTImageLoader : NSObject
 
 + (ALAssetsLibrary *)assetsLibrary;
-+ (void)loadImageWithTag:(NSString *)tag callback:(void (^)(NSError *error, UIImage *image))callback;
++ (void)loadImageWithTag:(NSString *)tag representation:(NSString *)rep callback:(void (^)(NSError *error, UIImage *image))callback;
 
 @end
diff --git a/Libraries/Image/RCTImageLoader.m b/Libraries/Image/RCTImageLoader.m
@@ -51,7 +51,7 @@ + (ALAssetsLibrary *)assetsLibrary
   return assetsLibrary;
 }
 
-+ (void)loadImageWithTag:(NSString *)imageTag callback:(void (^)(NSError *error, UIImage *image))callback
++ (void)loadImageWithTag:(NSString *)imageTag representation:(NSString *)rep callback:(void (^)(NSError *error, UIImage *image))callback
 {
   if ([imageTag hasPrefix:@"assets-library"]) {
     [[RCTImageLoader assetsLibrary] assetForURL:[NSURL URLWithString:imageTag] resultBlock:^(ALAsset *asset) {
@@ -64,11 +64,24 @@ + (void)loadImageWithTag:(NSString *)imageTag callback:(void (^)(NSError *error,
           // Also make sure the image is released immediately after it's used so it
           // doesn't spike the memory up during the process.
           @autoreleasepool {
+            // aroth: TODO
             ALAssetRepresentation *representation = [asset defaultRepresentation];
             ALAssetOrientation orientation = [representation orientation];
-            UIImage *image = [UIImage imageWithCGImage:[representation fullResolutionImage] scale:1.0f orientation:(UIImageOrientation)orientation];
-            callback(nil, image);
+            UIImage *image;
+
+            if( [rep isEqualToString:@"screen"] ){
+              image = [UIImage imageWithCGImage:[representation fullScreenImage] scale:1.0f orientation:(UIImageOrientation)orientation];
+            }else if( [rep isEqualToString:@"thumbnail"] ){
+              image = [UIImage imageWithCGImage:[asset thumbnail] scale:1.0f orientation:(UIImageOrientation)orientation];
+            }else{
+              image = [UIImage imageWithCGImage:[representation fullResolutionImage] scale:1.0f orientation:(UIImageOrientation)orientation];
+            }
+
+            dispatch_async(dispatch_get_main_queue(), ^{
+              callback(nil, image);
+            });
           }
+
         });
       } else {
         NSString *errorText = [NSString stringWithFormat:@"Failed to load asset at URL %@ with no error message.", imageTag];

diff --git a/Libraries/Image/RCTStaticImageManager.m b/Libraries/Image/RCTStaticImageManager.m
@@ -49,10 +49,10 @@ - (UIView *)view
     view.tintColor = defaultView.tintColor;
   }
 }
-RCT_CUSTOM_VIEW_PROPERTY(imageTag, NSString, RCTStaticImage)
+RCT_CUSTOM_VIEW_PROPERTY(imageTag, NSDictionary, RCTStaticImage)
 {
   if (json) {
-    [RCTImageLoader loadImageWithTag:[RCTConvert NSString:json] callback:^(NSError *error, UIImage *image) {
+    [RCTImageLoader loadImageWithTag:[RCTConvert NSString:json[@"uri"]] representation:[RCTConvert NSString:json[@"representation"]] callback:^(NSError *error, UIImage *image) {
       if (error) {
         RCTLogWarn(@"%@", error.localizedDescription);
       }