From 24967e9ac9a39fe635fa005e63a080fc6e47187c Mon Sep 17 00:00:00 2001 From: aarongrider Date: Tue, 12 Jan 2021 11:23:48 -0800 Subject: [PATCH 1/3] Remove porter duff blending mode due to different behavior below api level 27 --- .../src/main/java/com/rncamerakit/barcode/BarcodeFrame.kt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/android/src/main/java/com/rncamerakit/barcode/BarcodeFrame.kt b/android/src/main/java/com/rncamerakit/barcode/BarcodeFrame.kt index 2822a05..80f3aa1 100644 --- a/android/src/main/java/com/rncamerakit/barcode/BarcodeFrame.kt +++ b/android/src/main/java/com/rncamerakit/barcode/BarcodeFrame.kt @@ -8,9 +8,6 @@ import androidx.annotation.ColorInt import com.rncamerakit.R class BarcodeFrame(context: Context) : View(context) { - - private var dimPaint: Paint = Paint() - private var framePaint: Paint = Paint() private var borderPaint: Paint = Paint() private var laserPaint: Paint = Paint() var frameRect: Rect = Rect() @@ -22,9 +19,6 @@ class BarcodeFrame(context: Context) : View(context) { private var laserY = 0 private fun init(context: Context) { - framePaint.xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR) - dimPaint.style = Paint.Style.FILL - dimPaint.color = context.resources.getColor(R.color.bg_dark) borderPaint = Paint() borderPaint.style = Paint.Style.STROKE borderPaint.strokeWidth = STROKE_WIDTH.toFloat() @@ -48,8 +42,6 @@ class BarcodeFrame(context: Context) : View(context) { override fun onDraw(canvas: Canvas) { val timeElapsed = System.currentTimeMillis() - previousFrameTime super.onDraw(canvas) - canvas.drawRect(0f, 0f, width.toFloat(), height.toFloat(), dimPaint) - canvas.drawRect(frameRect, framePaint) drawBorder(canvas) drawLaser(canvas, timeElapsed) previousFrameTime = System.currentTimeMillis() From 06487dcc5f9f00b9f49459915c30a0df5507da45 Mon Sep 17 00:00:00 2001 From: aarongrider Date: Tue, 12 Jan 2021 13:34:08 -0800 Subject: [PATCH 2/3] Fix camera view scale --- android/src/main/java/com/rncamerakit/CKCamera.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/android/src/main/java/com/rncamerakit/CKCamera.kt b/android/src/main/java/com/rncamerakit/CKCamera.kt index 57c8e34..279f3ce 100644 --- a/android/src/main/java/com/rncamerakit/CKCamera.kt +++ b/android/src/main/java/com/rncamerakit/CKCamera.kt @@ -191,9 +191,6 @@ class CKCamera(context: ThemedReactContext) : FrameLayout(context), LifecycleObs } orientationListener!!.enable() - // Contain camera feed image within component bounds, centered - viewFinder.scaleType = PreviewView.ScaleType.FILL_CENTER - // Tap to focus viewFinder.setOnTouchListener { _, event -> if (event.action != MotionEvent.ACTION_UP) { From 52ab2ef27bd17cac32f0bbd780b8bedd8f35acb1 Mon Sep 17 00:00:00 2001 From: aarongrider Date: Tue, 12 Jan 2021 13:34:37 -0800 Subject: [PATCH 3/3] Save each captured image with unique name --- android/src/main/java/com/rncamerakit/CKCamera.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/rncamerakit/CKCamera.kt b/android/src/main/java/com/rncamerakit/CKCamera.kt index 279f3ce..50a2e12 100644 --- a/android/src/main/java/com/rncamerakit/CKCamera.kt +++ b/android/src/main/java/com/rncamerakit/CKCamera.kt @@ -255,7 +255,7 @@ class CKCamera(context: ThemedReactContext) : FrameLayout(context), LifecycleObs fun capture(options: Map, promise: Promise) { // Create output options object which contains file + metadata val contentValues = ContentValues().apply { - put(MediaStore.MediaColumns.DISPLAY_NAME, "Untitled") + put(MediaStore.MediaColumns.DISPLAY_NAME, "IMG_" + System.currentTimeMillis()) put(MediaStore.MediaColumns.MIME_TYPE, "image/jpg") }