From 604bc5bd2e61bf6b9136598fa8305d927c5f1e70 Mon Sep 17 00:00:00 2001
From: Artal Druk <artald@wix.com>
Date: Sun, 28 May 2017 14:42:34 +0300
Subject: [PATCH] provide image width and height on tap events

---
 .../RNCameraKit/gallery/GalleryAdapter.java   | 22 +++++++++++++------
 .../RNCameraKit/gallery/TapImageEvent.java    |  4 +++-
 .../CKGalleryViewManager.m                    |  9 ++++++--
 src/CameraKitGallery.android.js               |  2 +-
 src/CameraKitGallery.ios.js                   |  2 +-
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/android/src/main/java/com/wix/RNCameraKit/gallery/GalleryAdapter.java b/android/src/main/java/com/wix/RNCameraKit/gallery/GalleryAdapter.java
index da7642c..c297ecf 100644
--- a/android/src/main/java/com/wix/RNCameraKit/gallery/GalleryAdapter.java
+++ b/android/src/main/java/com/wix/RNCameraKit/gallery/GalleryAdapter.java
@@ -41,18 +41,24 @@ public class GalleryAdapter extends RecyclerView.Adapter<GalleryAdapter.AbsViewH
     private static final String[] PROJECTION = new String[]{
             MediaStore.Images.Media.DATA,
             MediaStore.Images.Media._ID,
-            MediaStore.Images.Media.MIME_TYPE
+            MediaStore.Images.Media.MIME_TYPE,
+            MediaStore.Images.Media.WIDTH,
+            MediaStore.Images.Media.HEIGHT
     };
 
     private class Image {
         String uri;
         Integer id;
         String mimeType;
+        Integer width;
+        Integer height;
 
-        public Image(String uri, Integer id, String mimeType) {
+        public Image(String uri, Integer id, String mimeType, Integer width, Integer height) {
             this.uri = uri;
             this.id = id;
             this.mimeType = mimeType;
+            this.width = width;
+            this.height = height;
         }
     }
 
@@ -98,7 +104,7 @@ public class GalleryAdapter extends RecyclerView.Adapter<GalleryAdapter.AbsViewH
                 return;
             }
 
-            onTapImage(image.uri);
+            onTapImage(image.uri, image.width, image.height);
             v.setSelected(!isSelected);
         }
 
@@ -281,13 +287,15 @@ public class GalleryAdapter extends RecyclerView.Adapter<GalleryAdapter.AbsViewH
             int dataIndex = cursor.getColumnIndex(MediaStore.Images.Media.DATA);
             int idIndex = cursor.getColumnIndex(MediaStore.Images.Media._ID);
             int mimeIndex = cursor.getColumnIndex(MediaStore.Images.Media.MIME_TYPE);
+            int widthIndex = cursor.getColumnIndex(MediaStore.Images.Media.WIDTH);
+            int heightIndex = cursor.getColumnIndex(MediaStore.Images.Media.HEIGHT);
             do {
-                images.add(new Image(cursor.getString(dataIndex), cursor.getInt(idIndex), cursor.getString(mimeIndex)));
+                images.add(new Image(cursor.getString(dataIndex), cursor.getInt(idIndex), cursor.getString(mimeIndex), cursor.getInt(widthIndex), cursor.getInt(heightIndex)));
             } while (cursor.moveToNext());
         }
 
         if (shouldShowCustomButton()) {
-            images.add(new Image(null, -1, ""));
+            images.add(new Image(null, -1, "", 0, 0));
         }
         Collections.reverse(images);
         cursor.close();
@@ -353,9 +361,9 @@ public class GalleryAdapter extends RecyclerView.Adapter<GalleryAdapter.AbsViewH
         return customButtonImage != null;
     }
 
