@momo-kits/camerakit 0.150.2-beta.3 → 0.150.2-beta.30

package/android/src/main/java/com/rncamerakit/CKCamera.kt

@@ -5,6 +5,7 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.content.ContentValues
 import android.content.Context
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
@@ -14,7 +15,6 @@ import android.hardware.SensorManager
 import android.media.AudioManager
 import android.media.MediaActionSound
 import android.net.Uri
-import android.util.DisplayMetrics
 import android.util.Log
 import android.view.*
 import android.widget.FrameLayout
@@ -30,9 +30,7 @@ import androidx.core.content.ContextCompat
 import androidx.lifecycle.LifecycleObserver
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
-import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.events.RCTEventEmitter
 import com.rncamerakit.barcode.BarcodeFrame
 import java.io.File
 import java.util.*
@@ -42,9 +40,13 @@ import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
 import android.graphics.Canvas
+import android.graphics.Matrix
 import android.graphics.Paint
 import android.graphics.Rect
 import android.graphics.RectF
+import androidx.exifinterface.media.ExifInterface
+import android.os.Build
+import android.provider.MediaStore
 import android.util.Base64.decode
 import android.util.Size
 import com.facebook.react.uimanager.UIManagerHelper
@@ -60,6 +62,13 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import jp.co.cyberagent.android.gpuimage.GPUImage
 import jp.co.cyberagent.android.gpuimage.filter.GPUImageSharpenFilter
+import java.io.FileOutputStream
+
+fun Bitmap.rotate(degrees: Int): Bitmap {
+    val matrix = Matrix()
+    matrix.postRotate(degrees.toFloat())
+    return Bitmap.createBitmap(this, 0, 0, width, height, matrix, true)
+}
 
 class RectOverlay constructor(context: Context) :
         View(context) {
@@ -502,6 +511,36 @@ open class CKCamera(context: ThemedReactContext) : FrameLayout(context), Lifecyc
 
             override fun onImageSaved(output: ImageCapture.OutputFileResults) {
                 try {
+                    val capturedBitmap = BitmapFactory.decodeFile(output.savedUri!!.path)
+                    val targetWidth = options["width"] as? Double
+                    val targetHeight = options["height"] as? Double
+                    val targetQuality = options["quality"] as? Int ?: 100
+                    if (targetWidth != null && targetHeight != null) {
+                        val exif = output.savedUri!!.path?.let { ExifInterface(it) }
+                        val rotatedBitmap = when (exif?.getAttributeInt(
+                            ExifInterface.TAG_ORIENTATION,
+                            ExifInterface.ORIENTATION_UNDEFINED
+                        )) {
+                            ExifInterface.ORIENTATION_ROTATE_90 -> capturedBitmap.rotate(90)
+                            ExifInterface.ORIENTATION_ROTATE_180 -> capturedBitmap.rotate(180)
+                            ExifInterface.ORIENTATION_ROTATE_270 -> capturedBitmap.rotate(270)
+                            else -> capturedBitmap
+                        }
+                        val resizedBitmap = Bitmap.createScaledBitmap(
+                            rotatedBitmap,
+                            targetWidth.toInt(),
+                            targetHeight.toInt(),
+                            true
+                        )
+                        val outputStream = FileOutputStream(output.savedUri!!.path)
+                        resizedBitmap.compress(
+                            Bitmap.CompressFormat.JPEG,
+                            targetQuality,
+                            outputStream
+                        )
+                        outputStream.close()
+                    }
+
                     val uri = output.savedUri ?: Uri.fromFile(outputFile)
                     val id = uri?.path
                     val name = uri?.lastPathSegment
@@ -509,14 +548,20 @@ open class CKCamera(context: ThemedReactContext) : FrameLayout(context), Lifecyc
 
                     val savedUri = (output.savedUri ?: outputPath).toString()
                     onPictureTaken(savedUri)
+
+                    val saveToGallery = options["savePhoto"] as? Boolean ?: false
+                    if (saveToGallery) {
+                        saveImageToGallery(outputFile, context)
+                    }
+
                     Log.d(TAG, "CameraView: Photo capture succeeded: $savedUri")
 
                     val imageInfo = Arguments.createMap()
                     imageInfo.putString("uri", uri.toString())
                     imageInfo.putString("id", id)
                     imageInfo.putString("name", name)
-                    imageInfo.putInt("width", width)
-                    imageInfo.putInt("height", height)
+                    imageInfo.putDouble("width", targetWidth ?: width.toDouble())
+                    imageInfo.putDouble("height", targetHeight ?: height.toDouble())
                     imageInfo.putString("path", path)
 
                     promise.resolve(imageInfo)
@@ -528,6 +573,42 @@ open class CKCamera(context: ThemedReactContext) : FrameLayout(context), Lifecyc
         })
     }
 
