Merge branch 'refactoring'

Author: alexustinovsm

android/src/main/java/com/imagepicker/ImagePickerModule.java

@@ -4,13 +4,11 @@
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.BitmapFactory.Options;
 import android.graphics.Matrix;
-import android.graphics.drawable.ColorDrawable;
 import android.media.ExifInterface;
 import android.net.Uri;
 import android.os.Build;
@@ -19,10 +17,8 @@
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.FileProvider;
-import android.app.AlertDialog;
 import android.util.Base64;
 import android.util.Log;
-import android.widget.ArrayAdapter;
 import android.webkit.MimeTypeMap;
 import android.content.pm.PackageManager;
 import android.media.MediaScannerConnection;
@@ -34,8 +30,9 @@
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.WritableMap;
+import com.imagepicker.utils.RealPathUtil;
+import com.imagepicker.utils.UI;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -50,9 +47,7 @@
 import java.text.DateFormat;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 import java.util.UUID;
@@ -64,10 +59,10 @@ public class ImagePickerModule extends ReactContextBaseJavaModule implements Act
   static final int REQUEST_LAUNCH_VIDEO_LIBRARY = 13003;
   static final int REQUEST_LAUNCH_VIDEO_CAPTURE = 13004;
 
-  private final ReactApplicationContext mReactContext;
+  private final ReactApplicationContext reactContext;
 
-  private Uri mCameraCaptureURI;
-  private Callback mCallback;
+  private Uri cameraCaptureURI;
+  private Callback callback;
   private Boolean noData = false;
   private Boolean pickVideo = false;
   private int maxWidth = 0;
@@ -81,7 +76,7 @@ public class ImagePickerModule extends ReactContextBaseJavaModule implements Act
   public ImagePickerModule(ReactApplicationContext reactContext) {
     super(reactContext);
 
-    mReactContext = reactContext;
+    this.reactContext = reactContext;
 
     reactContext.addActivityEventListener(this);
   }
