react-native-compressor 1.6.3 → 1.7.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 shobbak
+Copyright (c) 2020 numandev1
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -3,6 +3,16 @@
 </div>
 <br/>
 
+<div align="center">
+
+[![GitHub Repo stars](https://img.shields.io/static/v1?style=for-the-badge&message=Discord&color=5865F2&logo=Discord&logoColor=FFFFFF&label=)](https://discord.gg/dtYzk8sp)
+[![GitHub Repo stars](https://img.shields.io/github/stars/numandev1/react-native-compressor?style=for-the-badge&logo=github)](https://github.com/numandev1/react-native-compressor/stargazers)
+[![GitHub Repo stars](https://img.shields.io/npm/v/react-native-compressor?style=for-the-badge&message=npm&&color=CB3837&logo=npm&logoColor=FFFFFF&label=)](https://www.npmjs.com/package/react-native-compressor)
+![npm](https://img.shields.io/static/v1?style=for-the-badge&message=TypeScript&color=3178C6&logo=TypeScript&logoColor=FFFFFF&label=)
+![npm](https://img.shields.io/npm/dt/react-native-compressor?style=for-the-badge)
+
+</div>
+
 **REACT-NATIVE-COMPRESSOR** is a react-native package, which help us to Compress `Image`, `Video`, and `Audio` same like **Whatsapp** without knowing compression `algorithm`
 
 <div align="center">
@@ -66,19 +76,13 @@ We should use **react-native-compressor** instead of **FFmpeg** because **react-
 
 ## Installation
 
-### React Native
-
-#### For React Native<0.65
-
 ```sh
-yarn add react-native-compressor@rnlessthan65
+yarn add react-native-compressor
 ```
 
-#### For React Native 0.65 or greater
+### [New Architecture (Turbo Module)](https://reactnative.dev/docs/new-architecture-intro) Supported
+you can give feedback on [Discord channel](https://discord.gg/dtYzk8sp)
 
-```sh
-yarn add react-native-compressor
-```
 
 ### Managed Expo
 
@@ -330,9 +334,9 @@ const uploadResult = await backgroundUpload(
 
   bitrate of video which reduce or increase video size. if compressionMethod will auto then this prop will not work
 
-- ###### `minimumFileSizeForCompress: number` (default: 16)
+- ###### `minimumFileSizeForCompress: number` (default: 0)
 
-  16 means 16mb. default our package do not compress under 16mb video file. minimumFileSizeForCompress will allow us to change this 16mb offset. fixed [#26](https://github.com/Shobbak/react-native-compressor/issues/26)
+  previously default was 16 but now it is 0 by default. 0 mean 0mb. This is an offset, which you can set for minimumFileSizeForCompress will allow this package to dont compress less than or equal to `minimumFileSizeForCompress` ref [#26](https://github.com/numandev1/react-native-compressor/issues/26)
 
 - ###### `getCancellationId: function`
   `getCancellationId` is a callback function that gives us compress video id, which can be used in `Video.cancelCompression` method to cancel the compression

package/android/build.gradle

@@ -1,62 +1,115 @@
 buildscript {
-    if (project == rootProject) {
-        repositories {
-            google()
-            mavenCentral()
-        }
-
-        dependencies {
-            classpath 'com.android.tools.build:gradle:3.5.3'
-        }
-    }
+  repositories {
+    google()
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath "com.android.tools.build:gradle:7.2.1"
+  }
+}
+
+def isNewArchitectureEnabled() {
+  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
+}
+
+apply plugin: "com.android.library"
+
+
+def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
+
+if (isNewArchitectureEnabled()) {
+  apply plugin: "com.facebook.react"
 }
 
-apply plugin: 'com.android.library'
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["Compressor_" + name]
+}
 
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["Compressor_" + name]).toInteger()
+}
+
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
+
+  // Namespace support was added in 7.3.0
+  if (major == 7 && minor >= 3) {
+    return true
+  }
+
+  return major >= 8
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 29)
-    buildToolsVersion safeExtGet('buildToolsVersion', '29.0.2')
-    defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 16)
-        targetSdkVersion safeExtGet('targetSdkVersion', 29)
-        versionCode 1
-        versionName "1.0"
+  if (supportsNamespace()) {
+    namespace "com.reactnativecompressor"
 
+    sourceSets {
+      main {
+        manifest.srcFile "src/main/AndroidManifestNew.xml"
+      }
     }
+  }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-    }
-    lintOptions {
-        disable 'GradleCompatible'
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+  }
+  buildTypes {
+    release {
+      minifyEnabled false
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+  }
+
+  lintOptions {
+    disable "GradleCompatible"
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+
+  sourceSets {
+    main {
+      if (isNewArchitectureEnabled()) {
+        java.srcDirs += [
+          "src/newarch",
+          // This is needed to build Kotlin project with NewArch enabled
+          "${project.buildDir}/generated/source/codegen/java"
+        ]
+      } else {
+        java.srcDirs += ["src/oldarch"]
+      }
     }
+  }
 }
 
 repositories {
-    google()
-    mavenLocal()
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url("$rootDir/../node_modules/react-native/android")
-    }
-    mavenCentral()
-    maven { url "https://www.jitpack.io" }
+  mavenCentral()
+  google()
 }
 
+
 dependencies {
-    //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-native:+"  // From node_modules
+  // For < 0.71, this will be from the local maven repo
+  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
+  //noinspection GradleDynamicVersion
+  implementation "com.facebook.react:react-native:+"
   implementation 'io.github.lizhangqu:coreprogress:1.0.2'
-  implementation 'com.github.numandev1:VideoCompressor:715bcc16e9'
-//   implementation project(path: ':videocompressor')
+  implementation 'com.github.numandev1:VideoCompressor:1a262bba37'
+}
+
+if (isNewArchitectureEnabled()) {
+  react {
+    jsRootDir = file("../src/")
+    libraryName = "Compressor"
+    codegenJavaPackageName = "com.reactnativecompressor"
+  }
 }

package/android/gradle.properties

@@ -0,0 +1,5 @@
+Compressor_kotlinVersion=1.7.0
+Compressor_minSdkVersion=21
+Compressor_targetSdkVersion=31
+Compressor_compileSdkVersion=31
+Compressor_ndkversion=21.4.7075529

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.reactnativecompressor">
-
 </manifest>

package/android/src/main/AndroidManifestNew.xml

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+</manifest>

package/android/src/main/java/com/reactnativecompressor/CompressorModule.java

@@ -1,49 +1,56 @@
 package com.reactnativecompressor;
 
-import android.media.MediaMetadataRetriever;
-import android.net.Uri;
-import android.os.Build;
-import android.util.Log;
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactMethod;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
 import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.reactnativecompressor.Image.ImageCompressor;
 import com.reactnativecompressor.Image.utils.ImageCompressorOptions;
 import com.reactnativecompressor.Utils.Utils;
 import com.reactnativecompressor.Video.VideoCompressorHelper;
+import com.reactnativecompressor.CompressorSpec;
 import static com.reactnativecompressor.Utils.Utils.generateCacheFilePath;
-import static com.reactnativecompressor.Utils.Utils.getRealPath;
+
+import android.content.ContentResolver;
+import android.content.res.AssetFileDescriptor;
+import android.database.Cursor;
+import android.media.MediaMetadataRetriever;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.OpenableColumns;
+import android.util.Log;
 
 import com.reactnativecompressor.Audio.AudioCompressor;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 
-@ReactModule(name = CompressorModule.NAME)
-public class CompressorModule extends ReactContextBaseJavaModule {
-    public static final String NAME = "Compressor";
+public class CompressorModule extends CompressorSpec {
+  public static final String NAME = "Compressor";
   private final ReactApplicationContext reactContext;
-    public CompressorModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-      this.reactContext = reactContext;
-    }
 
-    @Override
-    @NonNull
-    public String getName() {
-        return NAME;
-    }
+  CompressorModule(ReactApplicationContext context) {
+    super(context);
+    this.reactContext = context;
+  }
+
+  @Override
+  @NonNull
+  public String getName() {
+    return NAME;
+  }
+
 
   private void sendEvent(ReactContext reactContext,
                          String eventName,
@@ -53,7 +60,7 @@ public class CompressorModule extends ReactContextBaseJavaModule {
       .emit(eventName, params);
   }
 
-    //Image
+  //Image
   @ReactMethod
   public void image_compress(
     String imagePath,
@@ -78,8 +85,8 @@ public class CompressorModule extends ReactContextBaseJavaModule {
     }
   }
 
-  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
   @ReactMethod
+  @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
   public void compress_audio(
     String fileUrl,
     ReadableMap optionMap,
@@ -104,15 +111,15 @@ public class CompressorModule extends ReactContextBaseJavaModule {
 
 
   //General
-    @ReactMethod
-   public void generateFilePath(String extension, Promise promise) {
-     try {
-       final String outputUri =generateCacheFilePath(extension,reactContext);
-       promise.resolve(outputUri);
-     } catch (Exception e) {
-       promise.reject(e);
-     }
-   }
+  @ReactMethod
+  public void generateFilePath(String extension, Promise promise) {
+    try {
+      final String outputUri =generateCacheFilePath(extension,reactContext);
+      promise.resolve(outputUri);
+    } catch (Exception e) {
+      promise.reject(e);
+    }
+  }
 
   @ReactMethod
   public void getRealPath(String path,String type, Promise promise) {
@@ -153,4 +160,52 @@ public class CompressorModule extends ReactContextBaseJavaModule {
       promise.reject(e);
     }
   }
+  @ReactMethod
+  public void getFileSize(String filePath, Promise promise)
+  {
+    filePath=Utils.getRealPath(filePath,reactContext);
+    Uri uri= Uri.parse(filePath);
+    ContentResolver contentResolver = reactContext.getContentResolver();
+    long fileSize = getLength(uri, contentResolver);
+    if (fileSize >= 0) {
+      promise.resolve(String.valueOf(fileSize));
+    } else {
+      promise.resolve("");
+    }
+  }
+
+  public static long getLength(Uri uri, ContentResolver contentResolver) {
+    AssetFileDescriptor assetFileDescriptor = null;
+    try {
+      assetFileDescriptor = contentResolver.openAssetFileDescriptor(uri, "r");
+    } catch (FileNotFoundException e) {
+      // Do nothing
+    }
+
+    long length = (assetFileDescriptor != null) ? assetFileDescriptor.getLength() : -1L;
+    if (length != -1L) {
+      return length;
+    }
+
+    if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {
+      Cursor cursor = contentResolver.query(uri, new String[]{OpenableColumns.SIZE}, null, null, null);
+      if (cursor != null) {
+        try {
+          int sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE);
+          if (sizeIndex != -1 && cursor.moveToFirst()) {
+            try {
+              return cursor.getLong(sizeIndex);
+            } catch (Throwable ignored) {
+              return -1L;
+            }
+          }
+        } finally {
+          cursor.close();
+        }
+      }
+      return -1L;
+    } else {
+      return -1L;
+    }
+  }
 }

package/android/src/main/java/com/reactnativecompressor/CompressorPackage.java

@@ -1,30 +1,58 @@
 package com.reactnativecompressor;
 
-import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
-import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
+import com.facebook.react.TurboReactPackage;
+import java.util.HashMap;
+import java.util.Map;
 import com.reactnativecompressor.Video.VideoModule;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+public class CompressorPackage extends TurboReactPackage {
 
-public class CompressorPackage implements ReactPackage {
-    @NonNull
-    @Override
-    public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
-        List<NativeModule> modules = new ArrayList<>();
-        modules.add(new CompressorModule(reactContext));
-        modules.add(new VideoModule(reactContext));
-        return modules;
+  @Nullable
+  @Override
+  public NativeModule getModule(String name, ReactApplicationContext reactContext) {
+    if (name.equals(CompressorModule.NAME)) {
+      return new CompressorModule(reactContext);
+    } else if (name.equals(VideoModule.NAME)) {
+      return new VideoModule(reactContext);
+    } else {
+      return null;
     }
+  }
 
-    @NonNull
-    @Override
-    public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
-        return Collections.emptyList();
-    }
+  @Override
+  public ReactModuleInfoProvider getReactModuleInfoProvider() {
+    return () -> {
+      final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
+      boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+      moduleInfos.put(
+              CompressorModule.NAME,
+              new ReactModuleInfo(
+                      CompressorModule.NAME,
+                      CompressorModule.NAME,
+                      false, // canOverrideExistingModule
+                      false, // needsEagerInit
+                      true, // hasConstants
+                      false, // isCxxModule
+                      isTurboModule // isTurboModule
+      ));
+      moduleInfos.put(
+        VideoModule.NAME,
+        new ReactModuleInfo(
+          VideoModule.NAME,
+          VideoModule.NAME,
+          false, // canOverrideExistingModule
+          false, // needsEagerInit
+          true, // hasConstants
+          false, // isCxxModule
+          isTurboModule // isTurboModule
+        ));
+      return moduleInfos;
+    };
+  }
 }

package/android/src/main/java/com/reactnativecompressor/Image/utils/ImageCompressorOptions.java

@@ -55,7 +55,7 @@ public class ImageCompressorOptions {
     auto, manual
   }
 
-    public CompressionMethod compressionMethod = CompressionMethod.manual;
+    public CompressionMethod compressionMethod = CompressionMethod.auto;
     public int maxWidth = 1280;
     public int maxHeight = 1280;
     public float quality = 0.8f;

package/android/src/main/java/com/reactnativecompressor/Utils/Utils.java

@@ -105,7 +105,7 @@ public class Utils {
         fileUrl= RealPathUtil.getRealPath(reactContext,uri);
       }
       catch (Exception ex) {
-        Log.d(TAG, " Please see this issue: https://github.com/Shobbak/react-native-compressor/issues/25");
+        Log.d(TAG, " Please see this issue: https://github.com/numandev1/react-native-compressor/issues/25");
       }
     }
     return fileUrl;

package/android/src/main/java/com/reactnativecompressor/Video/VideoCompressorHelper.java

@@ -96,11 +96,11 @@ public class VideoCompressorHelper {
     auto, manual
   }
 
-  public VideoCompressorHelper.CompressionMethod compressionMethod = VideoCompressorHelper.CompressionMethod.manual;
+  public VideoCompressorHelper.CompressionMethod compressionMethod = VideoCompressorHelper.CompressionMethod.auto;
   public float bitrate = 0;
   public String uuid = "";
   public float maxSize = 640.0f;
-  public float minimumFileSizeForCompress = 16.0f;
+  public float minimumFileSizeForCompress = 0.0f;
 
   public static VideoCompressorHelper fromMap(ReadableMap map) {
     final VideoCompressorHelper options = new VideoCompressorHelper();
@@ -116,12 +116,15 @@ public class VideoCompressorHelper {
         case "maxSize":
           options.maxSize = (float) map.getDouble(key);
           break;
-          case "uuid":
+        case "uuid":
           options.uuid = map.getString(key);
           break;
         case "minimumFileSizeForCompress":
           options.minimumFileSizeForCompress =(float) map.getDouble(key);
           break;
+        case "bitrate":
+          options.bitrate = (float) map.getDouble(key);
+          break;
 
       }
     }
@@ -149,7 +152,7 @@ public class VideoCompressorHelper {
       int bitrate=Integer.parseInt(metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE));
 
       boolean isPortrait = height > width;
-      int maxSize = 1920;
+      int maxSize = (int) options.maxSize;
       if(isPortrait && height > maxSize){
         width = (int) (((float)maxSize/height)*width);
         height = maxSize;

package/android/src/main/java/com/reactnativecompressor/Video/VideoModule.java

@@ -15,6 +15,7 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.reactnativecompressor.VideoCompressorSpec;
 import com.reactnativecompressor.Utils.RealPathUtil;
 
 import static com.reactnativecompressor.Utils.Utils.getRealPath;
@@ -23,14 +24,15 @@ import static com.reactnativecompressor.Video.VideoCompressorHelper.video_deacti
 import static com.reactnativecompressor.Video.VideoCompressorHelper.video_upload_helper;
 import static com.reactnativecompressor.Utils.Utils.cancelCompressionHelper;
 
-@ReactModule(name = VideoModule.NAME)
-public class  VideoModule extends ReactContextBaseJavaModule {
+
+public class VideoModule extends VideoCompressorSpec {
   public static final String NAME = "VideoCompressor";
   private static final String TAG = "react-native-compessor";
   private final ReactApplicationContext reactContext;
-  public VideoModule(ReactApplicationContext reactContext) {
-    super(reactContext);
-    this.reactContext = reactContext;
+
+  public VideoModule(ReactApplicationContext context) {
+    super(context);
+    this.reactContext = context;
   }
 
   @NonNull
@@ -117,7 +119,7 @@ public class  VideoModule extends ReactContextBaseJavaModule {
   }
 
   @ReactMethod
-  public void removeListeners(Integer count) {
+  public void removeListeners(double count) {
     // Keep: Required for RN built in Event Emitter Calls.
   }
 }

package/android/src/newarch/CompressorSpec.java

@@ -0,0 +1,9 @@
+package com.reactnativecompressor;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+
+abstract class CompressorSpec extends NativeCompressorSpec {
+  CompressorSpec(ReactApplicationContext context) {
+    super(context);
+  }
+}

package/android/src/newarch/VideoCompressorSpec.java

@@ -0,0 +1,9 @@
+package com.reactnativecompressor;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+
+public abstract class VideoCompressorSpec extends NativeVideoCompressorSpec {
+  protected VideoCompressorSpec(ReactApplicationContext context) {
+    super(context);
+  }
+}

package/android/src/oldarch/CompressorSpec.java

@@ -0,0 +1,28 @@
+package com.reactnativecompressor;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReadableMap;
+
+abstract class CompressorSpec extends ReactContextBaseJavaModule {
+  CompressorSpec(ReactApplicationContext context) {
+    super(context);
+  }
+
+  public abstract void image_compress(
+    String imagePath,
+    ReadableMap optionMap,
+    Promise promise);
+
+  public abstract void compress_audio(
+    String fileUrl,
+    ReadableMap optionMap,
+    Promise promise);
+
+  public abstract void generateFilePath(String extension, Promise promise);
+  public abstract void getRealPath(String path,String type, Promise promise);
+  public abstract void getVideoMetaData(String filePath, Promise promise);
+
+  public abstract void getFileSize(String filePath, Promise promise);
+}

package/android/src/oldarch/VideoCompressorSpec.java

@@ -0,0 +1,26 @@
+package com.reactnativecompressor;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReadableMap;
+
+public abstract class VideoCompressorSpec extends ReactContextBaseJavaModule {
+  public VideoCompressorSpec(ReactApplicationContext context) {
+    super(context);
+  }
+
+  public abstract void compress(String fileUrl, ReadableMap optionMap, Promise promise);
+
+  public abstract void cancelCompression(String uuid);
+
+  public abstract void upload(String fileUrl, ReadableMap options, Promise promise);
+
+  public abstract void activateBackgroundTask(ReadableMap options, Promise promise);
+
+  public abstract void deactivateBackgroundTask(ReadableMap options, Promise promise);
+
+  public abstract void addListener(String eventName);
+
+  public abstract void removeListeners(double count);
+}