-    public void onTapImage(String uri) {
+    public void onTapImage(String uri, Integer width, Integer height) {
         final ReactContext reactContext = ((ReactContext) view.getContext());
-        reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher().dispatchEvent(new TapImageEvent(getRootViewId(), uri));
+        reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher().dispatchEvent(new TapImageEvent(getRootViewId(), uri, width, height));
     }
 
     public void onTapCustomButton() {
diff --git a/android/src/main/java/com/wix/RNCameraKit/gallery/TapImageEvent.java b/android/src/main/java/com/wix/RNCameraKit/gallery/TapImageEvent.java
index 5530a6a..bd51a44 100644
--- a/android/src/main/java/com/wix/RNCameraKit/gallery/TapImageEvent.java
+++ b/android/src/main/java/com/wix/RNCameraKit/gallery/TapImageEvent.java
@@ -10,11 +10,13 @@ public class TapImageEvent extends Event<TapImageEvent> {
     private final int targetTag;
     private WritableMap event;
 
-    TapImageEvent(int targetTag, String uri) {
+    TapImageEvent(int targetTag, String uri, Integer width, Integer height) {
         this.targetTag = targetTag;
         event = Arguments.createMap();
         event.putString("selected", uri);
         event.putString("id", "onTapImage");
+        event.putInt("width", width);
+        event.putInt("height", height);
         init(0);
     }
 
diff --git a/ios/lib/ReactNativeCameraKit/CKGalleryViewManager.m b/ios/lib/ReactNativeCameraKit/CKGalleryViewManager.m
index 7b35cfd..8b5135f 100644
--- a/ios/lib/ReactNativeCameraKit/CKGalleryViewManager.m
+++ b/ios/lib/ReactNativeCameraKit/CKGalleryViewManager.m
@@ -444,6 +444,9 @@ static NSString * const CustomCellReuseIdentifier = @"CustomCell";
 -(void)onSelectChanged:(PHAsset*)asset {
     if (self.onTapImage) {
         
+        NSMutableDictionary *imageTapInfo = [@{@"width": [NSNumber numberWithUnsignedInteger:asset.pixelWidth],
+                                               @"height": [NSNumber numberWithUnsignedInteger:asset.pixelHeight]} mutableCopy];
+        
         BOOL shouldReturnUrl = self.getUrlOnTapImage ? [self.getUrlOnTapImage boolValue] : NO;
         if (shouldReturnUrl) {
             PHImageRequestOptions *imageRequestOptions = [[PHImageRequestOptions alloc] init];
@@ -451,7 +454,8 @@ static NSString * const CustomCellReuseIdentifier = @"CustomCell";
             NSDictionary *info = [CKGalleryViewManager infoForAsset:asset imageRequestOptions:imageRequestOptions imageQuality:self.imageQualityOnTap];
             NSString *uriString = info[@"uri"];
             if (uriString) {
-                self.onTapImage(@{@"selected": uriString, @"selectedId": asset.localIdentifier});
+                [imageTapInfo addEntriesFromDictionary:@{@"selected": uriString, @"selectedId": asset.localIdentifier}];
+                self.onTapImage(imageTapInfo);
             }
             else {
                 self.onTapImage(@{@"Error": @"Could not get image uri"});
@@ -459,7 +463,8 @@ static NSString * const CustomCellReuseIdentifier = @"CustomCell";
             
         }
         else {
-            self.onTapImage(@{@"selected":asset.localIdentifier});
+            [imageTapInfo addEntriesFromDictionary:@{@"selected":asset.localIdentifier}];
+            self.onTapImage(imageTapInfo);
         }
     }
 }
diff --git a/src/CameraKitGallery.android.js b/src/CameraKitGallery.android.js
index 2029643..d7fcf7e 100644
--- a/src/CameraKitGallery.android.js
+++ b/src/CameraKitGallery.android.js
@@ -19,7 +19,7 @@ async function getImagesForIds(imagesUris = []) {
 async function getImageForTapEvent(nativeEvent) {
   const selectedImageId = nativeEvent.selected;
   const imageUri = selectedImageId && await getImageUriForId(selectedImageId);
-  return {selectedImageId, imageUri};
+  return {selectedImageId, imageUri, width: nativeEvent.width, height: nativeEvent.height};
 }
 
 async function checkDevicePhotosAuthorizationStatus() {
diff --git a/src/CameraKitGallery.ios.js b/src/CameraKitGallery.ios.js
index ae182e8..2619051 100644
--- a/src/CameraKitGallery.ios.js
+++ b/src/CameraKitGallery.ios.js
@@ -35,7 +35,7 @@ async function getImageForTapEvent(nativeEvent) {
     selectedImageId = nativeEvent.selected;
     imageUri = await getImageUriForId(selectedImageId);
   }
-  return {selectedImageId, imageUri};
+  return {selectedImageId, imageUri, width: nativeEvent.width, height: nativeEvent.height};
 }