@@ -95,90 +90,52 @@ public String getName() {
   public void showImagePicker(final ReadableMap options, final Callback callback) {
     Activity currentActivity = getCurrentActivity();
 
-    if (currentActivity == null) {
-      response = Arguments.createMap();
+    if (currentActivity == null)
+    {
+      cleanResponse();
       response.putString("error", "can't find current Activity");
       callback.invoke(response);
       return;
     }
 
-    final List<String> titles = new ArrayList<String>();
-    final List<String> actions = new ArrayList<String>();
-
-    if (options.hasKey("takePhotoButtonTitle")
-            && options.getString("takePhotoButtonTitle") != null
-            && !options.getString("takePhotoButtonTitle").isEmpty()
-            && isCameraAvailable()) {
-      titles.add(options.getString("takePhotoButtonTitle"));
-      actions.add("photo");
-    }
-    if (options.hasKey("chooseFromLibraryButtonTitle")
-            && options.getString("chooseFromLibraryButtonTitle") != null
-            && !options.getString("chooseFromLibraryButtonTitle").isEmpty()) {
-      titles.add(options.getString("chooseFromLibraryButtonTitle"));
-      actions.add("library");
-    }
-    if (options.hasKey("customButtons")) {
-      ReadableArray customButtons = options.getArray("customButtons");
-      for (int i = 0; i < customButtons.size(); i++) {
-        ReadableMap button = customButtons.getMap(i);
-        int currentIndex = titles.size();
-        titles.add(currentIndex, button.getString("title"));
-        actions.add(currentIndex, button.getString("name"));
+    UI.showDialog(currentActivity, options, new UI.OnAction()
+    {
+      @Override
+      public void onTakePhoto()
+      {
+        launchCamera(options, callback);
       }
-    }
-    if (options.hasKey("cancelButtonTitle")
-            && options.getString("cancelButtonTitle") != null
-            && !options.getString("cancelButtonTitle").isEmpty()) {
-      titles.add(options.getString("cancelButtonTitle"));
-      actions.add("cancel");
-    }
-
-    ArrayAdapter<String> adapter = new ArrayAdapter<String>(currentActivity, android.R.layout.select_dialog_item, titles);
-    AlertDialog.Builder builder = new AlertDialog.Builder(currentActivity, android.R.style.Theme_Holo_Light_Dialog);
-    if (options.hasKey("title") && options.getString("title") != null && !options.getString("title").isEmpty()) {
-      builder.setTitle(options.getString("title"));
-    }
-
-    builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
-      public void onClick(DialogInterface dialog, int index) {
-        String action = actions.get(index);
-        response = Arguments.createMap();
-
-        switch (action) {
-          case "photo":
-            launchCamera(options, callback);
-            break;
-          case "library":
-            launchImageLibrary(options, callback);
-            break;
-          case "cancel":
-            response.putBoolean("didCancel", true);
-            callback.invoke(response);
-            break;
-          default: // custom button
-            response.putString("customButton", action);
-            callback.invoke(response);
-        }
+
+      @Override
+      public void onUseLibrary()
+      {
+        launchImageLibrary(options, callback);
       }
-    });
 
-    final AlertDialog dialog = builder.create();
-    /**
-     * override onCancel method to callback cancel in case of a touch outside of
-     * the dialog or the BACK key pressed
-     */
-    dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
       @Override
-      public void onCancel(DialogInterface dialog) {
-        response = Arguments.createMap();
-        dialog.dismiss();
+      public void onCancel()
+      {
+        cleanResponse();
         response.putBoolean("didCancel", true);
         callback.invoke(response);
       }
+
+      @Override
+      public void onCustomButton(@NonNull final String action)
+      {
+        cleanResponse();
+        response.putString("customButton", action);
+        callback.invoke(response);
+      }
+
+      @Override
+      public void onDialogWasCanceled(@NonNull final String action)
+      {
+        cleanResponse();
+        response.putBoolean(action, true);
+        callback.invoke(response);
+      }
     });
-    dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
-    dialog.show();
   }
 
   // NOTE: Currently not reentrant / doesn't support concurrent requests
@@ -220,17 +177,17 @@ public void launchCamera(final ReadableMap options, final Callback callback) {
 
       // we create a tmp file to save the result
       File imageFile = createNewFile();
-      mCameraCaptureURI = compatUriFromFile(mReactContext, imageFile);
-      cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, mCameraCaptureURI);
+      cameraCaptureURI = compatUriFromFile(reactContext, imageFile);
+      cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, cameraCaptureURI);
     }
 
-    if (cameraIntent.resolveActivity(mReactContext.getPackageManager()) == null) {
+    if (cameraIntent.resolveActivity(reactContext.getPackageManager()) == null) {
       response.putString("error", "Cannot launch camera");
       callback.invoke(response);
       return;
     }
 
-    mCallback = callback;
+    this.callback = callback;
 
     try {
       currentActivity.startActivityForResult(cameraIntent, requestCode);
@@ -272,13 +229,13 @@ public void launchImageLibrary(final ReadableMap options, final Callback callbac
       MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
     }
 
-    if (libraryIntent.resolveActivity(mReactContext.getPackageManager()) == null) {
+    if (libraryIntent.resolveActivity(reactContext.getPackageManager()) == null) {
       response.putString("error", "Cannot launch photo library");
       callback.invoke(response);
       return;
     }
 
-    mCallback = callback;
+    this.callback = callback;
 
     try {
       currentActivity.startActivityForResult(libraryIntent, requestCode);
@@ -291,7 +248,7 @@ public void launchImageLibrary(final ReadableMap options, final Callback callbac
 
   public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
     //robustness code
-    if (mCallback == null || (mCameraCaptureURI == null && requestCode == REQUEST_LAUNCH_IMAGE_CAPTURE)
+    if (callback == null || (cameraCaptureURI == null && requestCode == REQUEST_LAUNCH_IMAGE_CAPTURE)
             || (requestCode != REQUEST_LAUNCH_IMAGE_CAPTURE && requestCode != REQUEST_LAUNCH_IMAGE_LIBRARY
             && requestCode != REQUEST_LAUNCH_VIDEO_LIBRARY && requestCode != REQUEST_LAUNCH_VIDEO_CAPTURE)) {
       return;
@@ -302,15 +259,15 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode,
     // user cancel
     if (resultCode != Activity.RESULT_OK) {
       response.putBoolean("didCancel", true);
-      mCallback.invoke(response);
-      mCallback = null;
+      callback.invoke(response);
+      callback = null;
       return;
     }
 
     Uri uri;
     switch (requestCode) {
       case REQUEST_LAUNCH_IMAGE_CAPTURE:
-        uri = mCameraCaptureURI;
+        uri = cameraCaptureURI;
         this.fileScan(uri.getPath());
         break;
       case REQUEST_LAUNCH_IMAGE_LIBRARY:
@@ -319,15 +276,15 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode,
       case REQUEST_LAUNCH_VIDEO_LIBRARY:
         response.putString("uri", data.getData().toString());
         response.putString("path", getRealPathFromURI(data.getData()));
-        mCallback.invoke(response);
-        mCallback = null;
+        callback.invoke(response);
+        callback = null;
         return;
       case REQUEST_LAUNCH_VIDEO_CAPTURE:
         response.putString("uri", data.getData().toString());
         response.putString("path", getRealPathFromURI(data.getData()));
         this.fileScan(response.getString("path"));
-        mCallback.invoke(response);
-        mCallback = null;
+        callback.invoke(response);
+        callback = null;
         return;
       default:
         uri = null;
@@ -355,8 +312,8 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode,
         // image not in cache
         response.putString("error", "Could not read photo");
         response.putString("uri", uri.toString());
-        mCallback.invoke(response);
-        mCallback = null;
+        callback.invoke(response);
+        callback = null;
         return;
       }
     }
@@ -406,8 +363,8 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode,
     } catch (IOException e) {
       e.printStackTrace();
       response.putString("error", e.getMessage());
-      mCallback.invoke(response);
-      mCallback = null;
+      callback.invoke(response);
+      callback = null;
       return;
     }
 
@@ -443,8 +400,8 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode,
 
     putExtraFileInfo(realPath, response);
 
-    mCallback.invoke(response);
-    mCallback = null;
+    callback.invoke(response);
+    callback = null;
   }
 
   /**
@@ -498,12 +455,12 @@ private boolean permissionsCheck(Activity activity) {
   }
 
   private boolean isCameraAvailable() {
-    return mReactContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA)
-      || mReactContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY);
+    return reactContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA)
+      || reactContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY);
   }
 
   private @NonNull String getRealPathFromURI(@NonNull final Uri uri) {
-    return RealPathUtil.getRealPathFromURI(mReactContext, uri);
+    return RealPathUtil.getRealPathFromURI(reactContext, uri);
   }
 
   /**
@@ -518,8 +475,8 @@ private boolean isCameraAvailable() {
    * @throws Exception
    */
   private File createFileFromURI(Uri uri) throws Exception {
-    File file = new File(mReactContext.getExternalCacheDir(), "photo-" + uri.getLastPathSegment());
-    InputStream input = mReactContext.getContentResolver().openInputStream(uri);
+    File file = new File(reactContext.getExternalCacheDir(), "photo-" + uri.getLastPathSegment());
+    InputStream input = reactContext.getContentResolver().openInputStream(uri);
     OutputStream output = new FileOutputStream(file);
 
     try {
@@ -649,7 +606,7 @@ private File createNewFile() {
             .append(UUID.randomUUID().toString())
             .append(".jpg")
             .toString();
-    File path = mReactContext.getExternalFilesDir(Environment.DIRECTORY_PICTURES);
+    File path = reactContext.getExternalFilesDir(Environment.DIRECTORY_PICTURES);
 
     File f = new File(path, filename);
     try {
@@ -715,7 +672,7 @@ private void parseOptions(final ReadableMap options) {
   }
 
   public void fileScan(String path) {
-    MediaScannerConnection.scanFile(mReactContext,
+    MediaScannerConnection.scanFile(reactContext,
             new String[] { path }, null,
             new MediaScannerConnection.OnScanCompletedListener() {
 
@@ -731,6 +688,11 @@ public void onNewIntent(Intent intent) { }
   // Some people need this for compilation
   public void onActivityResult(int requestCode, int resultCode, Intent data) { }
 
+  private void cleanResponse()
+  {
+    response = Arguments.createMap();
+  }
+
   private static Uri compatUriFromFile(@NonNull final Context context, @NonNull final File file) {
     Uri result = null;
     if (Build.VERSION.SDK_INT < 19)