diff --git a/.npmignore b/.npmignore
index 8bd0bef46..436c36723 100644
--- a/.npmignore
+++ b/.npmignore
@@ -2,3 +2,4 @@
example
node_modules
build
+images
diff --git a/README.md b/README.md
index 1ce96d4c6..2c42512d3 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,11 @@
# react-native-image-crop-picker
-iOS/Android image picker with support for camera, configurable compression, multiple images and cropping
[](#backers) [](#sponsors)
+
@@ -11,6 +14,10 @@ iOS/Android image picker with support for camera, configurable compression, mult
+## Important note
+
+If you are using react-native >= 0.60 use react-native-image-crop-picker version >= 0.25.0. Otherwise use version < 0.25.0.
+
## Usage
Import library
@@ -55,13 +62,25 @@ ImagePicker.openPicker({
**Android: The prop 'cropping' has been known to cause videos not to be display in the gallery on Android. Please do not set cropping to true when selecting videos.**
-### Select from camera
+### Select from camera
+
+#### Image
```javascript
ImagePicker.openCamera({
width: 300,
height: 400,
- cropping: true
+ cropping: true,
+}).then(image => {
+ console.log(image);
+});
+```
+
+#### Video
+
+```javascript
+ImagePicker.openCamera({
+ mediaType: 'video',
}).then(image => {
console.log(image);
});
@@ -100,8 +119,9 @@ ImagePicker.clean().then(() => {
| height | number | Height of result image when used with `cropping` option |
| multiple | bool (default false) | Enable or disable multiple image selection |
| writeTempFile (ios only) | bool (default true) | When set to false, does not write temporary files for the selected images. This is useful to improve performance when you are retrieving file contents with the `includeBase64` option and don't need to read files from disk. |
-| includeBase64 | bool (default false) | Enable or disable returning base64 data with image |
+| includeBase64 | bool (default false) | When set to true, the image file content will be available as a base64-encoded string in the `data` property. Hint: To use this string as an image source, use it like: ``.xcworkspace`. **Do not use** `ios/ '../node_modules/react-native-image-crop-picker/ios/QBImagePicker/QBImagePickerController.podspec'
+```
+
### Android
+NOTE: If you are using react-native >= 0.60 autolinking, you can skip this step.
+
```bash
react-native link react-native-image-crop-picker
```
@@ -237,14 +282,21 @@ In Xcode open Info.plist and add string key `NSPhotoLibraryUsageDescription` wit
##### Only if you are not using Cocoapods
-- Drag and drop the ios/ImageCropPickerSDK folder to your xcode project. (Make sure Copy items if needed IS ticked)
- Click on project General tab
- Under `Deployment Info` set `Deployment Target` to `8.0`
- Under `Embedded Binaries` click `+` and add `RSKImageCropper.framework` and `QBImagePicker.framework`
+
+#### Step Optional - To localizate the camera / gallery text buttons
+
+- Open your Xcode project
+- Go to your project settings by opening the project name on the Navigation (left side)
+- Select your project in the project list
+- Should be into the Info tab and add in Localizations the language your app was missing throughout the +
+- Rebuild and you should now have your app camera and gallery with the classic ios text in the language you added.
### Android
-- Make sure you are using Gradle `2.2.x` (android/build.gradle)
+- Make sure you are using Gradle >= `2.2.x` (android/build.gradle)
```gradle
buildscript {
@@ -266,8 +318,11 @@ allprojects {
jcenter()
maven { url "$rootDir/../node_modules/react-native/android" }
- // jitpack repo is necessary to fetch ucrop dependency
- maven { url "https://jitpack.io" }
+ // ADD THIS
+ maven { url 'https://maven.google.com' }
+
+ // ADD THIS
+ maven { url "https://www.jitpack.io" }
}
}
```
@@ -287,9 +342,30 @@ android {
}
```
+- Use Android SDK >= 26 (android/app/build.gradle)
+
+```gradle
+android {
+ compileSdkVersion 27
+ buildToolsVersion "27.0.3"
+ ...
+
+ defaultConfig {
+ ...
+ targetSdkVersion 27
+ ...
+ }
+ ...
+}
+```
+
- [Optional] If you want to use camera picker in your project, add following to `app\src\main\AndroidManifest.xml`
- `
@@ -17,7 +17,6 @@
diff --git a/android/src/main/java/com/reactnative/ivpusic/imagepicker/Compression.java b/android/src/main/java/com/reactnative/ivpusic/imagepicker/Compression.java
index 9b06e4634..b6070fdb4 100644
--- a/android/src/main/java/com/reactnative/ivpusic/imagepicker/Compression.java
+++ b/android/src/main/java/com/reactnative/ivpusic/imagepicker/Compression.java
@@ -2,14 +2,23 @@
import android.app.Activity;
import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Matrix;
+import android.media.ExifInterface;
import android.os.Environment;
import android.util.Log;
+
import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReadableMap;
-import id.zelory.compressor.Compressor;
+import java.io.BufferedOutputStream;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
/**
* Created by ipusic on 12/27/16.
@@ -17,50 +26,104 @@
class Compression {
- File compressImage(final Activity activity, final ReadableMap options, final String originalImagePath) throws IOException {
+ File resize(String originalImagePath, int maxWidth, int maxHeight, int quality) throws IOException {
+ Bitmap original = BitmapFactory.decodeFile(originalImagePath);
+
+ int width = original.getWidth();
+ int height = original.getHeight();
+
+ // Use original image exif orientation data to preserve image orientation for the resized bitmap
+ ExifInterface originalExif = new ExifInterface(originalImagePath);
+ int originalOrientation = originalExif.getAttributeInt(ExifInterface.TAG_ORIENTATION, 1);
+
+ Matrix rotationMatrix = new Matrix();
+ int rotationAngleInDegrees = getRotationInDegreesForOrientationTag(originalOrientation);
+ rotationMatrix.postRotate(rotationAngleInDegrees);
+
+ float ratioBitmap = (float) width / (float) height;
+ float ratioMax = (float) maxWidth / (float) maxHeight;
+
+ int finalWidth = maxWidth;
+ int finalHeight = maxHeight;
+
+ if (ratioMax > 1) {
+ finalWidth = (int) ((float) maxHeight * ratioBitmap);
+ } else {
+ finalHeight = (int) ((float) maxWidth / ratioBitmap);
+ }
+
+ Bitmap resized = Bitmap.createScaledBitmap(original, finalWidth, finalHeight, true);
+ resized = Bitmap.createBitmap(resized, 0, 0, finalWidth, finalHeight, rotationMatrix, true);
+
+ File imageDirectory = Environment.getExternalStoragePublicDirectory(
+ Environment.DIRECTORY_PICTURES);
+
+ if(!imageDirectory.exists()) {
+ Log.d("image-crop-picker", "Pictures Directory is not existing. Will create this directory.");
+ imageDirectory.mkdirs();
+ }
+
+ File resizeImageFile = new File(imageDirectory, UUID.randomUUID() + ".jpg");
+
+ OutputStream os = new BufferedOutputStream(new FileOutputStream(resizeImageFile));
+ resized.compress(Bitmap.CompressFormat.JPEG, quality, os);
+
+ os.close();
+ original.recycle();
+ resized.recycle();
+
+ return resizeImageFile;
+ }
+
+ int getRotationInDegreesForOrientationTag(int orientationTag) {
+ switch(orientationTag){
+ case ExifInterface.ORIENTATION_ROTATE_90:
+ return 90;
+ case ExifInterface.ORIENTATION_ROTATE_270:
+ return -90;
+ case ExifInterface.ORIENTATION_ROTATE_180:
+ return 180;
+ default:
+ return 0;
+ }
+ }
+
+ File compressImage(final ReadableMap options, final String originalImagePath, final BitmapFactory.Options bitmapOptions) throws IOException {
Integer maxWidth = options.hasKey("compressImageMaxWidth") ? options.getInt("compressImageMaxWidth") : null;
Integer maxHeight = options.hasKey("compressImageMaxHeight") ? options.getInt("compressImageMaxHeight") : null;
Double quality = options.hasKey("compressImageQuality") ? options.getDouble("compressImageQuality") : null;
- if (maxWidth == null && maxHeight == null && quality == null) {
+ boolean isLossLess = (quality == null || quality == 1.0);
+ boolean useOriginalWidth = (maxWidth == null || maxWidth >= bitmapOptions.outWidth);
+ boolean useOriginalHeight = (maxHeight == null || maxHeight >= bitmapOptions.outHeight);
+
+ List knownMimes = Arrays.asList("image/jpeg", "image/jpg", "image/png", "image/gif", "image/tiff");
+ boolean isKnownMimeType = (bitmapOptions.outMimeType != null && knownMimes.contains(bitmapOptions.outMimeType.toLowerCase()));
+
+ if (isLossLess && useOriginalWidth && useOriginalHeight && isKnownMimeType) {
Log.d("image-crop-picker", "Skipping image compression");
return new File(originalImagePath);
}
Log.d("image-crop-picker", "Image compression activated");
- Compressor compressor = new Compressor(activity)
- .setCompressFormat(Bitmap.CompressFormat.JPEG)
- .setDestinationDirectoryPath(Environment.getExternalStoragePublicDirectory(
- Environment.DIRECTORY_PICTURES).getAbsolutePath());
-
- if (quality == null) {
- Log.d("image-crop-picker", "Compressing image with quality 100");
- compressor.setQuality(100);
- } else {
- Log.d("image-crop-picker", "Compressing image with quality " + (quality * 100));
- compressor.setQuality((int) (quality * 100));
- }
- if (maxWidth != null) {
- Log.d("image-crop-picker", "Compressing image with max width " + maxWidth);
- compressor.setMaxWidth(maxWidth);
- }
+ // compression quality
+ int targetQuality = quality != null ? (int) (quality * 100) : 100;
+ Log.d("image-crop-picker", "Compressing image with quality " + targetQuality);
- if (maxHeight != null) {
- Log.d("image-crop-picker", "Compressing image with max height " + maxHeight);
- compressor.setMaxHeight(maxHeight);
+ if (maxWidth == null) {
+ maxWidth = bitmapOptions.outWidth;
+ } else {
+ maxWidth = Math.min(maxWidth, bitmapOptions.outWidth);
}
- File image = new File(originalImagePath);
+ if (maxHeight == null) {
+ maxHeight = bitmapOptions.outHeight;
+ } else {
+ maxHeight = Math.min(maxHeight, bitmapOptions.outHeight);
+ }
- String[] paths = image.getName().split("\\.(?=[^\\.]+$)");
- String compressedFileName = paths[0] + "-compressed";
-
- if(paths.length > 1)
- compressedFileName += "." + paths[1];
-
- return compressor
- .compressToFile(image, compressedFileName);
+ return resize(originalImagePath, maxWidth, maxHeight, targetQuality);
}
synchronized void compressVideo(final Activity activity, final ReadableMap options, final String originalVideo, final String compressedVideo, final Promise promise) {
diff --git a/android/src/main/java/com/reactnative/ivpusic/imagepicker/PickerModule.java b/android/src/main/java/com/reactnative/ivpusic/imagepicker/PickerModule.java
index b17629b68..c1a2cc5b9 100644
--- a/android/src/main/java/com/reactnative/ivpusic/imagepicker/PickerModule.java
+++ b/android/src/main/java/com/reactnative/ivpusic/imagepicker/PickerModule.java
@@ -14,11 +14,12 @@
import android.os.Build;
import android.os.Environment;
import android.provider.MediaStore;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.FileProvider;
import android.util.Base64;
import android.webkit.MimeTypeMap;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.FileProvider;
+
import com.facebook.react.bridge.ActivityEventListener;
import com.facebook.react.bridge.Callback;
import com.facebook.react.bridge.Promise;
@@ -65,10 +66,6 @@ class PickerModule extends ReactContextBaseJavaModule implements ActivityEventLi
private static final String E_CANNOT_LAUNCH_CAMERA = "E_CANNOT_LAUNCH_CAMERA";
private static final String E_PERMISSIONS_MISSING = "E_PERMISSION_MISSING";
private static final String E_ERROR_WHILE_CLEANING_FILES = "E_ERROR_WHILE_CLEANING_FILES";
- //Grey 800
- private final String DEFAULT_TINT = "#424242";
- //Light Blue 500
- private final String DEFAULT_WIDGET_COLOR = "#03A9F4";
private String mediaType = "any";
private boolean multiple = false;
@@ -78,22 +75,31 @@ class PickerModule extends ReactContextBaseJavaModule implements ActivityEventLi
private boolean cropperCircleOverlay = false;
private boolean freeStyleCropEnabled = false;
private boolean showCropGuidelines = true;
+ private boolean showCropFrame = true;
private boolean hideBottomControls = false;
private boolean enableRotationGesture = false;
private boolean disableCropperColorSetters = false;
+ private boolean useFrontCamera = false;
private ReadableMap options;
+
+ //Grey 800
+ private final String DEFAULT_TINT = "#424242";
private String cropperActiveWidgetColor = DEFAULT_TINT;
private String cropperStatusBarColor = DEFAULT_TINT;
private String cropperToolbarColor = DEFAULT_TINT;
private String cropperToolbarTitle = null;
- private int width = 200;
- private int height = 200;
+
+ //Light Blue 500
+ private final String DEFAULT_WIDGET_COLOR = "#03A9F4";
+ private int width = 0;
+ private int height = 0;
+
private Uri mCameraCaptureURI;
- private String mCurrentPhotoPath;
- private ResultCollector resultCollector;
+ private String mCurrentMediaPath;
+ private ResultCollector resultCollector = new ResultCollector();
private Compression compression = new Compression();
- private ReactApplicationContext reactContext = null;
-
+ private ReactApplicationContext reactContext;
+
PickerModule(ReactApplicationContext reactContext) {
super(reactContext);
reactContext.addActivityEventListener(this);
@@ -114,8 +120,8 @@ private static WritableMap getCroppedRectMap(Intent data) {
private String getTmpDir(Activity activity) {
String tmpDir = activity.getCacheDir() + "/react-native-image-crop-picker";
- Boolean created = new File(tmpDir).mkdir();
-
+ new File(tmpDir).mkdir();
+
return tmpDir;
}
@@ -125,23 +131,25 @@ public String getName() {
}
private void setConfiguration(final ReadableMap options) {
- mediaType = options.hasKey("mediaType") ? options.getString("mediaType") : mediaType;
+ mediaType = options.hasKey("mediaType") ? options.getString("mediaType") : "any";
multiple = options.hasKey("multiple") && options.getBoolean("multiple");
includeBase64 = options.hasKey("includeBase64") && options.getBoolean("includeBase64");
includeExif = options.hasKey("includeExif") && options.getBoolean("includeExif");
- width = options.hasKey("width") ? options.getInt("width") : width;
- height = options.hasKey("height") ? options.getInt("height") : height;
- cropping = options.hasKey("cropping") ? options.getBoolean("cropping") : cropping;
- cropperActiveWidgetColor = options.hasKey("cropperActiveWidgetColor") ? options.getString("cropperActiveWidgetColor") : cropperActiveWidgetColor;
- cropperStatusBarColor = options.hasKey("cropperStatusBarColor") ? options.getString("cropperStatusBarColor") : cropperStatusBarColor;
- cropperToolbarColor = options.hasKey("cropperToolbarColor") ? options.getString("cropperToolbarColor") : cropperToolbarColor;
+ width = options.hasKey("width") ? options.getInt("width") : 0;
+ height = options.hasKey("height") ? options.getInt("height") : 0;
+ cropping = options.hasKey("cropping") && options.getBoolean("cropping");
+ cropperActiveWidgetColor = options.hasKey("cropperActiveWidgetColor") ? options.getString("cropperActiveWidgetColor") : DEFAULT_TINT;
+ cropperStatusBarColor = options.hasKey("cropperStatusBarColor") ? options.getString("cropperStatusBarColor") : DEFAULT_TINT;
+ cropperToolbarColor = options.hasKey("cropperToolbarColor") ? options.getString("cropperToolbarColor") : DEFAULT_TINT;
cropperToolbarTitle = options.hasKey("cropperToolbarTitle") ? options.getString("cropperToolbarTitle") : null;
- cropperCircleOverlay = options.hasKey("cropperCircleOverlay") ? options.getBoolean("cropperCircleOverlay") : cropperCircleOverlay;
- freeStyleCropEnabled = options.hasKey("freeStyleCropEnabled") ? options.getBoolean("freeStyleCropEnabled") : freeStyleCropEnabled;
- showCropGuidelines = options.hasKey("showCropGuidelines") ? options.getBoolean("showCropGuidelines") : showCropGuidelines;
- hideBottomControls = options.hasKey("hideBottomControls") ? options.getBoolean("hideBottomControls") : hideBottomControls;
- enableRotationGesture = options.hasKey("enableRotationGesture") ? options.getBoolean("enableRotationGesture") : enableRotationGesture;
- disableCropperColorSetters = options.hasKey("disableCropperColorSetters") ? options.getBoolean("disableCropperColorSetters") : disableCropperColorSetters;
+ cropperCircleOverlay = options.hasKey("cropperCircleOverlay") && options.getBoolean("cropperCircleOverlay");
+ freeStyleCropEnabled = options.hasKey("freeStyleCropEnabled") && options.getBoolean("freeStyleCropEnabled");
+ showCropGuidelines = !options.hasKey("showCropGuidelines") || options.getBoolean("showCropGuidelines");
+ showCropFrame = !options.hasKey("showCropFrame") || options.getBoolean("showCropFrame");
+ hideBottomControls = options.hasKey("hideBottomControls") && options.getBoolean("hideBottomControls");
+ enableRotationGesture = options.hasKey("enableRotationGesture") && options.getBoolean("enableRotationGesture");
+ disableCropperColorSetters = options.hasKey("disableCropperColorSetters") && options.getBoolean("disableCropperColorSetters");
+ useFrontCamera = options.hasKey("useFrontCamera") && options.getBoolean("useFrontCamera");
this.options = options;
}
@@ -165,10 +173,10 @@ public void clean(final Promise promise) {
promise.reject(E_ACTIVITY_DOES_NOT_EXIST, "Activity doesn't exist");
return;
}
-
- permissionsCheck(activity, promise, Arrays.asList(Manifest.permission.WRITE_EXTERNAL_STORAGE), new Callable() {
+
+ permissionsCheck(activity, promise, Collections.singletonList(Manifest.permission.WRITE_EXTERNAL_STORAGE), new Callable() {
@Override
- public Void call() throws Exception {
+ public Void call() {
try {
File file = new File(module.getTmpDir(activity));
if (!file.exists()) throw new Exception("File does not exist");
@@ -199,8 +207,8 @@ public void cleanSingle(final String pathToDelete, final Promise promise) {
promise.reject(E_ACTIVITY_DOES_NOT_EXIST, "Activity doesn't exist");
return;
}
-
- permissionsCheck(activity, promise, Arrays.asList(Manifest.permission.WRITE_EXTERNAL_STORAGE), new Callable() {
+
+ permissionsCheck(activity, promise, Collections.singletonList(Manifest.permission.WRITE_EXTERNAL_STORAGE), new Callable() {
@Override
public Void call() throws Exception {
try {
@@ -288,11 +296,11 @@ public void openCamera(final ReadableMap options, final Promise promise) {
}
setConfiguration(options);
- resultCollector = new ResultCollector(promise, multiple);
-
+ resultCollector.setup(promise, false);
+
permissionsCheck(activity, promise, Arrays.asList(Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE), new Callable() {
@Override
- public Void call() throws Exception {
+ public Void call() {
initiateCamera(activity);
return null;
}
@@ -312,27 +320,41 @@ private void initiateCamera(Activity activity) {
private void initImageCapture(Activity activity) {
try {
- int requestCode = CAMERA_PICKER_REQUEST;
- Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-
- File imageFile = createImageFile();
-
+ String intent;
+ File dataFile;
+
+ if (mediaType.equals("video")) {
+ intent = MediaStore.ACTION_VIDEO_CAPTURE;
+ dataFile = createVideoFile();
+ } else {
+ intent = MediaStore.ACTION_IMAGE_CAPTURE;
+ dataFile = createImageFile();
+ }
+
+ Intent cameraIntent = new Intent(intent);
+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
- mCameraCaptureURI = Uri.fromFile(imageFile);
+ mCameraCaptureURI = Uri.fromFile(dataFile);
} else {
mCameraCaptureURI = FileProvider.getUriForFile(activity,
- activity.getApplicationContext().getPackageName() + ".provider",
- imageFile);
+ activity.getApplicationContext().getPackageName() + ".provider",
+ dataFile);
}
cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, mCameraCaptureURI);
-
+
+ if (this.useFrontCamera) {
+ cameraIntent.putExtra("android.intent.extras.CAMERA_FACING", 1);
+ cameraIntent.putExtra("android.intent.extras.LENS_FACING_FRONT", 1);
+ cameraIntent.putExtra("android.intent.extra.USE_FRONT_CAMERA", true);
+ }
+
if (cameraIntent.resolveActivity(activity.getPackageManager()) == null) {
resultCollector.notifyProblem(E_CANNOT_LAUNCH_CAMERA, "Cannot launch camera");
return;
}
-
- activity.startActivityForResult(cameraIntent, requestCode);
+
+ activity.startActivityForResult(cameraIntent, CAMERA_PICKER_REQUEST);
} catch (Exception e) {
resultCollector.notifyProblem(E_FAILED_TO_OPEN_CAMERA, e);
}
@@ -403,11 +425,11 @@ public void openPicker(final ReadableMap options, final Promise promise) {
}
setConfiguration(options);
- resultCollector = new ResultCollector(promise, multiple);
-
+ resultCollector.setup(promise, multiple);
+
permissionsCheck(activity, promise, Collections.singletonList(Manifest.permission.WRITE_EXTERNAL_STORAGE), new Callable() {
@Override
- public Void call() throws Exception {
+ public Void call() {
initiatePicker(activity);
return null;
}
@@ -424,10 +446,16 @@ public void openCropper(final ReadableMap options, final Promise promise) {
}
setConfiguration(options);
- resultCollector = new ResultCollector(promise, false);
-
- Uri uri = Uri.parse(options.getString("path"));
- startCropping(activity, uri);
+ resultCollector.setup(promise, false);
+
+ final Uri uri = Uri.parse(options.getString("path"));
+ permissionsCheck(activity, promise, Collections.singletonList(Manifest.permission.WRITE_EXTERNAL_STORAGE), new Callable() {
+ @Override
+ public Void call() {
+ startCropping(activity, uri);
+ return null;
+ }
+ });
}
private String getBase64StringFromFile(String absoluteFilePath) {
@@ -464,12 +492,12 @@ private String getMimeType(String url) {
ContentResolver cr = this.reactContext.getContentResolver();
mimeType = cr.getType(uri);
} else {
- String fileExtension = MimeTypeMap.getFileExtensionFromUrl(uri.toString());
+ String fileExtension = MimeTypeMap.getFileExtensionFromUrl(uri
+ .toString());
if (fileExtension != null) {
mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension.toLowerCase());
}
}
-
return mimeType;
}
@@ -478,7 +506,13 @@ private WritableMap getSelection(Activity activity, Uri uri, boolean isCamera) t
if (path == null || path.isEmpty()) {
throw new Exception("Cannot resolve asset path.");
}
-
+
+ String mime = getMimeType(path);
+ if (mime != null && mime.startsWith("video/")) {
+ getVideo(activity, path, mime);
+ return null;
+ }
+
return getImage(activity, path);
}
@@ -549,16 +583,15 @@ public void invoke(Object... args) {
}
}).run();
}
-
+
private String resolveRealPath(Activity activity, Uri uri, boolean isCamera) throws IOException {
-
String path;
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
path = RealPathUtil.getRealPathFromURI(activity, uri);
} else {
if (isCamera) {
- Uri imageUri = Uri.parse(mCurrentPhotoPath);
- path = imageUri.getPath();
+ Uri mediaUri = Uri.parse(mCurrentMediaPath);
+ path = mediaUri.getPath();
} else {
path = RealPathUtil.getRealPathFromURI(activity, uri);
}
@@ -588,11 +621,11 @@ private WritableMap getImage(final Activity activity, String path) throws Except
if (path.startsWith("http://") || path.startsWith("https://")) {
throw new Exception("Cannot select remote files");
}
- validateImage(path);
-
+ BitmapFactory.Options original = validateImage(path);
+
// if compression options are provided image will be compressed. If none options is provided,
// then original image will be returned
- File compressedImage = compression.compressImage(activity, options, path);
+ File compressedImage = compression.compressImage(options, path, original);
String compressedImagePath = compressedImage.getPath();
BitmapFactory.Options options = validateImage(compressedImagePath);
long modificationDate = new File(path).lastModified();
@@ -637,14 +670,15 @@ private void configureCropperColors(UCrop.Options options) {
options.setActiveWidgetColor(activeWidgetColor);
}
}
-
- private void startCropping(Activity activity, Uri uri) {
+
+ private void startCropping(final Activity activity, final Uri uri) {
UCrop.Options options = new UCrop.Options();
options.setCompressionFormat(Bitmap.CompressFormat.JPEG);
options.setCompressionQuality(100);
options.setCircleDimmedLayer(cropperCircleOverlay);
options.setFreeStyleCropEnabled(freeStyleCropEnabled);
options.setShowCropGrid(showCropGuidelines);
+ options.setShowCropFrame(showCropFrame);
options.setHideBottomControls(hideBottomControls);
if (cropperToolbarTitle != null) {
options.setToolbarTitle(cropperToolbarTitle);
@@ -660,12 +694,16 @@ private void startCropping(Activity activity, Uri uri) {
if (!disableCropperColorSetters) {
configureCropperColors(options);
}
-
- UCrop.of(uri, Uri.fromFile(new File(this.getTmpDir(activity), UUID.randomUUID().toString() + ".jpg")))
- .withMaxResultSize(width, height)
- .withAspectRatio(width, height)
- .withOptions(options)
- .start(activity);
+
+ UCrop uCrop = UCrop
+ .of(uri, Uri.fromFile(new File(this.getTmpDir(activity), UUID.randomUUID().toString() + ".jpg")))
+ .withOptions(options);
+
+ if (width > 0 && height > 0) {
+ uCrop.withAspectRatio(width, height);
+ }
+
+ uCrop.start(activity);
}
private void imagePickerResult(Activity activity, final int requestCode, final int resultCode, final Intent data) {
@@ -729,7 +767,12 @@ private void cameraPickerResult(Activity activity, final int requestCode, final
} else {
try {
resultCollector.setWaitCount(1);
- resultCollector.notifySuccess(getSelection(activity, uri, true));
+ WritableMap result = getSelection(activity, uri, true);
+
+ // If recording a video getSelection handles resultCollector part itself and returns null
+ if (result != null) {
+ resultCollector.notifySuccess(result);
+ }
} catch (Exception ex) {
resultCollector.notifyProblem(E_NO_IMAGE_DATA_FOUND, ex.getMessage());
}
@@ -759,14 +802,24 @@ private void videoPickerResult(Activity activity, final int requestCode, final i
private void croppingResult(Activity activity, final int requestCode, final int resultCode, final Intent data) {
if (data != null) {
- final Uri resultUri = UCrop.getOutput(data);
+ Uri resultUri = UCrop.getOutput(data);
+
if (resultUri != null) {
try {
+ if (width > 0 && height > 0) {
+ resultUri = Uri.fromFile(compression.resize(resultUri.getPath(), width, height, 100));
+ }
+
WritableMap result = getSelection(activity, resultUri, false);
- result.putMap("cropRect", PickerModule.getCroppedRectMap(data));
-
- resultCollector.setWaitCount(1);
- resultCollector.notifySuccess(result);
+
+ if (result != null) {
+ result.putMap("cropRect", PickerModule.getCroppedRectMap(data));
+
+ resultCollector.setWaitCount(1);
+ resultCollector.notifySuccess(result);
+ } else {
+ throw new Exception("Cannot crop video files");
+ }
} catch (Exception ex) {
resultCollector.notifyProblem(E_NO_IMAGE_DATA_FOUND, ex.getMessage());
}
@@ -818,8 +871,8 @@ private File createImageFile() throws IOException {
File image = File.createTempFile(imageFileName, ".jpg", path);
// Save a file: path for use with ACTION_VIEW intents
- mCurrentPhotoPath = "file:" + image.getAbsolutePath();
-
+ mCurrentMediaPath = "file:" + image.getAbsolutePath();
+
return image;
}
@@ -836,7 +889,7 @@ private File createVideoFile() throws IOException {
File video = File.createTempFile(videoFileName, ".mp4", path);
// Save a file: path for use with ACTION_VIEW intents
- mCurrentPhotoPath = "file:" + video.getAbsolutePath();
+ mCurrentMediaPath = "file:" + video.getAbsolutePath();
return video;
}
diff --git a/android/src/main/java/com/reactnative/ivpusic/imagepicker/RealPathUtil.java b/android/src/main/java/com/reactnative/ivpusic/imagepicker/RealPathUtil.java
index 2803c867b..2a27ea98c 100644
--- a/android/src/main/java/com/reactnative/ivpusic/imagepicker/RealPathUtil.java
+++ b/android/src/main/java/com/reactnative/ivpusic/imagepicker/RealPathUtil.java
@@ -1,5 +1,6 @@
package com.reactnative.ivpusic.imagepicker;
+import android.annotation.TargetApi;
import android.content.ContentUris;
import android.content.Context;
import android.database.Cursor;
@@ -17,84 +18,82 @@
import java.io.InputStream;
class RealPathUtil {
- static String getRealPathFromURI(final Context context, final Uri uri) throws IOException {
-
- final boolean isKitKat = Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT;
-
- // DocumentProvider
- if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
- // ExternalStorageProvider
- if (isExternalStorageDocument(uri)) {
- final String docId = DocumentsContract.getDocumentId(uri);
- final String[] split = docId.split(":");
- final String type = split[0];
-
- if ("primary".equalsIgnoreCase(type)) {
- return Environment.getExternalStorageDirectory() + "/" + split[1];
- } else {
- final int splitIndex = docId.indexOf(':', 1);
- final String tag = docId.substring(0, splitIndex);
- final String path = docId.substring(splitIndex + 1);
-
- String nonPrimaryVolume = getPathToNonPrimaryVolume(context, tag);
- if (nonPrimaryVolume != null) {
- String result = nonPrimaryVolume + "/" + path;
- File file = new File(result);
- if (file.exists() && file.canRead()) {
- return result;
+ @TargetApi(Build.VERSION_CODES.KITKAT)
+ static String getRealPathFromURI(final Context context, final Uri uri) throws IOException {
+
+ final boolean isKitKat = Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT;
+
+ // DocumentProvider
+ if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
+ // ExternalStorageProvider
+ if (isExternalStorageDocument(uri)) {
+ final String docId = DocumentsContract.getDocumentId(uri);
+ final String[] split = docId.split(":");
+ final String type = split[0];
+
+ if ("primary".equalsIgnoreCase(type)) {
+ return Environment.getExternalStorageDirectory() + "/" + split[1];
+ } else {
+ final int splitIndex = docId.indexOf(':', 1);
+ final String tag = docId.substring(0, splitIndex);
+ final String path = docId.substring(splitIndex + 1);
+
+ String nonPrimaryVolume = getPathToNonPrimaryVolume(context, tag);
+ if (nonPrimaryVolume != null) {
+ String result = nonPrimaryVolume + "/" + path;
+ File file = new File(result);
+ if (file.exists() && file.canRead()) {
+ return result;
+ }
+ return null;
}
- return null;
}
- }
- }
- // DownloadsProvider
- else if (isDownloadsDocument(uri)) {
-
- final String id = DocumentsContract.getDocumentId(uri);
- final Uri contentUri = ContentUris.withAppendedId(
- Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
-
- return getDataColumn(context, contentUri, null, null);
- }
- // MediaProvider
- else if (isMediaDocument(uri)) {
- final String docId = DocumentsContract.getDocumentId(uri);
- final String[] split = docId.split(":");
- final String type = split[0];
-
- Uri contentUri = null;
- if ("image".equals(type)) {
- contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
- } else if ("video".equals(type)) {
- contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
- } else if ("audio".equals(type)) {
- contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
- }
-
- final String selection = "_id=?";
- final String[] selectionArgs = new String[] {
- split[1]
- };
-
- return getDataColumn(context, contentUri, selection, selectionArgs);
- }
- }
- // MediaStore (and general)
- else if ("content".equalsIgnoreCase(uri.getScheme())) {
-
- // Return the remote address
- if (isGooglePhotosUri(uri))
- return uri.getLastPathSegment();
-
- return getDataColumn(context, uri, null, null);
- }
- // File
- else if ("file".equalsIgnoreCase(uri.getScheme())) {
- return uri.getPath();
- }
-
- return null;
- }
+ }
+ // DownloadsProvider
+ else if (isDownloadsDocument(uri)) {
+ final String id = DocumentsContract.getDocumentId(uri);
+ final Uri contentUri = ContentUris.withAppendedId(
+ Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
+
+ return getDataColumn(context, contentUri, null, null);
+ }
+ // MediaProvider
+ else if (isMediaDocument(uri)) {
+ final String docId = DocumentsContract.getDocumentId(uri);
+ final String[] split = docId.split(":");
+ final String type = split[0];
+
+ Uri contentUri = null;
+ if ("image".equals(type)) {
+ contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+ } else if ("video".equals(type)) {
+ contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
+ } else if ("audio".equals(type)) {
+ contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
+ }
+
+ final String selection = "_id=?";
+ final String[] selectionArgs = new String[] {
+ split[1]
+ };
+
+ return getDataColumn(context, contentUri, selection, selectionArgs);
+ }
+ }
+ // MediaStore (and general)
+ else if ("content".equalsIgnoreCase(uri.getScheme())) {
+ // Return the remote address
+ if (isGooglePhotosUri(uri))
+ return uri.getLastPathSegment();
+ return getDataColumn(context, uri, null, null);
+ }
+ // File
+ else if ("file".equalsIgnoreCase(uri.getScheme())) {
+ return uri.getPath();
+ }
+
+ return null;
+ }
/**
* If an image/video has been selected from a cloud storage, this method
@@ -108,6 +107,7 @@ else if ("file".equalsIgnoreCase(uri.getScheme())) {
private static File writeToFile(Context context, String fileName, Uri uri) {
String tmpDir = context.getCacheDir() + "/react-native-image-crop-picker";
Boolean created = new File(tmpDir).mkdir();
+ fileName = fileName.substring(fileName.lastIndexOf('/') + 1);
File path = new File(tmpDir);
File file = new File(path, fileName);
try {
@@ -127,106 +127,102 @@ private static File writeToFile(Context context, String fileName, Uri uri) {
return file;
}
- /**
- * Get the value of the data column for this Uri. This is useful for
- * MediaStore Uris, and other file-based ContentProviders.
- *
- * @param context The context.
- * @param uri The Uri to query.
- * @param selection (Optional) Filter used in the query.
- * @param selectionArgs (Optional) Selection arguments used in the query.
- * @return The value of the _data column, which is typically a file path.
- */
- private static String getDataColumn(Context context, Uri uri, String selection,
- String[] selectionArgs) {
-
- Cursor cursor = null;
- final String[] projection = {
- MediaStore.MediaColumns.DATA,
- MediaStore.MediaColumns.DISPLAY_NAME,
- MediaStore.MediaColumns.MIME_TYPE
- };
-
- try {
- cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs,
- null);
- if (cursor != null && cursor.moveToFirst()) {
- final int index = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.DATA);
- Log.d("CROP_PICKER", String.valueOf(index));
- Log.d("CROP_PICKER", "VALUE -> " + cursor.getString(index));
- String path = cursor.getString(index);
-
- if (path != null) {
- return cursor.getString(index);
- } else {
+ /**
+ * Get the value of the data column for this Uri. This is useful for
+ * MediaStore Uris, and other file-based ContentProviders.
+ *
+ * @param context The context.
+ * @param uri The Uri to query.
+ * @param selection (Optional) Filter used in the query.
+ * @param selectionArgs (Optional) Selection arguments used in the query.
+ * @return The value of the _data column, which is typically a file path.
+ */
+ private static String getDataColumn(Context context, Uri uri, String selection,
+ String[] selectionArgs) {
+
+ Cursor cursor = null;
+ final String[] projection = {
+ MediaStore.MediaColumns.DATA,
+ MediaStore.MediaColumns.DISPLAY_NAME,
+ MediaStore.MediaColumns.MIME_TYPE
+ };
+
+ try {
+ cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs,
+ null);
+ if (cursor != null && cursor.moveToFirst()) {
+ // Fall back to writing to file if _data column does not exist
+ final int index = cursor.getColumnIndex(MediaStore.MediaColumns.DATA);
+ String path = index > -1 ? cursor.getString(index) : null;
+ if (path != null) {
+ return cursor.getString(index);
+ } else {
final MimeTypeMap mime = MimeTypeMap.getSingleton();
final int indexDisplayName = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.DISPLAY_NAME);
final int indexMimeType = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.MIME_TYPE);
String fileName = cursor.getString(indexDisplayName);
String extension = mime.getExtensionFromMimeType(cursor.getString(indexMimeType));
- Log.d("CROP_PICKER", "File name: " + fileName);
- Log.d("CROP_PICKER", "File extension: " + extension);
File fileWritten = writeToFile(context, fileName + "." + extension, uri);
- Log.d("CROP_PICKER", "File path: " + fileWritten.getAbsolutePath());
return fileWritten.getAbsolutePath();
+ }
+ }
+ } finally {
+ if (cursor != null)
+ cursor.close();
+ }
+ return null;
+ }
+
+
+ /**
+ * @param uri The Uri to check.
+ * @return Whether the Uri authority is ExternalStorageProvider.
+ */
+ private static boolean isExternalStorageDocument(Uri uri) {
+ return "com.android.externalstorage.documents".equals(uri.getAuthority());
+ }
+
+ /**
+ * @param uri The Uri to check.
+ * @return Whether the Uri authority is DownloadsProvider.
+ */
+ private static boolean isDownloadsDocument(Uri uri) {
+ return "com.android.providers.downloads.documents".equals(uri.getAuthority());
+ }
+
+ /**
+ * @param uri The Uri to check.
+ * @return Whether the Uri authority is MediaProvider.
+ */
+ private static boolean isMediaDocument(Uri uri) {
+ return "com.android.providers.media.documents".equals(uri.getAuthority());
+ }
+
+ /**
+ * @param uri The Uri to check.
+ * @return Whether the Uri authority is Google Photos.
+ */
+ private static boolean isGooglePhotosUri(Uri uri) {
+ return "com.google.android.apps.photos.content".equals(uri.getAuthority());
+ }
+
+ @TargetApi(Build.VERSION_CODES.KITKAT)
+ private static String getPathToNonPrimaryVolume(Context context, String tag) {
+ File[] volumes = context.getExternalCacheDirs();
+ if (volumes != null) {
+ for (File volume : volumes) {
+ if (volume != null) {
+ String path = volume.getAbsolutePath();
+ if (path != null) {
+ int index = path.indexOf(tag);
+ if (index != -1) {
+ return path.substring(0, index) + tag;
+ }
+ }
+ }
}
- }
- } finally {
- if (cursor != null)
- cursor.close();
- }
- return null;
- }
-
-
- /**
- * @param uri The Uri to check.
- * @return Whether the Uri authority is ExternalStorageProvider.
- */
- private static boolean isExternalStorageDocument(Uri uri) {
- return "com.android.externalstorage.documents".equals(uri.getAuthority());
- }
-
- /**
- * @param uri The Uri to check.
- * @return Whether the Uri authority is DownloadsProvider.
- */
- private static boolean isDownloadsDocument(Uri uri) {
- return "com.android.providers.downloads.documents".equals(uri.getAuthority());
- }
-
- /**
- * @param uri The Uri to check.
- * @return Whether the Uri authority is MediaProvider.
- */
- private static boolean isMediaDocument(Uri uri) {
- return "com.android.providers.media.documents".equals(uri.getAuthority());
- }
-
- /**
- * @param uri The Uri to check.
- * @return Whether the Uri authority is Google Photos.
- */
- private static boolean isGooglePhotosUri(Uri uri) {
- return "com.google.android.apps.photos.content".equals(uri.getAuthority());
- }
-
- private static String getPathToNonPrimaryVolume(Context context, String tag) {
- File[] volumes = context.getExternalCacheDirs();
- if (volumes != null) {
- for (File volume : volumes) {
- if (volume != null) {
- String path = volume.getAbsolutePath();
- if (path != null) {
- int index = path.indexOf(tag);
- if (index != -1) {
- return path.substring(0, index) + tag;
- }
- }
- }
- }
- }
- return null;
- }
+ }
+ return null;
+ }
}
diff --git a/android/src/main/java/com/reactnative/ivpusic/imagepicker/ResultCollector.java b/android/src/main/java/com/reactnative/ivpusic/imagepicker/ResultCollector.java
index dbfc6fff0..8bd1b604f 100644
--- a/android/src/main/java/com/reactnative/ivpusic/imagepicker/ResultCollector.java
+++ b/android/src/main/java/com/reactnative/ivpusic/imagepicker/ResultCollector.java
@@ -19,12 +19,16 @@ class ResultCollector {
private boolean multiple;
private AtomicInteger waitCounter;
private WritableArray arrayResult;
- private boolean resultSent = false;
+ private boolean resultSent;
- ResultCollector(Promise promise, boolean multiple) {
+ synchronized void setup(Promise promise, boolean multiple) {
this.promise = promise;
this.multiple = multiple;
+ this.resultSent = false;
+ this.waitCount = 0;
+ this.waitCounter = new AtomicInteger(0);
+
if (multiple) {
this.arrayResult = new WritableNativeArray();
}
@@ -32,14 +36,28 @@ class ResultCollector {
// if user has provided "multiple" option, we will wait for X number of result to come,
// and also return result as an array
- void setWaitCount(int waitCount) {
+ synchronized void setWaitCount(int waitCount) {
this.waitCount = waitCount;
this.waitCounter = new AtomicInteger(0);
}
- synchronized void notifySuccess(WritableMap result) {
+ synchronized private boolean isRequestValid() {
if (resultSent) {
Log.w("image-crop-picker", "Skipping result, already sent...");
+ return false;
+ }
+
+ if (promise == null) {
+ Log.w("image-crop-picker", "Trying to notify success but promise is not set");
+ return false;
+ }
+
+ return true;
+ }
+
+ synchronized void notifySuccess(WritableMap result) {
+ if (!isRequestValid()) {
+ return;
}
if (multiple) {
@@ -57,8 +75,8 @@ synchronized void notifySuccess(WritableMap result) {
}
synchronized void notifyProblem(String code, String message) {
- if (resultSent) {
- Log.w("image-crop-picker", "Skipping result, already sent...");
+ if (!isRequestValid()) {
+ return;
}
Log.e("image-crop-picker", "Promise rejected. " + message);
@@ -67,8 +85,8 @@ synchronized void notifyProblem(String code, String message) {
}
synchronized void notifyProblem(String code, Throwable throwable) {
- if (resultSent) {
- Log.w("image-crop-picker", "Skipping result, already sent...");
+ if (!isRequestValid()) {
+ return;
}
Log.e("image-crop-picker", "Promise rejected. " + throwable.getMessage());
diff --git a/example/README.md b/example/README.md
new file mode 100644
index 000000000..bf13df74f
--- /dev/null
+++ b/example/README.md
@@ -0,0 +1,22 @@
+# Example project
+
+## Install deps
+
+```bash
+cd example
+yarn install
+```
+
+## Running (ios)
+
+```bash
+cd example
+yarn ios
+```
+
+## Running (android)
+
+```bash
+cd example
+yarn android
+```
\ No newline at end of file
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 3a58c5822..8b1ef31f0 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -18,6 +18,9 @@ import com.android.build.OutputFile
* // the entry file for bundle generation
* entryFile: "index.android.js",
*
+ * // https://facebook.github.io/react-native/docs/performance#enable-the-ram-format
+ * bundleCommand: "ram-bundle",
+ *
* // whether to bundle JS and assets in debug mode
* bundleInDebug: false,
*
@@ -33,6 +36,13 @@ import com.android.build.OutputFile
* // bundleInPaidRelease: true,
* // bundleInBeta: true,
*
+ * // whether to disable dev mode in custom build variants (by default only disabled in release)
+ * // for example: to disable dev mode in the staging build type (if configured)
+ * devDisabledInStaging: true,
+ * // The configuration property can be in the following formats
+ * // 'devDisabledIn${productFlavor}${buildType}'
+ * // 'devDisabledIn${buildType}'
+ *
* // the root of your project, i.e. where "package.json" lives
* root: "../../",
*
@@ -58,13 +68,18 @@ import com.android.build.OutputFile
* inputExcludes: ["android/**", "ios/**"],
*
* // override which node gets called and with what additional arguments
- * nodeExecutableAndArgs: ["node"]
+ * nodeExecutableAndArgs: ["node"],
*
* // supply additional arguments to the packager
* extraPackagerArgs: []
* ]
*/
+project.ext.react = [
+ entryFile : "index.js",
+ enableHermes: false, // clean and rebuild if changing
+]
+
apply from: "../../node_modules/react-native/react.gradle"
/**
@@ -82,18 +97,45 @@ def enableSeparateBuildPerCPUArchitecture = false
*/
def enableProguardInReleaseBuilds = false
+/**
+ * The preferred build flavor of JavaScriptCore.
+ *
+ * For example, to use the international variant, you can use:
+ * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
+ *
+ * The international variant includes ICU i18n library and necessary data
+ * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
+ * give correct results when using with locales other than en-US. Note that
+ * this variant is about 6MiB larger per architecture than default.
+ */
+def jscFlavor = 'org.webkit:android-jsc:+'
+
+/**
+ * Whether to enable the Hermes VM.
+ *
+ * This should be set on project.ext.react and mirrored here. If it is not set
+ * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
+ * and the benefits of using Hermes will therefore be sharply reduced.
+ */
+def enableHermes = project.ext.react.get("enableHermes", false)
+
android {
- compileSdkVersion 27
- buildToolsVersion "27.0.0"
+ compileSdkVersion rootProject.ext.compileSdkVersion
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
defaultConfig {
applicationId "com.example"
- minSdkVersion 18
- targetSdkVersion 27
+ minSdkVersion rootProject.ext.minSdkVersion
+ targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
+
ndk {
- abiFilters "armeabi-v7a", "x86"
+ abiFilters 'armeabi-v7a', 'x86'
}
}
splits {
@@ -101,11 +143,15 @@ android {
reset()
enable enableSeparateBuildPerCPUArchitecture
universalApk false // If true, also generate a universal APK
- include "armeabi-v7a", "x86"
+ include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
}
}
buildTypes {
+ debug {
+ }
release {
+ // Caution! In production, you need to generate your own keystore file.
+ // see https://facebook.github.io/react-native/docs/signed-apk-android.
minifyEnabled enableProguardInReleaseBuilds
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
}
@@ -114,23 +160,38 @@ android {
applicationVariants.all { variant ->
variant.outputs.each { output ->
// For each separate APK per architecture, set a unique version code as described here:
- // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
- def versionCodes = ["armeabi-v7a":1, "x86":2]
+ // https://developer.android.com/studio/build/configure-apk-splits.html
+ def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
def abi = output.getFilter(OutputFile.ABI)
if (abi != null) { // null for the universal-debug, universal-release variants
output.versionCodeOverride =
versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
}
+
}
}
+
+ packagingOptions {
+ pickFirst '**/armeabi-v7a/libc++_shared.so'
+ pickFirst '**/x86/libc++_shared.so'
+ pickFirst '**/arm64-v8a/libc++_shared.so'
+ pickFirst '**/x86_64/libc++_shared.so'
+ pickFirst '**/x86/libjsc.so'
+ pickFirst '**/armeabi-v7a/libjsc.so'
+ }
}
dependencies {
- compile project(':react-native-video')
- compile project(':react-native-image-crop-picker')
- compile fileTree(dir: "libs", include: ["*.jar"])
- compile "com.android.support:appcompat-v7:27.0.2"
- compile "com.facebook.react:react-native:+"
+ implementation fileTree(dir: "libs", include: ["*.jar"])
+ implementation "com.facebook.react:react-native:+" // From node_modules
+
+ if (enableHermes) {
+ def hermesPath = "../../node_modules/hermesvm/android/";
+ debugImplementation files(hermesPath + "hermes-debug.aar")
+ releaseImplementation files(hermesPath + "hermes-release.aar")
+ } else {
+ implementation jscFlavor
+ }
}
// Run this once to be able to run the application with BUCK
@@ -138,4 +199,6 @@ dependencies {
task copyDownloadableDepsToLibs(type: Copy) {
from configurations.compile
into 'libs'
-}
\ No newline at end of file
+}
+
+apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index b7e16423c..d6c2b854e 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -1,32 +1,26 @@
+ package="com.example">
-
-
-
-
-
+
+
+
+
-
diff --git a/example/android/app/src/main/java/com/example/MainActivity.java b/example/android/app/src/main/java/com/example/MainActivity.java
index e84b72551..877a3363d 100644
--- a/example/android/app/src/main/java/com/example/MainActivity.java
+++ b/example/android/app/src/main/java/com/example/MainActivity.java
@@ -1,6 +1,9 @@
package com.example;
+import android.os.Bundle;
+
import com.facebook.react.ReactActivity;
+import com.facebook.soloader.SoLoader;
public class MainActivity extends ReactActivity {
@@ -12,4 +15,10 @@ public class MainActivity extends ReactActivity {
protected String getMainComponentName() {
return "example";
}
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ SoLoader.init(this, /* native exopackage */ false);
+ super.onCreate(savedInstanceState);
+ }
}
diff --git a/example/android/app/src/main/java/com/example/MainApplication.java b/example/android/app/src/main/java/com/example/MainApplication.java
index 25c4e20d1..0bf210e14 100644
--- a/example/android/app/src/main/java/com/example/MainApplication.java
+++ b/example/android/app/src/main/java/com/example/MainApplication.java
@@ -2,14 +2,11 @@
import android.app.Application;
+import com.facebook.react.PackageList;
import com.facebook.react.ReactApplication;
-import com.brentvatne.react.ReactVideoPackage;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
-import com.facebook.react.shell.MainReactPackage;
-import com.reactnative.ivpusic.imagepicker.PickerPackage;
-import java.util.Arrays;
import java.util.List;
public class MainApplication extends Application implements ReactApplication {
@@ -22,11 +19,11 @@ public boolean getUseDeveloperSupport() {
@Override
protected List getPackages() {
- return Arrays.asList(
- new MainReactPackage(),
- new ReactVideoPackage(),
- new PickerPackage()
- );
+ @SuppressWarnings("UnnecessaryLocalVariable")
+ List packages = new PackageList(this).getPackages();
+ // Packages that cannot be autolinked yet can be added manually here, for example:
+ // packages.add(new MyReactNativePackage());
+ return packages;
}
};
diff --git a/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index cde69bccc..3f7c244b1 100644
Binary files a/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index c133a0cbd..5a6ea37e2 100644
Binary files a/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index bfa42f0e7..424e38916 100644
Binary files a/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 324e72cdd..efc21941d 100644
Binary files a/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/example/android/build.gradle b/example/android/build.gradle
index d4a1b452e..57acf829a 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -1,15 +1,23 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
+ ext {
+ buildToolsVersion = "28.0.3"
+ minSdkVersion = 16
+ compileSdkVersion = 28
+ targetSdkVersion = 28
+ supportLibVersion = "28.0.0"
+ }
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
+ google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.0.1'
+ classpath 'com.android.tools.build:gradle:3.4.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -21,6 +29,10 @@ allprojects {
mavenLocal()
jcenter()
maven { url "$rootDir/../node_modules/react-native/android" }
+ maven {
+ // Android JSC is installed from npm
+ url("$rootDir/../node_modules/jsc-android/dist")
+ }
maven { url 'https://maven.google.com' }
maven { url "https://jitpack.io" }
maven {
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
index 1fd964e90..812ac84eb 100644
--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
@@ -18,3 +18,6 @@
# org.gradle.parallel=true
android.useDeprecatedNdk=true
+
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index 11b016f6e..53f6c2194 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Dec 07 01:53:01 CET 2017
+#Fri May 10 14:06:26 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
index 2aa498d65..ab26400bc 100644
--- a/example/android/settings.gradle
+++ b/example/android/settings.gradle
@@ -1,8 +1,5 @@
rootProject.name = 'example'
-include ':app'
-include ':react-native-video'
-project(':react-native-video').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-video/android')
+apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
-include ':react-native-image-crop-picker'
-project(':react-native-image-crop-picker').projectDir = new File(settingsDir, '../../android')
\ No newline at end of file
+include ':app'
\ No newline at end of file
diff --git a/example/app.js b/example/app.js
index 98534cbe7..a5908fda8 100644
--- a/example/app.js
+++ b/example/app.js
@@ -35,16 +35,17 @@ export default class App extends Component {
};
}
- pickSingleWithCamera(cropping) {
+ pickSingleWithCamera(cropping, mediaType='photo') {
ImagePicker.openCamera({
cropping: cropping,
width: 500,
height: 500,
includeExif: true,
+ mediaType,
}).then(image => {
console.log('received image', image);
this.setState({
- image: {uri: image.path, width: image.width, height: image.height},
+ image: {uri: image.path, width: image.width, height: image.height, mime: image.mime},
images: null
});
}).catch(e => alert(e));
@@ -106,15 +107,15 @@ export default class App extends Component {
});
}
- pickSingle(cropit, circular=false) {
+ pickSingle(cropit, circular=false, mediaType) {
ImagePicker.openPicker({
- width: 300,
- height: 300,
+ width: 500,
+ height: 500,
cropping: cropit,
cropperCircleOverlay: circular,
- compressImageMaxWidth: 640,
- compressImageMaxHeight: 480,
- compressImageQuality: 0.5,
+ compressImageMaxWidth: 1000,
+ compressImageMaxHeight: 1000,
+ compressImageQuality: 1,
compressVideoPreset: 'MediumQuality',
includeExif: true,
}).then(image => {
@@ -134,6 +135,7 @@ export default class App extends Component {
multiple: true,
waitAnimationEnd: false,
includeExif: true,
+ forceJpg: true,
}).then(images => {
this.setState({
image: null,
@@ -150,6 +152,7 @@ export default class App extends Component {
}
renderVideo(video) {
+ console.log('rendering video');
return (
this.pickSingleWithCamera(false)} style={styles.button}>
- Select Single With Camera
+ Select Single Image With Camera
+
+ this.pickSingleWithCamera(false, mediaType='video')} style={styles.button}>
+ Select Single Video With Camera
this.pickSingleWithCamera(true)} style={styles.button}>
Select Single With Camera With Cropping
diff --git a/example/ios/Podfile b/example/ios/Podfile
index d46043b13..22a53a860 100644
--- a/example/ios/Podfile
+++ b/example/ios/Podfile
@@ -1,30 +1,31 @@
-platform :ios, '8.0'
+platform :ios, '9.0'
+require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
target 'example' do
- rn_path = '../node_modules/react-native'
+ pod 'React', :path => '../node_modules/react-native/'
+ pod 'React-Core', :path => '../node_modules/react-native/React'
+ pod 'React-DevSupport', :path => '../node_modules/react-native/React'
+ pod 'React-fishhook', :path => '../node_modules/react-native/Libraries/fishhook'
+ pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
+ pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
+ pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
+ pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image'
+ pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS'
+ pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network'
+ pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
+ pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
+ pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
+ pod 'React-RCTWebSocket', :path => '../node_modules/react-native/Libraries/WebSocket'
- pod 'yoga', path: "#{rn_path}/ReactCommon/yoga/yoga.podspec"
- pod 'React', path: rn_path, subspecs: [
- 'Core',
- 'RCTActionSheet',
- 'RCTAnimation',
- 'RCTGeolocation',
- 'RCTImage',
- 'RCTLinkingIOS',
- 'RCTNetwork',
- 'RCTSettings',
- 'RCTText',
- 'RCTVibration',
- 'RCTWebSocket'
- ]
+ pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
+ pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
+ pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
+ pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
+ pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
- pod 'RNImageCropPicker', :path => '../..'
-end
+ pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
+ pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
+ pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
-post_install do |installer|
- installer.pods_project.targets.each do |target|
- if target.name == "React"
- target.remove_from_project
- end
- end
-end
+ use_native_modules!
+end
\ No newline at end of file
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index ab7208df4..065189c2e 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -1,69 +1,211 @@
PODS:
+ - boost-for-react-native (1.63.0)
+ - DoubleConversion (1.1.6)
+ - Folly (2018.10.22.00):
+ - boost-for-react-native
+ - DoubleConversion
+ - Folly/Default (= 2018.10.22.00)
+ - glog
+ - Folly/Default (2018.10.22.00):
+ - boost-for-react-native
+ - DoubleConversion
+ - glog
+ - glog (0.3.5)
- QBImagePickerController (3.4.0)
- - React/Core (0.54.0):
- - yoga (= 0.54.0.React)
- - React/fishhook (0.54.0)
- - React/RCTActionSheet (0.54.0):
- - React/Core
- - React/RCTAnimation (0.54.0):
- - React/Core
- - React/RCTBlob (0.54.0):
- - React/Core
- - React/RCTGeolocation (0.54.0):
- - React/Core
- - React/RCTImage (0.54.0):
- - React/Core
- - React/RCTNetwork
- - React/RCTLinkingIOS (0.54.0):
- - React/Core
- - React/RCTNetwork (0.54.0):
- - React/Core
- - React/RCTSettings (0.54.0):
- - React/Core
- - React/RCTText (0.54.0):
- - React/Core
- - React/RCTVibration (0.54.0):
- - React/Core
- - React/RCTWebSocket (0.54.0):
- - React/Core
- - React/fishhook
- - React/RCTBlob
- - RNImageCropPicker (0.19.3):
+ - React (0.60.3):
+ - React-Core (= 0.60.3)
+ - React-DevSupport (= 0.60.3)
+ - React-RCTActionSheet (= 0.60.3)
+ - React-RCTAnimation (= 0.60.3)
+ - React-RCTBlob (= 0.60.3)
+ - React-RCTImage (= 0.60.3)
+ - React-RCTLinking (= 0.60.3)
+ - React-RCTNetwork (= 0.60.3)
+ - React-RCTSettings (= 0.60.3)
+ - React-RCTText (= 0.60.3)
+ - React-RCTVibration (= 0.60.3)
+ - React-RCTWebSocket (= 0.60.3)
+ - React-Core (0.60.3):
+ - Folly (= 2018.10.22.00)
+ - React-cxxreact (= 0.60.3)
+ - React-jsiexecutor (= 0.60.3)
+ - yoga (= 0.60.3.React)
+ - React-cxxreact (0.60.3):
+ - boost-for-react-native (= 1.63.0)
+ - DoubleConversion
+ - Folly (= 2018.10.22.00)
+ - glog
+ - React-jsinspector (= 0.60.3)
+ - React-DevSupport (0.60.3):
+ - React-Core (= 0.60.3)
+ - React-RCTWebSocket (= 0.60.3)
+ - React-fishhook (0.60.3)
+ - React-jsi (0.60.3):
+ - boost-for-react-native (= 1.63.0)
+ - DoubleConversion
+ - Folly (= 2018.10.22.00)
+ - glog
+ - React-jsi/Default (= 0.60.3)
+ - React-jsi/Default (0.60.3):
+ - boost-for-react-native (= 1.63.0)
+ - DoubleConversion
+ - Folly (= 2018.10.22.00)
+ - glog
+ - React-jsiexecutor (0.60.3):
+ - DoubleConversion
+ - Folly (= 2018.10.22.00)
+ - glog
+ - React-cxxreact (= 0.60.3)
+ - React-jsi (= 0.60.3)
+ - React-jsinspector (0.60.3)
+ - react-native-video (4.4.3):
+ - React
+ - react-native-video/Video (= 4.4.3)
+ - react-native-video/Video (4.4.3):
+ - React
+ - React-RCTActionSheet (0.60.3):
+ - React-Core (= 0.60.3)
+ - React-RCTAnimation (0.60.3):
+ - React-Core (= 0.60.3)
+ - React-RCTBlob (0.60.3):
+ - React-Core (= 0.60.3)
+ - React-RCTNetwork (= 0.60.3)
+ - React-RCTWebSocket (= 0.60.3)
+ - React-RCTImage (0.60.3):
+ - React-Core (= 0.60.3)
+ - React-RCTNetwork (= 0.60.3)
+ - React-RCTLinking (0.60.3):
+ - React-Core (= 0.60.3)
+ - React-RCTNetwork (0.60.3):
+ - React-Core (= 0.60.3)
+ - React-RCTSettings (0.60.3):
+ - React-Core (= 0.60.3)
+ - React-RCTText (0.60.3):
+ - React-Core (= 0.60.3)
+ - React-RCTVibration (0.60.3):
+ - React-Core (= 0.60.3)
+ - React-RCTWebSocket (0.60.3):
+ - React-Core (= 0.60.3)
+ - React-fishhook (= 0.60.3)
+ - RNImageCropPicker (0.24.1):
- QBImagePickerController
+ - React-Core
+ - React-RCTImage
- RSKImageCropper
- - RSKImageCropper (2.0.0)
- - yoga (0.54.0.React)
+ - RSKImageCropper (2.2.2)
+ - yoga (0.60.3.React)
DEPENDENCIES:
- - React/Core (from `../node_modules/react-native`)
- - React/RCTActionSheet (from `../node_modules/react-native`)
- - React/RCTAnimation (from `../node_modules/react-native`)
- - React/RCTGeolocation (from `../node_modules/react-native`)
- - React/RCTImage (from `../node_modules/react-native`)
- - React/RCTLinkingIOS (from `../node_modules/react-native`)
- - React/RCTNetwork (from `../node_modules/react-native`)
- - React/RCTSettings (from `../node_modules/react-native`)
- - React/RCTText (from `../node_modules/react-native`)
- - React/RCTVibration (from `../node_modules/react-native`)
- - React/RCTWebSocket (from `../node_modules/react-native`)
- - RNImageCropPicker (from `../..`)
- - yoga (from `../node_modules/react-native/ReactCommon/yoga/yoga.podspec`)
+ - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
+ - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
+ - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
+ - React (from `../node_modules/react-native/`)
+ - React-Core (from `../node_modules/react-native/React`)
+ - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`)
+ - React-DevSupport (from `../node_modules/react-native/React`)
+ - React-fishhook (from `../node_modules/react-native/Libraries/fishhook`)
+ - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
+ - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
+ - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
+ - react-native-video (from `../node_modules/react-native-video`)
+ - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
+ - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
+ - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`)
+ - React-RCTImage (from `../node_modules/react-native/Libraries/Image`)
+ - React-RCTLinking (from `../node_modules/react-native/Libraries/LinkingIOS`)
+ - React-RCTNetwork (from `../node_modules/react-native/Libraries/Network`)
+ - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`)
+ - React-RCTText (from `../node_modules/react-native/Libraries/Text`)
+ - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
+ - React-RCTWebSocket (from `../node_modules/react-native/Libraries/WebSocket`)
+ - RNImageCropPicker (from `../node_modules/react-native-image-crop-picker`)
+ - yoga (from `../node_modules/react-native/ReactCommon/yoga`)
+
+SPEC REPOS:
+ https://github.com/cocoapods/specs.git:
+ - boost-for-react-native
+ - QBImagePickerController
+ - RSKImageCropper
EXTERNAL SOURCES:
+ DoubleConversion:
+ :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
+ Folly:
+ :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
+ glog:
+ :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
React:
- :path: ../node_modules/react-native
+ :path: "../node_modules/react-native/"
+ React-Core:
+ :path: "../node_modules/react-native/React"
+ React-cxxreact:
+ :path: "../node_modules/react-native/ReactCommon/cxxreact"
+ React-DevSupport:
+ :path: "../node_modules/react-native/React"
+ React-fishhook:
+ :path: "../node_modules/react-native/Libraries/fishhook"
+ React-jsi:
+ :path: "../node_modules/react-native/ReactCommon/jsi"
+ React-jsiexecutor:
+ :path: "../node_modules/react-native/ReactCommon/jsiexecutor"
+ React-jsinspector:
+ :path: "../node_modules/react-native/ReactCommon/jsinspector"
+ react-native-video:
+ :path: "../node_modules/react-native-video"
+ React-RCTActionSheet:
+ :path: "../node_modules/react-native/Libraries/ActionSheetIOS"
+ React-RCTAnimation:
+ :path: "../node_modules/react-native/Libraries/NativeAnimation"
+ React-RCTBlob:
+ :path: "../node_modules/react-native/Libraries/Blob"
+ React-RCTImage:
+ :path: "../node_modules/react-native/Libraries/Image"
+ React-RCTLinking:
+ :path: "../node_modules/react-native/Libraries/LinkingIOS"
+ React-RCTNetwork:
+ :path: "../node_modules/react-native/Libraries/Network"
+ React-RCTSettings:
+ :path: "../node_modules/react-native/Libraries/Settings"
+ React-RCTText:
+ :path: "../node_modules/react-native/Libraries/Text"
+ React-RCTVibration:
+ :path: "../node_modules/react-native/Libraries/Vibration"
+ React-RCTWebSocket:
+ :path: "../node_modules/react-native/Libraries/WebSocket"
RNImageCropPicker:
- :path: ../..
+ :path: "../node_modules/react-native-image-crop-picker"
yoga:
- :path: ../node_modules/react-native/ReactCommon/yoga/yoga.podspec
+ :path: "../node_modules/react-native/ReactCommon/yoga"
SPEC CHECKSUMS:
+ boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
+ DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
+ Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
+ glog: 1f3da668190260b06b429bb211bfbee5cd790c28
QBImagePickerController: d54cf93db6decf26baf6ed3472f336ef35cae022
- React: c237e42de9c70e5cac6eeb52b4cfd3a0910c1f00
- RNImageCropPicker: a637beb8f4c76bf9fe8a89d404ad65a33c4215ac
- RSKImageCropper: d9a1acbc0600bf8decc8f0d21895872c99a9e4cf
- yoga: 55da126afc384965b96bff46652464373b330add
+ React: ac23e9cc8d2d4cfe9b536b5cc0c32d19b9937bcf
+ React-Core: 84de3cf80e31f0267c5ce0b5b482d59ce30a8a57
+ React-cxxreact: a802a1c6b14f3de66ba032460b424c17ececd1e2
+ React-DevSupport: ae72c4fc86c03197f007bb24404077c85f6dabc1
+ React-fishhook: 12bd79b4461280f441937dea83f11d9fb660edfc
+ React-jsi: c2b6e57836bcae2677a036384111dc2c58e94369
+ React-jsiexecutor: d9023c5c199114d2b6f38ec861a4d923c73d0735
+ React-jsinspector: 817b64f3c8a807f09d78620f4f505868d89b26f3
+ react-native-video: 556a560c8921379960a48c3e31baee84299050c2
+ React-RCTActionSheet: 9c42321fd5652515d706dd722c5a10b1970d7ec8
+ React-RCTAnimation: fabb087dde8964c9a835a7fabd0e7e5701787913
+ React-RCTBlob: 93f34281d9c9c9e216b25824309eed9fe22a5d41
+ React-RCTImage: b09f30159b048eb9a0f859f8f9b0878f3311e8eb
+ React-RCTLinking: 9dba672b3d5aadab59e93f9ab8c65e5e24b9fb73
+ React-RCTNetwork: 4b2f706819f08b6fa15c47909985f96b80859832
+ React-RCTSettings: 59c0eedc36b9aa9dd21cdbb5ab9591ba04132b1f
+ React-RCTText: b026f8350c2cbe0daeb9880dd9c6e018fce0daf7
+ React-RCTVibration: 5d9ed4a968e9d42880ddcc7c29bee3417c745408
+ React-RCTWebSocket: 69d8565d66043f244b4129f3d7154c5689fb7d3e
+ RNImageCropPicker: 4948e2883d262025613c45344e1027fe4c2e79a3
+ RSKImageCropper: 05e3b82a18da83ea3c2b7bffa7f2199a621d6802
+ yoga: 843fe25849b56131275bf3e5da2c468e96f68aff
-PODFILE CHECKSUM: b75025773b0aeae55b2be89eb9a053b9ad2f70ae
+PODFILE CHECKSUM: fbb7bdebf3c0bc5c852457d8633651e7642597f6
-COCOAPODS: 1.4.0
+COCOAPODS: 1.7.4
diff --git a/example/ios/example.xcodeproj/project.pbxproj b/example/ios/example.xcodeproj/project.pbxproj
index bde58914b..a4b170591 100644
--- a/example/ios/example.xcodeproj/project.pbxproj
+++ b/example/ios/example.xcodeproj/project.pbxproj
@@ -7,298 +7,15 @@
objects = {
/* Begin PBXBuildFile section */
- 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
- 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
- 00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
- 00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
- 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
- 00E356F31AD99517003FC87E /* exampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* exampleTests.m */; };
0BEAEB9C9085E265682ECE17 /* libPods-example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8617F59F4B274D55749C296B /* libPods-example.a */; };
- 133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
- 139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
- 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
- 140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
- 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
34A9DDBD1D7F43320012B1F5 /* QBImagePicker.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 34A9DDB81D7F43220012B1F5 /* QBImagePicker.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
34A9DDBF1D7F43320012B1F5 /* RSKImageCropper.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 34A9DDB91D7F43220012B1F5 /* RSKImageCropper.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
- 34F74E571E073501001D9901 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F74E351E0733E3001D9901 /* libRCTAnimation.a */; };
- 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
- C7358F2638924AE4ACDF2B3C /* libRCTVideo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B590311A8214ACA88447B83 /* libRCTVideo.a */; };
/* End PBXBuildFile section */
-/* Begin PBXContainerItemProxy section */
- 00C302AB1ABCB8CE00DB3ED1 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 134814201AA4EA6300B7C361;
- remoteInfo = RCTActionSheet;
- };
- 00C302B91ABCB90400DB3ED1 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 134814201AA4EA6300B7C361;
- remoteInfo = RCTGeolocation;
- };
- 00C302BF1ABCB91800DB3ED1 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 58B5115D1A9E6B3D00147676;
- remoteInfo = RCTImage;
- };
- 00C302DB1ABCB9D200DB3ED1 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 58B511DB1A9E6C8500147676;
- remoteInfo = RCTNetwork;
- };
- 00C302E31ABCB9EE00DB3ED1 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 832C81801AAF6DEF007FA2F7;
- remoteInfo = RCTVibration;
- };
- 00E356F41AD99517003FC87E /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 13B07F861A680F5B00A75B9A;
- remoteInfo = example;
- };
- 139105C01AF99BAD00B5F7CC /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 134814201AA4EA6300B7C361;
- remoteInfo = RCTSettings;
- };
- 139FDEF31B06529B00C62182 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 3C86DF461ADF2C930047B81A;
- remoteInfo = RCTWebSocket;
- };
- 146834031AC3E56700842450 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192;
- remoteInfo = React;
- };
- 341DB0201E31716A009BFCB3 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 3D3C059A1DE3340900C268FA;
- remoteInfo = yoga;
- };
- 341DB0221E31716A009BFCB3 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 3D3C06751DE3340C00C268FA;
- remoteInfo = "yoga-tvOS";
- };
- 341DB0241E31716A009BFCB3 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 3D3CD9251DE5FBEC00167DC4;
- remoteInfo = cxxreact;
- };
- 341DB0261E31716A009BFCB3 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4;
- remoteInfo = "cxxreact-tvOS";
- };
- 341DB0281E31716A009BFCB3 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4;
- remoteInfo = jschelpers;
- };
- 341DB02A1E31716A009BFCB3 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
- remoteInfo = "jschelpers-tvOS";
- };
- 341DB04D1E317316009BFCB3 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = CAE92B1397B64654977AE8E7 /* RCTVideo.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 134814201AA4EA6300B7C361;
- remoteInfo = RCTVideo;
- };
- 34BCCE401F27B7F800DD551F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = CAE92B1397B64654977AE8E7 /* RCTVideo.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 641E28441F0EEC8500443AF6;
- remoteInfo = "RCTVideo-tvOS";
- };
- 34BCCE501F27B7F800DD551F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 139D7ECE1E25DB7D00323FB7;
- remoteInfo = "third-party";
- };
- 34BCCE521F27B7F800DD551F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 3D383D3C1EBD27B6005632C8;
- remoteInfo = "third-party-tvOS";
- };
- 34BCCE541F27B7F800DD551F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 139D7E881E25C6D100323FB7;
- remoteInfo = "double-conversion";
- };
- 34BCCE561F27B7F800DD551F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 3D383D621EBD27B9005632C8;
- remoteInfo = "double-conversion-tvOS";
- };
- 34ECC90B204DF1E30053BBC0 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 3DBE0D001F3B181A0099AA32;
- remoteInfo = fishhook;
- };
- 34ECC90D204DF1E30053BBC0 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32;
- remoteInfo = "fishhook-tvOS";
- };
- 34ECC91F204DF1E30053BBC0 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = EBF21BDC1FC498900052F4D5;
- remoteInfo = jsinspector;
- };
- 34ECC921204DF1E30053BBC0 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = EBF21BFA1FC4989A0052F4D5;
- remoteInfo = "jsinspector-tvOS";
- };
- 34ECC923204DF1E30053BBC0 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
- remoteInfo = privatedata;
- };
- 34ECC925204DF1E30053BBC0 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04;
- remoteInfo = "privatedata-tvOS";
- };
- 34F74E341E0733E3001D9901 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 34F74E2D1E0733E2001D9901 /* RCTAnimation.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 134814201AA4EA6300B7C361;
- remoteInfo = RCTAnimation;
- };
- 34F74E361E0733E3001D9901 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 34F74E2D1E0733E2001D9901 /* RCTAnimation.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2D2A28201D9B03D100D4039D;
- remoteInfo = "RCTAnimation-tvOS";
- };
- 34F74E3B1E0733E3001D9901 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2D2A283A1D9B042B00D4039D;
- remoteInfo = "RCTImage-tvOS";
- };
- 34F74E3F1E0733E3001D9901 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2D2A28471D9B043800D4039D;
- remoteInfo = "RCTLinking-tvOS";
- };
- 34F74E431E0733E3001D9901 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2D2A28541D9B044C00D4039D;
- remoteInfo = "RCTNetwork-tvOS";
- };
- 34F74E471E0733E3001D9901 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2D2A28611D9B046600D4039D;
- remoteInfo = "RCTSettings-tvOS";
- };
- 34F74E4B1E0733E3001D9901 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2D2A287B1D9B048500D4039D;
- remoteInfo = "RCTText-tvOS";
- };
- 34F74E511E0733E3001D9901 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2D2A28881D9B049200D4039D;
- remoteInfo = "RCTWebSocket-tvOS";
- };
- 34F74E551E0733E3001D9901 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2D2A28131D9B038B00D4039D;
- remoteInfo = "React-tvOS";
- };
- 78C398B81ACF4ADC00677621 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 134814201AA4EA6300B7C361;
- remoteInfo = RCTLinking;
- };
- 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 58B5119B1A9E6C1200147676;
- remoteInfo = RCTText;
- };
-/* End PBXContainerItemProxy section */
-
/* Begin PBXCopyFilesBuildPhase section */
340AECD21D799C3D009F3A60 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
@@ -316,17 +33,9 @@
/* Begin PBXFileReference section */
008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = ""; };
- 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = "../node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj"; sourceTree = ""; };
- 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = "../node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj"; sourceTree = ""; };
- 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = "../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj"; sourceTree = ""; };
- 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = ""; };
- 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = "../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"; sourceTree = ""; };
- 00E356EE1AD99517003FC87E /* exampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = exampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; };
00E356F21AD99517003FC87E /* exampleTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = exampleTests.m; sourceTree = ""; };
038E3B40AAC8B9602A0C72CB /* Pods-example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example.release.xcconfig"; path = "Pods/Target Support Files/Pods-example/Pods-example.release.xcconfig"; sourceTree = ""; };
- 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = ""; };
- 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = ""; };
13B07F961A680F5B00A75B9A /* example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example.app; sourceTree = BUILT_PRODUCTS_DIR; };
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = example/AppDelegate.h; sourceTree = ""; };
13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = example/AppDelegate.m; sourceTree = ""; };
@@ -334,43 +43,18 @@
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = example/Images.xcassets; sourceTree = ""; };
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = example/Info.plist; sourceTree = ""; };
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = example/main.m; sourceTree = ""; };
- 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; };
34A9DDB81D7F43220012B1F5 /* QBImagePicker.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = QBImagePicker.framework; sourceTree = ""; };
34A9DDB91D7F43220012B1F5 /* RSKImageCropper.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RSKImageCropper.framework; sourceTree = ""; };
- 34F74E2D1E0733E2001D9901 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = ""; };
5B590311A8214ACA88447B83 /* libRCTVideo.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTVideo.a; sourceTree = ""; };
5B98ADA044EF4A42F2813B5F /* Pods-example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-example/Pods-example.debug.xcconfig"; sourceTree = ""; };
- 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; };
- 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; };
8617F59F4B274D55749C296B /* libPods-example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
- CAE92B1397B64654977AE8E7 /* RCTVideo.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTVideo.xcodeproj; path = "../node_modules/react-native-video/ios/RCTVideo.xcodeproj"; sourceTree = ""; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
- 00E356EB1AD99517003FC87E /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
13B07F8C1A680F5B00A75B9A /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 34F74E571E073501001D9901 /* libRCTAnimation.a in Frameworks */,
- 146834051AC3E58100842450 /* libReact.a in Frameworks */,
- 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
- 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
- 00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */,
- 133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */,
- 00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */,
- 139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */,
- 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
- 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
- 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
- C7358F2638924AE4ACDF2B3C /* libRCTVideo.a in Frameworks */,
0BEAEB9C9085E265682ECE17 /* libPods-example.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -378,48 +62,6 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
- 00C302A81ABCB8CE00DB3ED1 /* Products */ = {
- isa = PBXGroup;
- children = (
- 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */,
- );
- name = Products;
- sourceTree = "";
- };
- 00C302B61ABCB90400DB3ED1 /* Products */ = {
- isa = PBXGroup;
- children = (
- 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */,
- );
- name = Products;
- sourceTree = "";
- };
- 00C302BC1ABCB91800DB3ED1 /* Products */ = {
- isa = PBXGroup;
- children = (
- 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */,
- 34F74E3C1E0733E3001D9901 /* libRCTImage-tvOS.a */,
- );
- name = Products;
- sourceTree = "";
- };
- 00C302D41ABCB9D200DB3ED1 /* Products */ = {
- isa = PBXGroup;
- children = (
- 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */,
- 34F74E441E0733E3001D9901 /* libRCTNetwork-tvOS.a */,
- );
- name = Products;
- sourceTree = "";
- };
- 00C302E01ABCB9EE00DB3ED1 /* Products */ = {
- isa = PBXGroup;
- children = (
- 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */,
- );
- name = Products;
- sourceTree = "";
- };
00E356EF1AD99517003FC87E /* exampleTests */ = {
isa = PBXGroup;
children = (
@@ -446,26 +88,6 @@
name = Pods;
sourceTree = "";
};
- 139105B71AF99BAD00B5F7CC /* Products */ = {
- isa = PBXGroup;
- children = (
- 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */,
- 34F74E481E0733E3001D9901 /* libRCTSettings-tvOS.a */,
- );
- name = Products;
- sourceTree = "";
- };
- 139FDEE71B06529A00C62182 /* Products */ = {
- isa = PBXGroup;
- children = (
- 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */,
- 34F74E521E0733E3001D9901 /* libRCTWebSocket-tvOS.a */,
- 34ECC90C204DF1E30053BBC0 /* libfishhook.a */,
- 34ECC90E204DF1E30053BBC0 /* libfishhook-tvOS.a */,
- );
- name = Products;
- sourceTree = "";
- };
13B07FAE1A68108700A75B9A /* example */ = {
isa = PBXGroup;
children = (
@@ -480,38 +102,6 @@
name = example;
sourceTree = "";
};
- 146834001AC3E56700842450 /* Products */ = {
- isa = PBXGroup;
- children = (
- 146834041AC3E56700842450 /* libReact.a */,
- 34F74E561E0733E3001D9901 /* libReact.a */,
- 341DB0211E31716A009BFCB3 /* libyoga.a */,
- 341DB0231E31716A009BFCB3 /* libyoga.a */,
- 341DB0251E31716A009BFCB3 /* libcxxreact.a */,
- 341DB0271E31716A009BFCB3 /* libcxxreact.a */,
- 341DB0291E31716A009BFCB3 /* libjschelpers.a */,
- 341DB02B1E31716A009BFCB3 /* libjschelpers.a */,
- 34ECC920204DF1E30053BBC0 /* libjsinspector.a */,
- 34ECC922204DF1E30053BBC0 /* libjsinspector-tvOS.a */,
- 34BCCE511F27B7F800DD551F /* libthird-party.a */,
- 34BCCE531F27B7F800DD551F /* libthird-party.a */,
- 34BCCE551F27B7F800DD551F /* libdouble-conversion.a */,
- 34BCCE571F27B7F800DD551F /* libdouble-conversion.a */,
- 34ECC924204DF1E30053BBC0 /* libprivatedata.a */,
- 34ECC926204DF1E30053BBC0 /* libprivatedata-tvOS.a */,
- );
- name = Products;
- sourceTree = "";
- };
- 341DB03A1E317316009BFCB3 /* Products */ = {
- isa = PBXGroup;
- children = (
- 341DB04E1E317316009BFCB3 /* libRCTVideo.a */,
- 34BCCE411F27B7F800DD551F /* libRCTVideo.a */,
- );
- name = Products;
- sourceTree = "";
- };
3468219D1F7BAED90093F7F5 /* Recovered References */ = {
isa = PBXGroup;
children = (
@@ -529,15 +119,6 @@
path = ImageCropPickerSDK;
sourceTree = "";
};
- 34F74E2E1E0733E2001D9901 /* Products */ = {
- isa = PBXGroup;
- children = (
- 34F74E351E0733E3001D9901 /* libRCTAnimation.a */,
- 34F74E371E0733E3001D9901 /* libRCTAnimation.a */,
- );
- name = Products;
- sourceTree = "";
- };
3EB888A3E4C0A2B8E812B4B1 /* Frameworks */ = {
isa = PBXGroup;
children = (
@@ -546,43 +127,13 @@
name = Frameworks;
sourceTree = "";
};
- 78C398B11ACF4ADC00677621 /* Products */ = {
- isa = PBXGroup;
- children = (
- 78C398B91ACF4ADC00677621 /* libRCTLinking.a */,
- 34F74E401E0733E3001D9901 /* libRCTLinking-tvOS.a */,
- );
- name = Products;
- sourceTree = "";
- };
832341AE1AAA6A7D00B99B32 /* Libraries */ = {
isa = PBXGroup;
children = (
- 34F74E2D1E0733E2001D9901 /* RCTAnimation.xcodeproj */,
- 146833FF1AC3E56700842450 /* React.xcodeproj */,
- 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
- 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */,
- 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */,
- 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */,
- 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */,
- 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */,
- 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
- 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
- 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
- CAE92B1397B64654977AE8E7 /* RCTVideo.xcodeproj */,
);
name = Libraries;
sourceTree = "";
};
- 832341B11AAA6A8300B99B32 /* Products */ = {
- isa = PBXGroup;
- children = (
- 832341B51AAA6A8300B99B32 /* libRCTText.a */,
- 34F74E4C1E0733E3001D9901 /* libRCTText-tvOS.a */,
- );
- name = Products;
- sourceTree = "";
- };
83CBB9F61A601CBA00E9B192 = {
isa = PBXGroup;
children = (
@@ -603,7 +154,6 @@
isa = PBXGroup;
children = (
13B07F961A680F5B00A75B9A /* example.app */,
- 00E356EE1AD99517003FC87E /* exampleTests.xctest */,
);
name = Products;
sourceTree = "";
@@ -611,24 +161,6 @@
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
- 00E356ED1AD99517003FC87E /* exampleTests */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "exampleTests" */;
- buildPhases = (
- 00E356EA1AD99517003FC87E /* Sources */,
- 00E356EB1AD99517003FC87E /* Frameworks */,
- 00E356EC1AD99517003FC87E /* Resources */,
- );
- buildRules = (
- );
- dependencies = (
- 00E356F51AD99517003FC87E /* PBXTargetDependency */,
- );
- name = exampleTests;
- productName = exampleTests;
- productReference = 00E356EE1AD99517003FC87E /* exampleTests.xctest */;
- productType = "com.apple.product-type.bundle.unit-test";
- };
13B07F861A680F5B00A75B9A /* example */ = {
isa = PBXNativeTarget;
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "example" */;
@@ -639,8 +171,7 @@
13B07F8E1A680F5B00A75B9A /* Resources */,
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
340AECD21D799C3D009F3A60 /* Embed Frameworks */,
- 4C8DF49F14051D129F31F9BF /* [CP] Embed Pods Frameworks */,
- 39B130511F44D996A17764D3 /* [CP] Copy Pods Resources */,
+ D0E9AC6B3F69B52776B184B5 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
@@ -660,10 +191,6 @@
LastUpgradeCheck = 730;
ORGANIZATIONNAME = Facebook;
TargetAttributes = {
- 00E356ED1AD99517003FC87E = {
- CreatedOnToolsVersion = 6.2;
- TestTargetID = 13B07F861A680F5B00A75B9A;
- };
13B07F861A680F5B00A75B9A = {
DevelopmentTeam = 5WFBC66J2G;
};
@@ -674,340 +201,21 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
+ English,
en,
Base,
);
mainGroup = 83CBB9F61A601CBA00E9B192;
productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
projectDirPath = "";
- projectReferences = (
- {
- ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
- ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
- },
- {
- ProductGroup = 34F74E2E1E0733E2001D9901 /* Products */;
- ProjectRef = 34F74E2D1E0733E2001D9901 /* RCTAnimation.xcodeproj */;
- },
- {
- ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */;
- ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
- },
- {
- ProductGroup = 00C302BC1ABCB91800DB3ED1 /* Products */;
- ProjectRef = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
- },
- {
- ProductGroup = 78C398B11ACF4ADC00677621 /* Products */;
- ProjectRef = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */;
- },
- {
- ProductGroup = 00C302D41ABCB9D200DB3ED1 /* Products */;
- ProjectRef = 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */;
- },
- {
- ProductGroup = 139105B71AF99BAD00B5F7CC /* Products */;
- ProjectRef = 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */;
- },
- {
- ProductGroup = 832341B11AAA6A8300B99B32 /* Products */;
- ProjectRef = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */;
- },
- {
- ProductGroup = 00C302E01ABCB9EE00DB3ED1 /* Products */;
- ProjectRef = 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */;
- },
- {
- ProductGroup = 341DB03A1E317316009BFCB3 /* Products */;
- ProjectRef = CAE92B1397B64654977AE8E7 /* RCTVideo.xcodeproj */;
- },
- {
- ProductGroup = 139FDEE71B06529A00C62182 /* Products */;
- ProjectRef = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
- },
- {
- ProductGroup = 146834001AC3E56700842450 /* Products */;
- ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */;
- },
- );
projectRoot = "";
targets = (
13B07F861A680F5B00A75B9A /* example */,
- 00E356ED1AD99517003FC87E /* exampleTests */,
);
};
/* End PBXProject section */
-/* Begin PBXReferenceProxy section */
- 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRCTActionSheet.a;
- remoteRef = 00C302AB1ABCB8CE00DB3ED1 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRCTGeolocation.a;
- remoteRef = 00C302B91ABCB90400DB3ED1 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRCTImage.a;
- remoteRef = 00C302BF1ABCB91800DB3ED1 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRCTNetwork.a;
- remoteRef = 00C302DB1ABCB9D200DB3ED1 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRCTVibration.a;
- remoteRef = 00C302E31ABCB9EE00DB3ED1 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRCTSettings.a;
- remoteRef = 139105C01AF99BAD00B5F7CC /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRCTWebSocket.a;
- remoteRef = 139FDEF31B06529B00C62182 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 146834041AC3E56700842450 /* libReact.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libReact.a;
- remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 341DB0211E31716A009BFCB3 /* libyoga.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libyoga.a;
- remoteRef = 341DB0201E31716A009BFCB3 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 341DB0231E31716A009BFCB3 /* libyoga.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libyoga.a;
- remoteRef = 341DB0221E31716A009BFCB3 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 341DB0251E31716A009BFCB3 /* libcxxreact.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libcxxreact.a;
- remoteRef = 341DB0241E31716A009BFCB3 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 341DB0271E31716A009BFCB3 /* libcxxreact.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libcxxreact.a;
- remoteRef = 341DB0261E31716A009BFCB3 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 341DB0291E31716A009BFCB3 /* libjschelpers.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libjschelpers.a;
- remoteRef = 341DB0281E31716A009BFCB3 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 341DB02B1E31716A009BFCB3 /* libjschelpers.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libjschelpers.a;
- remoteRef = 341DB02A1E31716A009BFCB3 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 341DB04E1E317316009BFCB3 /* libRCTVideo.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRCTVideo.a;
- remoteRef = 341DB04D1E317316009BFCB3 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34BCCE411F27B7F800DD551F /* libRCTVideo.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRCTVideo.a;
- remoteRef = 34BCCE401F27B7F800DD551F /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34BCCE511F27B7F800DD551F /* libthird-party.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libthird-party.a";
- remoteRef = 34BCCE501F27B7F800DD551F /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34BCCE531F27B7F800DD551F /* libthird-party.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libthird-party.a";
- remoteRef = 34BCCE521F27B7F800DD551F /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34BCCE551F27B7F800DD551F /* libdouble-conversion.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libdouble-conversion.a";
- remoteRef = 34BCCE541F27B7F800DD551F /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34BCCE571F27B7F800DD551F /* libdouble-conversion.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libdouble-conversion.a";
- remoteRef = 34BCCE561F27B7F800DD551F /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34ECC90C204DF1E30053BBC0 /* libfishhook.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libfishhook.a;
- remoteRef = 34ECC90B204DF1E30053BBC0 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34ECC90E204DF1E30053BBC0 /* libfishhook-tvOS.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libfishhook-tvOS.a";
- remoteRef = 34ECC90D204DF1E30053BBC0 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34ECC920204DF1E30053BBC0 /* libjsinspector.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libjsinspector.a;
- remoteRef = 34ECC91F204DF1E30053BBC0 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34ECC922204DF1E30053BBC0 /* libjsinspector-tvOS.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libjsinspector-tvOS.a";
- remoteRef = 34ECC921204DF1E30053BBC0 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34ECC924204DF1E30053BBC0 /* libprivatedata.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libprivatedata.a;
- remoteRef = 34ECC923204DF1E30053BBC0 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34ECC926204DF1E30053BBC0 /* libprivatedata-tvOS.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libprivatedata-tvOS.a";
- remoteRef = 34ECC925204DF1E30053BBC0 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34F74E351E0733E3001D9901 /* libRCTAnimation.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRCTAnimation.a;
- remoteRef = 34F74E341E0733E3001D9901 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34F74E371E0733E3001D9901 /* libRCTAnimation.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRCTAnimation.a;
- remoteRef = 34F74E361E0733E3001D9901 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34F74E3C1E0733E3001D9901 /* libRCTImage-tvOS.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libRCTImage-tvOS.a";
- remoteRef = 34F74E3B1E0733E3001D9901 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34F74E401E0733E3001D9901 /* libRCTLinking-tvOS.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libRCTLinking-tvOS.a";
- remoteRef = 34F74E3F1E0733E3001D9901 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34F74E441E0733E3001D9901 /* libRCTNetwork-tvOS.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libRCTNetwork-tvOS.a";
- remoteRef = 34F74E431E0733E3001D9901 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34F74E481E0733E3001D9901 /* libRCTSettings-tvOS.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libRCTSettings-tvOS.a";
- remoteRef = 34F74E471E0733E3001D9901 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34F74E4C1E0733E3001D9901 /* libRCTText-tvOS.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libRCTText-tvOS.a";
- remoteRef = 34F74E4B1E0733E3001D9901 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34F74E521E0733E3001D9901 /* libRCTWebSocket-tvOS.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libRCTWebSocket-tvOS.a";
- remoteRef = 34F74E511E0733E3001D9901 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 34F74E561E0733E3001D9901 /* libReact.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libReact.a;
- remoteRef = 34F74E551E0733E3001D9901 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 78C398B91ACF4ADC00677621 /* libRCTLinking.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRCTLinking.a;
- remoteRef = 78C398B81ACF4ADC00677621 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 832341B51AAA6A8300B99B32 /* libRCTText.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRCTText.a;
- remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
-/* End PBXReferenceProxy section */
-
/* Begin PBXResourcesBuildPhase section */
- 00E356EC1AD99517003FC87E /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
13B07F8E1A680F5B00A75B9A /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
@@ -1034,13 +242,13 @@
shellPath = /bin/sh;
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
};
- 39B130511F44D996A17764D3 /* [CP] Copy Pods Resources */ = {
+ D0E9AC6B3F69B52776B184B5 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
- "${SRCROOT}/Pods/Target Support Files/Pods-example/Pods-example-resources.sh",
+ "${PODS_ROOT}/Target Support Files/Pods-example/Pods-example-resources.sh",
"${PODS_CONFIGURATION_BUILD_DIR}/QBImagePickerController/QBImagePicker.bundle",
"${PODS_ROOT}/RSKImageCropper/RSKImageCropper/RSKImageCropperStrings.bundle",
);
@@ -1051,22 +259,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-example/Pods-example-resources.sh\"\n";
- showEnvVarsInLog = 0;
- };
- 4C8DF49F14051D129F31F9BF /* [CP] Embed Pods Frameworks */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "[CP] Embed Pods Frameworks";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-example/Pods-example-frameworks.sh\"\n";
+ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-example/Pods-example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
DAF711D8831E8B798A174A11 /* [CP] Check Pods Manifest.lock */ = {
@@ -1090,14 +283,6 @@
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
- 00E356EA1AD99517003FC87E /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 00E356F31AD99517003FC87E /* exampleTests.m in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
13B07F871A680F5B00A75B9A /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -1109,14 +294,6 @@
};
/* End PBXSourcesBuildPhase section */
-/* Begin PBXTargetDependency section */
- 00E356F51AD99517003FC87E /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 13B07F861A680F5B00A75B9A /* example */;
- targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
/* Begin PBXVariantGroup section */
13B07FB11A68108700A75B9A /* LaunchScreen.xib */ = {
isa = PBXVariantGroup;
@@ -1130,47 +307,6 @@
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
- 00E356F61AD99517003FC87E /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- BUNDLE_LOADER = "$(TEST_HOST)";
- GCC_PREPROCESSOR_DEFINITIONS = (
- "DEBUG=1",
- "$(inherited)",
- );
- INFOPLIST_FILE = exampleTests/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 8.2;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/$(TARGET_NAME)\"",
- "\"$(SRCROOT)/$(TARGET_NAME)\"",
- );
- PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
- PRODUCT_NAME = "$(TARGET_NAME)";
- TEST_HOST = "$(BUILT_PRODUCTS_DIR)/example.app/example";
- };
- name = Debug;
- };
- 00E356F71AD99517003FC87E /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- BUNDLE_LOADER = "$(TEST_HOST)";
- COPY_PHASE_STRIP = NO;
- INFOPLIST_FILE = exampleTests/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 8.2;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/$(TARGET_NAME)\"",
- "\"$(SRCROOT)/$(TARGET_NAME)\"",
- );
- PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
- PRODUCT_NAME = "$(TARGET_NAME)";
- TEST_HOST = "$(BUILT_PRODUCTS_DIR)/example.app/example";
- };
- name = Release;
- };
13B07F941A680F5B00A75B9A /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 5B98ADA044EF4A42F2813B5F /* Pods-example.debug.xcconfig */;
@@ -1179,6 +315,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEAD_CODE_STRIPPING = YES;
+ DEVELOPMENT_TEAM = 5WFBC66J2G;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/ImageCropPickerSDK",
@@ -1196,7 +333,7 @@
"-ObjC",
"-lc++",
);
- PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.imagecroppicker;
+ PRODUCT_BUNDLE_IDENTIFIER = ivpusic.react.native.imagecroppicker;
PRODUCT_NAME = example;
PROVISIONING_PROFILE = "";
};
@@ -1210,6 +347,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEAD_CODE_STRIPPING = YES;
+ DEVELOPMENT_TEAM = 5WFBC66J2G;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/ImageCropPickerSDK",
@@ -1227,7 +365,7 @@
"-ObjC",
"-lc++",
);
- PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.imagecroppicker;
+ PRODUCT_BUNDLE_IDENTIFIER = ivpusic.react.native.imagecroppicker;
PRODUCT_NAME = example;
PROVISIONING_PROFILE = "";
};
@@ -1272,7 +410,7 @@
"$(SRCROOT)/../node_modules/react-native-video",
"$(SRCROOT)/../node_modules/react-native-video/ios",
);
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -1311,7 +449,7 @@
"$(SRCROOT)/../node_modules/react-native-video",
"$(SRCROOT)/../node_modules/react-native-video/ios",
);
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
@@ -1321,15 +459,6 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
- 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "exampleTests" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 00E356F61AD99517003FC87E /* Debug */,
- 00E356F71AD99517003FC87E /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "example" */ = {
isa = XCConfigurationList;
buildConfigurations = (
diff --git a/example/ios/example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/example/ios/example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000..18d981003
--- /dev/null
+++ b/example/ios/example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+
+
+
+
+ IDEDidComputeMac32BitWarning
+
+
diff --git a/example/ios/example/Info.plist b/example/ios/example/Info.plist
index 2a191b76a..ec972f68f 100644
--- a/example/ios/example/Info.plist
+++ b/example/ios/example/Info.plist
@@ -33,8 +33,14 @@
+ NSCameraUsageDescription
+ Testing purposes
+ NSMicrophoneUsageDescription
+ Testing purposes
NSLocationWhenInUseUsageDescription
NSPhotoLibraryUsageDescription
+ Testing purposes
UILaunchStoryboardName
LaunchScreen
UIRequiredDeviceCapabilities
@@ -47,10 +53,6 @@
UIInterfaceOrientationLandscapeLeft
UIInterfaceOrientationLandscapeRight
- NSPhotoLibraryUsageDescription
- Testing purposes
- NSCameraUsageDescription
- Testing purposes
UIViewControllerBasedStatusBarAppearance
+
+
+
-
@@ -10,19 +12,19 @@
-
-
-
-
-
-
+
-
+
@@ -122,9 +122,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -275,7 +273,7 @@
-
diff --git a/ios/src/Compression.m b/ios/src/Compression.m
index 8daaf1cae..c4b63c7ca 100644
--- a/ios/src/Compression.m
+++ b/ios/src/Compression.m
@@ -21,38 +21,36 @@ - (instancetype)init {
@"HighestQuality": AVAssetExportPresetHighestQuality,
@"Passthrough": AVAssetExportPresetPassthrough,
}];
- NSOperatingSystemVersion systemVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
- if (systemVersion.majorVersion >= 9) {
+
+ if (@available(iOS 9.0, *)) {
[dic addEntriesFromDictionary:@{@"3840x2160": AVAssetExportPreset3840x2160}];
+ } else {
+ // Fallback on earlier versions
}
+
self.exportPresets = dic;
return self;
}
- (ImageResult*) compressImageDimensions:(UIImage*)image
- withOptions:(NSDictionary*)options {
- NSNumber *maxWidth = [options valueForKey:@"compressImageMaxWidth"];
- NSNumber *maxHeight = [options valueForKey:@"compressImageMaxHeight"];
- ImageResult *result = [[ImageResult alloc] init];
-
- //[origin] if ([maxWidth integerValue] == 0 || [maxHeight integerValue] == 0) {
- //when pick a width< height image and only set "compressImageMaxWidth",will cause a {0,0}size image
- //Now fix it
- if ([maxWidth integerValue] == 0 || [maxHeight integerValue] == 0) {
- result.width = [NSNumber numberWithFloat:image.size.width];
- result.height = [NSNumber numberWithFloat:image.size.height];
- result.image = image;
- return result;
- }
+ compressImageMaxWidth:(CGFloat)maxWidth
+ compressImageMaxHeight:(CGFloat)maxHeight
+ intoResult:(ImageResult*)result {
CGFloat oldWidth = image.size.width;
CGFloat oldHeight = image.size.height;
- CGFloat scaleFactor = (oldWidth > oldHeight) ? [maxWidth floatValue] / oldWidth : [maxHeight floatValue] / oldHeight;
+ int newWidth = 0;
+ int newHeight = 0;
- int newWidth = oldWidth * scaleFactor;
- int newHeight = oldHeight * scaleFactor;
+ if (maxWidth < maxHeight) {
+ newWidth = maxWidth;
+ newHeight = (oldHeight / oldWidth) * newWidth;
+ } else {
+ newHeight = maxHeight;
+ newWidth = (oldWidth / oldHeight) * newHeight;
+ }
CGSize newSize = CGSizeMake(newWidth, newHeight);
UIGraphicsBeginImageContext(newSize);
@@ -68,17 +66,67 @@ - (ImageResult*) compressImageDimensions:(UIImage*)image
- (ImageResult*) compressImage:(UIImage*)image
withOptions:(NSDictionary*)options {
- ImageResult *result = [self compressImageDimensions:image withOptions:options];
+ ImageResult *result = [[ImageResult alloc] init];
+ result.width = @(image.size.width);
+ result.height = @(image.size.height);
+ result.image = image;
+ result.mime = @"image/jpeg";
+
+ NSNumber *compressImageMaxWidth = [options valueForKey:@"compressImageMaxWidth"];
+ NSNumber *compressImageMaxHeight = [options valueForKey:@"compressImageMaxHeight"];
+
+ // determine if it is necessary to resize image
+ BOOL shouldResizeWidth = (compressImageMaxWidth != nil && [compressImageMaxWidth floatValue] < image.size.width);
+ BOOL shouldResizeHeight = (compressImageMaxHeight != nil && [compressImageMaxHeight floatValue] < image.size.height);
+
+ if (shouldResizeWidth || shouldResizeHeight) {
+ CGFloat maxWidth = compressImageMaxWidth != nil ? [compressImageMaxWidth floatValue] : image.size.width;
+ CGFloat maxHeight = compressImageMaxHeight != nil ? [compressImageMaxHeight floatValue] : image.size.height;
+
+ [self compressImageDimensions:image
+ compressImageMaxWidth:maxWidth
+ compressImageMaxHeight:maxHeight
+ intoResult:result];
+ }
+
+ // parse desired image quality
NSNumber *compressQuality = [options valueForKey:@"compressImageQuality"];
if (compressQuality == nil) {
- compressQuality = [NSNumber numberWithFloat:1];
+ compressQuality = [NSNumber numberWithFloat:0.8];
}
+ // convert image to jpeg representation
result.data = UIImageJPEGRepresentation(result.image, [compressQuality floatValue]);
- result.mime = @"image/jpeg";
return result;
}
-@end
+- (void)compressVideo:(NSURL*)inputURL
+ outputURL:(NSURL*)outputURL
+ withOptions:(NSDictionary*)options
+ handler:(void (^)(AVAssetExportSession*))handler {
+
+ NSString *presetKey = [options valueForKey:@"compressVideoPreset"];
+ if (presetKey == nil) {
+ presetKey = @"MediumQuality";
+ }
+
+ NSString *preset = [self.exportPresets valueForKey:presetKey];
+ if (preset == nil) {
+ preset = AVAssetExportPresetMediumQuality;
+ }
+
+ [[NSFileManager defaultManager] removeItemAtURL:outputURL error:nil];
+ AVURLAsset *asset = [AVURLAsset URLAssetWithURL:inputURL options:nil];
+ AVAssetExportSession *exportSession = [[AVAssetExportSession alloc] initWithAsset:asset presetName:preset];
+ exportSession.shouldOptimizeForNetworkUse = YES;
+ exportSession.outputURL = outputURL;
+ exportSession.outputFileType = AVFileTypeMPEG4;
+
+ [exportSession exportAsynchronouslyWithCompletionHandler:^(void) {
+ handler(exportSession);
+ }];
+}
+
+@end
\ No newline at end of file
diff --git a/ios/src/ImageCropPicker.m b/ios/src/ImageCropPicker.m
index 83a370731..fd156384f 100644
--- a/ios/src/ImageCropPicker.m
+++ b/ios/src/ImageCropPicker.m
@@ -5,6 +5,8 @@
// Copyright © 2016 Facebook. All rights reserved.
//
+#import
+
#import "ImageCropPicker.h"
#import
#import
@@ -86,11 +88,15 @@ - (instancetype)init
@"waitAnimationEnd": @YES,
@"height": @200,
@"useFrontCamera": @NO,
- @"compressImageQuality": @1,
+ @"avoidEmptySpaceAroundImage": @YES,
+ @"compressImageQuality": @0.8,
@"compressVideoPreset": @"MediumQuality",
@"loadingLabelText": @"Processing assets...",
@"mediaType": @"any",
- @"showsSelectedCount": @YES
+ @"showsSelectedCount": @YES,
+ @"forceJpg": @NO,
+ @"cropperCancelText": @"Cancel",
+ @"cropperChooseText": @"Choose"
};
self.compression = [[Compression alloc] init];
}
@@ -172,8 +178,18 @@ - (UIViewController*) getRootVC {
picker.delegate = self;
picker.allowsEditing = NO;
picker.sourceType = UIImagePickerControllerSourceTypeCamera;
-
+
NSString *mediaType = [self.options objectForKey:@"mediaType"];
+
+ if ([mediaType isEqualToString:@"video"]) {
+ NSArray *availableTypes = [UIImagePickerController availableMediaTypesForSourceType:UIImagePickerControllerSourceTypeCamera];
+
+ if ([availableTypes containsObject:(NSString *)kUTTypeMovie]) {
+ picker.mediaTypes = [[NSArray alloc] initWithObjects:(NSString *)kUTTypeMovie, nil];
+ picker.videoQuality = UIImagePickerControllerQualityTypeHigh;
+ }
+ }
+
if ([[self.options objectForKey:@"useFrontCamera"] boolValue]) {
picker.cameraDevice = UIImagePickerControllerCameraDeviceFront;
}
@@ -368,6 +384,7 @@ - (BOOL)cleanTmpDirectory {
@"Animated" : @(PHAssetCollectionSubtypeSmartAlbumAnimated),
@"LongExposure" : @(PHAssetCollectionSubtypeSmartAlbumLongExposures),
};
+
NSMutableArray *albumsToShow = [NSMutableArray arrayWithCapacity:smartAlbums.count];
for (NSString* smartAlbum in smartAlbums) {
if ([albums objectForKey:smartAlbum] != nil) {
@@ -381,17 +398,17 @@ - (BOOL)cleanTmpDirectory {
imagePickerController.mediaType = QBImagePickerMediaTypeImage;
} else {
NSString *mediaType = [self.options objectForKey:@"mediaType"];
-
- if ([mediaType isEqualToString:@"any"]) {
- imagePickerController.mediaType = QBImagePickerMediaTypeAny;
- } else if ([mediaType isEqualToString:@"photo"]) {
+
+ if ([mediaType isEqualToString:@"photo"]) {
imagePickerController.mediaType = QBImagePickerMediaTypeImage;
- } else {
+ } else if ([mediaType isEqualToString:@"video"]) {
imagePickerController.mediaType = QBImagePickerMediaTypeVideo;
+ } else {
+ imagePickerController.mediaType = QBImagePickerMediaTypeAny;
}
-
}
+ [imagePickerController setModalPresentationStyle: UIModalPresentationFullScreen];
[[self getRootVC] presentViewController:imagePickerController animated:YES completion:nil];
});
}];
@@ -423,11 +440,15 @@ - (void)startCropping:(UIImage *)image {
imageCropVC.cropMode = RSKImageCropModeCustom;
}
imageCropVC.toolbarTitle = [[self options] objectForKey:@"cropperToolbarTitle"];
- imageCropVC.avoidEmptySpaceAroundImage = YES;
+ imageCropVC.avoidEmptySpaceAroundImage = [[[self options] objectForKey:@"avoidEmptySpaceAroundImage"] boolValue];
imageCropVC.dataSource = self;
imageCropVC.delegate = self;
+ NSString *cropperCancelText = [self.options objectForKey:@"cropperCancelText"];
+ NSString *cropperChooseText = [self.options objectForKey:@"cropperChooseText"];
[imageCropVC setModalPresentationStyle:UIModalPresentationCustom];
[imageCropVC setModalTransitionStyle:UIModalTransitionStyleCrossDissolve];
+ [imageCropVC.cancelButton setTitle:cropperCancelText forState:UIControlStateNormal];
+ [imageCropVC.chooseButton setTitle:cropperChooseText forState:UIControlStateNormal];
dispatch_async(dispatch_get_main_queue(), ^{
[[self getRootVC] presentViewController:imageCropVC animated:YES completion:nil];
});
@@ -482,6 +503,44 @@ - (void)showActivityIndicator:(void (^)(UIActivityIndicatorView*, UIView*))handl
});
}
+- (void) handleVideo:(AVAsset*)asset withFileName:(NSString*)fileName withLocalIdentifier:(NSString*)localIdentifier completion:(void (^)(NSDictionary* image))completion {
+ NSURL *sourceURL = [(AVURLAsset *)asset URL];
+
+ // create temp file
+ NSString *tmpDirFullPath = [self getTmpDirectory];
+ NSString *filePath = [tmpDirFullPath stringByAppendingString:[[NSUUID UUID] UUIDString]];
+ filePath = [filePath stringByAppendingString:@".mp4"];
+ NSURL *outputURL = [NSURL fileURLWithPath:filePath];
+
+ [self.compression compressVideo:sourceURL outputURL:outputURL withOptions:self.options handler:^(AVAssetExportSession *exportSession) {
+ if (exportSession.status == AVAssetExportSessionStatusCompleted) {
+ AVAsset *compressedAsset = [AVAsset assetWithURL:outputURL];
+ AVAssetTrack *track = [[compressedAsset tracksWithMediaType:AVMediaTypeVideo] firstObject];
+
+ NSNumber *fileSizeValue = nil;
+ [outputURL getResourceValue:&fileSizeValue
+ forKey:NSURLFileSizeKey
+ error:nil];
+
+ completion([self createAttachmentResponse:[outputURL absoluteString]
+ withExif:nil
+ withSourceURL:[sourceURL absoluteString]
+ withLocalIdentifier:localIdentifier
+ withFilename:fileName
+ withWidth:[NSNumber numberWithFloat:track.naturalSize.width]
+ withHeight:[NSNumber numberWithFloat:track.naturalSize.height]
+ withMime:@"video/mp4"
+ withSize:fileSizeValue
+ withData:nil
+ withRect:CGRectNull
+ withCreationDate:nil
+ withModificationDate:nil
+ ]);
+ } else {
+ completion(nil);
+ }
+ }];
+}
-(IBAction)btnCancelAction:(id)sender{
@@ -1000,13 +1059,13 @@ - (CGRect)imageCropViewControllerCustomMovementRect:
- (void)imageCropViewControllerDidCancelCrop:
(RSKImageCropViewController *)controller {
[self dismissCropper:controller selectionDone:NO completion:[self waitAnimationEnd:^{
- if (self.currentSelectionMode == CROPPING) {
+ if (self.currentSelectionMode != PICKER && (self.currentSelectionMode == CROPPING || [[self.options objectForKey:@"cropping"] boolValue])) {
self.reject(ERROR_PICKER_CANCEL_KEY, ERROR_PICKER_CANCEL_MSG, nil);
}
}]];
}
-- (void) dismissCropper:(RSKImageCropViewController*)controller selectionDone:(BOOL)selectionDone completion:(void (^)())completion {
+- (void) dismissCropper:(RSKImageCropViewController*)controller selectionDone:(BOOL)selectionDone completion:(void (^)(void))completion {
switch (self.currentSelectionMode) {
case CROPPING:
[controller dismissViewControllerAnimated:YES completion:completion];
@@ -1033,8 +1092,10 @@ - (void)imageCropViewController:(RSKImageCropViewController *)controller
// we have correct rect, but not correct dimensions
// so resize image
- CGSize resizedImageSize = CGSizeMake([[[self options] objectForKey:@"width"] intValue], [[[self options] objectForKey:@"height"] intValue]);
- UIImage *resizedImage = [croppedImage resizedImageToFitInSize:resizedImageSize scaleIfSmaller:YES];
+ CGSize desiredImageSize = CGSizeMake([[[self options] objectForKey:@"width"] intValue],
+ [[[self options] objectForKey:@"height"] intValue]);
+
+ UIImage *resizedImage = [croppedImage resizedImageToFitInSize:desiredImageSize scaleIfSmaller:YES];
ImageResult *imageResult = [self.compression compressImage:resizedImage withOptions:self.options];
NSString *filePath = [self persistFile:imageResult.data];
diff --git a/package.json b/package.json
index 496441357..50cfa4b0e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "react-native-image-crop-picker",
- "version": "0.20.1",
+ "version": "0.25.3",
"description": "Select single or multiple images, with cropping option",
"main": "index.js",
"scripts": {
diff --git a/svg.svg b/svg.svg
new file mode 100644
index 000000000..35b1dd82d
--- /dev/null
+++ b/svg.svg
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+iOS/Android image picker with support for camera, video, configurable compression, multiple images and cropping
+
## Result