+    private fun saveImageToGallery(imageFile: File, context: Context) {
+        val displayName = "CameraKit_Image_${System.currentTimeMillis()}.jpg"
+
+        val imagesCollection = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            MediaStore.Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
+        } else {
+            MediaStore.Images.Media.EXTERNAL_CONTENT_URI
+        }
+
+        val contentValues = ContentValues().apply {
+            put(MediaStore.Images.Media.DISPLAY_NAME, displayName)
+            put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg")
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                put(MediaStore.Images.Media.IS_PENDING, 1)
+            }
+        }
+
+        val resolver = context.contentResolver
+
+        val imageUri = resolver.insert(imagesCollection, contentValues)
+
+        imageUri?.let {
+            val outputStream = resolver.openOutputStream(it)
+            outputStream?.use { stream ->
+                imageFile.inputStream().copyTo(stream)
+            }
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                contentValues.clear()
+                contentValues.put(MediaStore.Images.Media.IS_PENDING, 0)
+                resolver.update(imageUri, contentValues, null, null)
+            }
+        }
+    }
+
+
     private fun focusOnPoint(x: Float?, y: Float?) {
         if (x === null || y === null) {
             camera?.cameraControl?.cancelFocusAndMetering()

package/dist/specs/CameraNativeComponent.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="react-native/types/modules/codegen" />
-/// <reference types="react-native/types/modules/codegen" />
 import type { ViewProps, ColorValue } from 'react-native';
 import type { DirectEventHandler, Int32, Double, WithDefault, Float } from 'react-native/Libraries/Types/CodegenTypes';
 type OnReadCodeData = {

package/ios/ReactNativeCameraKit/CameraManager.swift

@@ -22,7 +22,7 @@ import Foundation
                        options: NSDictionary,
                        resolve: @escaping RCTPromiseResolveBlock,
                        reject: @escaping RCTPromiseRejectBlock) {
-        camera.capture(onSuccess: { resolve($0) },
+        camera.capture(options as! [String: Any], onSuccess: { resolve($0) },
                     onError: { reject("capture_error", $0, nil) })
     }
 

package/ios/ReactNativeCameraKit/CameraView.swift

@@ -311,7 +311,7 @@ public class CameraView: UIView {
 
     // MARK: Public
 
-    @objc public func capture(onSuccess: @escaping (_ imageObject: [String: Any]) -> Void,
+    @objc public func capture(_ options: [String: Any], onSuccess: @escaping (_ imageObject: [String: Any]) -> Void,
                  onError: @escaping (_ error: String) -> Void) {
         camera.capturePicture(onWillCapture: { [weak self] in
             // Flash/dim preview to indicate shutter action
@@ -326,6 +326,7 @@ public class CameraView: UIView {
                 self?.writeCaptured(imageData: imageData,
                                     thumbnailData: thumbnailData,
                                     dimensions: dimensions,
+                                    options: options,
                                     onSuccess: onSuccess,
                                     onError: onError)
 
@@ -428,19 +429,55 @@ public class CameraView: UIView {
     private func writeCaptured(imageData: Data,
                                thumbnailData: Data?,
                                dimensions: CMVideoDimensions,
+                               options: [String: Any],
                                onSuccess: @escaping (_ imageObject: [String: Any]) -> Void,
                                onError: @escaping (_ error: String) -> Void) {
         do {
-            let temporaryImageFileURL = try saveToTmpFolder(imageData)
-
-            onSuccess([
-                "size": imageData.count,
-                "uri": temporaryImageFileURL.description,
-                "name": temporaryImageFileURL.lastPathComponent,
-                "thumb": "",
-                "height": dimensions.height,
-                "width": dimensions.width
-            ])
+//            let temporaryImageFileURL = try saveToTmpFolder(imageData)
+//
+//            onSuccess([
+//                "size": imageData.count,
+//                "uri": temporaryImageFileURL.description,
+//                "name": temporaryImageFileURL.lastPathComponent,
+//                "thumb": "",
+//                "height": dimensions.height,
+//                "width": dimensions.width
+//            ])
+            guard var image = UIImage(data: imageData) else {
+                            onError("Failed to create UIImage from captured data")
+                            return
+                        }
+                        
+                        // Get width, height, quality from options
+                        let targetWidth = options["width"] as? Int
+                        let targetHeight = options["height"] as? Int
+                        let targetQuality = CGFloat((options["quality"] as? Int ?? 100)) / 100.0
+                        
+                        // Resize image if width and height are specified
+                        if let width = targetWidth, let height = targetHeight {
+                            image = resizeImage(image: image, targetSize: CGSize(width: width, height: height))
+                        }
+                        
+                        // Convert to JPEG data with specified quality
+                        guard let processedImageData = image.jpegData(compressionQuality: targetQuality) else {
+                            onError("Failed to convert processed image to JPEG data")
+                            return
+                        }
+                        
+                        let temporaryImageFileURL = try saveToTmpFolder(processedImageData)
+                        
+                        onSuccess([
+                            "size": processedImageData.count,
+                            "uri": temporaryImageFileURL.description,
+                            "name": temporaryImageFileURL.lastPathComponent,
+                            "thumb": "",
+                            "width": targetWidth ?? dimensions.width,
+                            "height": targetHeight ?? dimensions.height,
+                        ])
+                        
+                        if let savePhoto = options["savePhoto"] as? Bool, savePhoto {
+                            UIImageWriteToSavedPhotosAlbum(image, nil, nil, nil)
+                        }
         } catch {
             let errorMessage = "Error occurred while writing image data to a temporary file: \(error)"
             print(errorMessage)
@@ -464,6 +501,36 @@ public class CameraView: UIView {
 
         return temporaryFileURL
     }
+    
+    private func resizeImage(image: UIImage, targetSize: CGSize) -> UIImage {
+            let widthRatio  = targetSize.width  / image.size.width
+            let heightRatio = targetSize.height / image.size.height
+            
+            // Chọn scale lớn hơn để đảm bảo ảnh phủ kín targetSize
+            let scaleFactor = max(widthRatio, heightRatio)
+            
+            let scaledWidth = image.size.width * scaleFactor
+            let scaledHeight = image.size.height * scaleFactor
+            
+            // Resize trước
+            UIGraphicsBeginImageContextWithOptions(CGSize(width: scaledWidth, height: scaledHeight), false, 1.0)
+            image.draw(in: CGRect(origin: .zero, size: CGSize(width: scaledWidth, height: scaledHeight)))
+            let scaledImage = UIGraphicsGetImageFromCurrentImageContext()
+            UIGraphicsEndImageContext()
+            
+            guard let finalScaledImage = scaledImage else { return image }
+            
+            // Crop giữa ảnh để đúng targetSize
+            let cropX = (scaledWidth - targetSize.width) / 2
+            let cropY = (scaledHeight - targetSize.height) / 2
+            let cropRect = CGRect(x: cropX, y: cropY, width: targetSize.width, height: targetSize.height)
+            
+            if let cgImage = finalScaledImage.cgImage?.cropping(to: cropRect) {
+                return UIImage(cgImage: cgImage)
+            }
+            
+            return finalScaledImage
+        }
 
     private func onBarcodeRead(barcode: String, codeFormat:CodeFormat) {
         // Throttle barcode detection

package/ios/ReactNativeCameraKit/RNCameraKitModule.mm

@@ -46,7 +46,7 @@ RCT_EXPORT_MODULE();
 
 RCT_EXPORT_METHOD(capture:(NSDictionary *)options tag:(nonnull NSNumber *)tag resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withCamera:tag block:^(CKCameraView *view) {
-        [CKCameraManager captureWithCamera:view options:[NSDictionary new] resolve:resolve reject:reject];
+        [CKCameraManager captureWithCamera:view options:options resolve:resolve reject:reject];
     } reject:reject methodName:@"capture"];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/camerakit",
-    "version": "0.150.2-beta.3",
+    "version": "0.150.2-beta.30",
     "repository": {
         "type": "git",
         "url": "https://github.com/teslamotors/react-native-camera-kit.git"
@@ -11,44 +11,16 @@
     "description": "A high performance, fully featured, rock solid camera library for React Native applications",
     "nativePackage": true,
     "scripts": {
-        "build": "tsc --project tsconfig.json",
-        "clean": "rm -rf dist/",
+        "build": "echo",
         "test": "jest",
-        "lint": "yarn eslint -c .eslintrc.js",
-        "check-ios": "scripts/check-ios.sh",
-        "release": "yarn clean && yarn build && yarn publish --verbose",
-        "release:beta": "yarn clean && yarn build && yarn publish --tag beta --verbose",
-        "release:local": "yarn clean && yarn build && tmp=$(mktemp) && yarn pack --filename $tmp.tar.gz && open -R $tmp.tar.gz",
-        "start": "watchman watch-del-all && node node_modules/react-native/local-cli/cli.js start",
-        "bootstrap": "cd example/ && bundle install && yarn && cd ios/ && bundle exec pod install",
-        "bootstrap-linux": "cd example/ && yarn"
+        "lint": "yarn eslint -c .eslintrc.js"
     },
-    "main": "dist/index.js",
-    "module": "dist/index.js",
-    "source": "./src/",
-    "types": "dist/index.d.ts",
-    "react-native": "src/index",
+    "main": "./src/index.ts",
     "dependencies": {},
     "license": "MIT",
     "devDependencies": {
-        "@babel/core": "^7.20.0",
-        "@babel/preset-env": "^7.20.0",
-        "@babel/runtime": "^7.20.0",
-        "@react-native/babel-preset": "0.74.83",
-        "@react-native/eslint-config": "0.74.83",
-        "@react-native/metro-config": "0.74.83",
-        "@react-native/typescript-config": "0.74.83",
-        "@types/react": "^18.2.6",
-        "@types/react-test-renderer": "^18.0.0",
-        "babel-jest": "^29.6.3",
-        "eslint": "^8.19.0",
-        "eslint-plugin-import": "^2.22.1",
-        "jest": "^29.6.3",
-        "prettier": "2.8.8",
-        "react": "18.2.0",
-        "react-native": "0.74.1",
-        "react-test-renderer": "18.2.0",
-        "typescript": "5.0.4"
+        "react": "19.0.0",
+        "react-native": "0.80.1"
     },
     "peerDependencies": {
         "react": "*",