react-native-compressor 1.8.7 → 1.8.9

package/README.md

@@ -343,7 +343,7 @@ await clearCache(); // this will clear cache of thumbnails cache directory
 
 - ###### `quality: number` (default: 0.8)
 
-  The quality modifier for the `JPEG` file format, can be specified when output is `PNG` but will be ignored.
+  The quality modifier for the `JPEG` and `PNG` file format, if your input file is `JPEG` and output file is `PNG` then compressed size can be increase
 
 - ###### `input: InputType` (default: uri)
 

package/android/build.gradle

@@ -115,7 +115,7 @@ dependencies {
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
   implementation "com.googlecode.mp4parser:isoparser:1.0.6"
-
+  implementation 'io.github.lizhangqu:coreprogress:1.0.2'
   implementation 'com.github.banketree:AndroidLame-kotlin:v0.0.1'
   implementation 'javazoom:jlayer:1.0.1'
 }

package/android/src/main/java/com/reactnativecompressor/Image/ImageCompressor.kt

@@ -85,10 +85,21 @@ object ImageCompressor {
     }
 
     fun compress(image: Bitmap?, output: ImageCompressorOptions.OutputType, quality: Float): ByteArrayOutputStream {
-        val stream = ByteArrayOutputStream()
-        val format = if (output === ImageCompressorOptions.OutputType.jpg) CompressFormat.JPEG else CompressFormat.PNG
-        image!!.compress(format, Math.round(100 * quality), stream)
-        return stream
+      var stream = ByteArrayOutputStream()
+      if (output === ImageCompressorOptions.OutputType.jpg)
+      {
+        image!!.compress(CompressFormat.JPEG, Math.round(100 * quality), stream)
+      }
+      else
+      {
+        val pngStream = ByteArrayOutputStream()
+        image!!.compress(CompressFormat.JPEG, Math.round(100 * quality), stream)
+        val byteArray: ByteArray = stream.toByteArray()
+        stream=ByteArrayOutputStream()
+        val bitmap = BitmapFactory.decodeByteArray(byteArray, 0, byteArray.size)
+        bitmap.compress(CompressFormat.PNG, 100, stream)
+      }
+      return stream
     }
 
     fun manualCompressImage(imagePath: String?, options: ImageCompressorOptions, reactContext: ReactApplicationContext?): String? {

package/ios/Image/ImageCompressor.swift

@@ -111,6 +111,9 @@ class ImageCompressor {
             data = image.jpegData(compressionQuality: CGFloat(quality))!
         case .png:
             data = image.pngData()!
+            data = image.jpegData(compressionQuality: CGFloat(quality))!
+            let compressedImage = UIImage(data: data)
+            data = compressedImage!.pngData()!
         }
 
         if isBase64 {
@@ -232,11 +235,11 @@ class ImageCompressor {
 
             var actualHeight = image.size.height
             var actualWidth = image.size.width
-            let maxHeight: CGFloat = 1280.0
-            let maxWidth: CGFloat = 1280.0
+            let maxHeight: CGFloat = CGFloat(options.maxHeight)
+            let maxWidth: CGFloat = CGFloat(options.maxWidth)
             var imgRatio = actualWidth / actualHeight
             let maxRatio = maxWidth / maxHeight
-            let compressionQuality: CGFloat = 0.8
+            let compressionQuality: CGFloat = CGFloat(options.quality)
 
             if actualHeight > maxHeight || actualWidth > maxWidth {
                 if imgRatio < maxRatio {
@@ -257,15 +260,24 @@ class ImageCompressor {
             UIGraphicsBeginImageContext(rect.size)
             image.draw(in: rect)
             if let img = UIGraphicsGetImageFromCurrentImageContext() {
-                let imageData = img.jpegData(compressionQuality: compressionQuality)
+                var imageData: Data
+                switch OutputType(rawValue: options.output.rawValue)! {
+                case .jpg:
+                    imageData = img.jpegData(compressionQuality: compressionQuality)!
+                case .png:
+                    imageData = img.jpegData(compressionQuality: compressionQuality)!
+                    let compressedImage = UIImage(data: imageData)
+                    imageData = compressedImage!.pngData()!
+                }
+
                 UIGraphicsEndImageContext()
                 let isBase64 = options.returnableOutputType == .rbase64
                 if isBase64 {
-                    return imageData!.base64EncodedString(options: [])
+                    return imageData.base64EncodedString(options: [])
                 } else {
                     let filePath = Utils.generateCacheFilePath(outputExtension)
                     do {
-                        try imageData?.write(to: URL(fileURLWithPath: filePath), options: .atomic)
+                        try imageData.write(to: URL(fileURLWithPath: filePath), options: .atomic)
                         let returnablePath = ImageCompressor.makeValidUri(filePath)
                         return returnablePath
                     } catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-compressor",
-  "version": "1.8.7",
+  "version": "1.8.9",
   "description": "This library compress image, video and audio",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",