@connectedbits/react-native-image-picker 2.4.16-android-legacy.rc2 → 2.4.16-rc1

package/android/build.gradle

@@ -52,9 +52,6 @@ repositories {
 
 dependencies {
     api "com.facebook.react:react-native:+"  // From node_modules
-    implementation 'com.android.support:support-annotations:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:support-compat:28.0.0'
 
     testImplementation('org.robolectric:robolectric:4.3.1') {
         // https://github.com/robolectric/robolectric/issues/5245

package/android/gradle.properties

@@ -5,5 +5,5 @@ ReactNativeImagePicker_buildToolsVersion=28.0.3
 ReactNativeImagePicker_targetSdkVersion=27
 ReactNativeImagePicker_minSdkVersion=24
 
-android.useAndroidX=false
-android.enableJetifier=false
+android.useAndroidX=true
+android.enableJetifier=true

package/android/src/main/java/com/imagepicker/FileProvider.java

@@ -1,4 +1,4 @@
 package com.imagepicker;
 
-public class FileProvider extends android.support.v4.content.FileProvider {
+public class FileProvider extends androidx.core.content.FileProvider {
 }

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

@@ -13,11 +13,10 @@ import android.net.Uri;
 import android.os.Build;
 import android.provider.MediaStore;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.StyleRes;
-import android.support.v4.app.ActivityCompat;
-import android.app.AlertDialog;
-import com.facebook.react.bridge.UiThreadUtil;
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleRes;
+import androidx.core.app.ActivityCompat;
+import androidx.appcompat.app.AlertDialog;
 
 import android.util.Base64;
 import android.content.pm.PackageManager;
@@ -152,66 +151,62 @@ public class ImagePickerModule extends ReactContextBaseJavaModule
 
   @ReactMethod
   public void showImagePicker(final ReadableMap options, final Callback callback) {
-    UiThreadUtil.runOnUiThread(new Runnable() {
-      public void run() {
-        Activity currentActivity = ImagePickerModule.this.getCurrentActivity();
+    Activity currentActivity = getCurrentActivity();
 
-        if (currentActivity == null)
+    if (currentActivity == null)
+    {
+      responseHelper.invokeError(callback, "can't find current Activity");
+      return;
+    }
+
+    this.callback = callback;
+    this.options = options;
+    imageConfig = new ImageConfig(0, 0, 100, 0, false);
+
+    final AlertDialog dialog = UI.chooseDialog(this, options, new UI.OnAction()
+    {
+      @Override
+      public void onTakePhoto(@NonNull final ImagePickerModule module)
+      {
+        if (module == null)
         {
-          responseHelper.invokeError(callback, "can't find current Activity");
           return;
         }
+        module.launchCamera();
+      }
 
-        ImagePickerModule.this.callback = callback;
-        ImagePickerModule.this.options = options;
-        imageConfig = new ImageConfig(0, 0, 100, 0, false);
-
-        final AlertDialog dialog = UI.chooseDialog(ImagePickerModule.this, options, new UI.OnAction()
+      @Override
+      public void onUseLibrary(@NonNull final ImagePickerModule module)
+      {
+        if (module == null)
         {
-          @Override
-          public void onTakePhoto(@NonNull final ImagePickerModule module)
-          {
-            if (module == null)
-            {
-              return;
-            }
-            module.launchCamera();
-          }
-
-          @Override
-          public void onUseLibrary(@NonNull final ImagePickerModule module)
-          {
-            if (module == null)
-            {
-              return;
-            }
-            module.launchImageLibrary();
-          }
+          return;
+        }
+        module.launchImageLibrary();
+      }
 
-          @Override
-          public void onCancel(@NonNull final ImagePickerModule module)
-          {
-            if (module == null)
-            {
-              return;
-            }
-            module.doOnCancel();
-          }
+      @Override
+      public void onCancel(@NonNull final ImagePickerModule module)
+      {
+        if (module == null)
+        {
+          return;
+        }
+        module.doOnCancel();
+      }
 
-          @Override
-          public void onCustomButton(@NonNull final ImagePickerModule module,
-                                     @NonNull final String action)
-          {
-            if (module == null)
-            {
-              return;
-            }
-            module.invokeCustomButton(action);
-          }
-        });
-        dialog.show();
+      @Override
+      public void onCustomButton(@NonNull final ImagePickerModule module,
+                                 @NonNull final String action)
+      {
+        if (module == null)
+        {
+          return;
+        }
+        module.invokeCustomButton(action);
       }
     });
+    dialog.show();
   }
 
   public void doOnCancel()

package/android/src/main/java/com/imagepicker/ImagePickerPackage.java

@@ -1,6 +1,6 @@
 package com.imagepicker;
 
-import android.support.annotation.StyleRes;
+import androidx.annotation.StyleRes;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.JavaScriptModule;

package/android/src/main/java/com/imagepicker/ResponseHelper.java

@@ -1,6 +1,6 @@
 package com.imagepicker;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;

package/android/src/main/java/com/imagepicker/media/ImageConfig.java

@@ -1,7 +1,7 @@
 package com.imagepicker.media;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import android.net.Uri;
 import android.webkit.MimeTypeMap;

package/android/src/main/java/com/imagepicker/permissions/OnImagePickerPermissionsCallback.java

@@ -1,6 +1,6 @@
 package com.imagepicker.permissions;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.facebook.react.modules.core.PermissionListener;
 
 /**

package/android/src/main/java/com/imagepicker/permissions/PermissionUtils.java

@@ -2,9 +2,9 @@ package com.imagepicker.permissions;
 
 import android.app.Activity;
 import android.content.DialogInterface;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableNativeMap;

package/android/src/main/java/com/imagepicker/utils/ButtonsHelper.java

@@ -1,7 +1,7 @@
 package com.imagepicker.utils;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;

package/android/src/main/java/com/imagepicker/utils/MediaUtils.java

@@ -6,8 +6,8 @@ import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
 import android.media.ExifInterface;
 import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.ReadableMap;
 import com.imagepicker.ResponseHelper;

package/android/src/main/java/com/imagepicker/utils/ReadableMapUtils.java

@@ -1,6 +1,6 @@
 package com.imagepicker.utils;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.facebook.react.bridge.ReadableMap;

package/android/src/main/java/com/imagepicker/utils/RealPathUtil.java

@@ -9,9 +9,9 @@ import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 import android.content.ContentUris;
 import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.FileProvider;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.FileProvider;
 
 import java.io.File;
 

package/android/src/main/java/com/imagepicker/utils/UI.java

@@ -3,9 +3,9 @@ package com.imagepicker.utils;
 import android.content.Context;
 import android.content.DialogInterface;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import android.widget.ArrayAdapter;
 
 import com.facebook.react.bridge.ReadableMap;

package/android/src/test/java/com/imagepicker/testing/TestableImagePickerModule.java

@@ -1,9 +1,9 @@
 package com.imagepicker.testing;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StyleRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StyleRes;
 
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@connectedbits/react-native-image-picker",
-  "version": "2.4.16-android-legacy.rc2",
+  "version": "2.4.16-rc1",
   "description": "A React Native module that allows you to use native UI to select media from the device library or directly from the camera",
   "react-native": "src/index.ts",
   "types": "lib/typescript/index.d.ts",