status-im
/
react-native-camera-kit
mirror of https://github.com/status-im/react-native-camera-kit.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make scaleDetector a constant to prevent threading issues

This commit is contained in:
aarongrider 2021-01-14 12:53:22 -08:00
parent 37f28488a5
commit eea37b83f0
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
android/src/main/java/com/rncamerakit/CKCamera.kt
View File

@ -9,7 +9,6 @@ import android.content.ContentValues
import android.content.Context import android.content.Context
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.graphics.Color import android.graphics.Color
import android.graphics.Rect
import android.hardware.SensorManager import android.hardware.SensorManager
import android.media.AudioManager import android.media.AudioManager
import android.media.MediaActionSound import android.media.MediaActionSound
@ -26,9 +25,7 @@ import androidx.camera.lifecycle.ProcessCameraProvider
import androidx.camera.view.PreviewView import androidx.camera.view.PreviewView
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleObserver import androidx.lifecycle.LifecycleObserver
import androidx.lifecycle.OnLifecycleEvent
import com.facebook.react.bridge.Arguments import com.facebook.react.bridge.Arguments
import com.facebook.react.bridge.Promise import com.facebook.react.bridge.Promise
import com.facebook.react.bridge.WritableMap import com.facebook.react.bridge.WritableMap
@ -52,7 +49,6 @@ class CKCamera(context: ThemedReactContext) : FrameLayout(context), LifecycleObs
private var imageCapture: ImageCapture? = null private var imageCapture: ImageCapture? = null
private var imageAnalyzer: ImageAnalysis? = null private var imageAnalyzer: ImageAnalysis? = null
private var orientationListener: OrientationEventListener? = null private var orientationListener: OrientationEventListener? = null
private var scaleDetector: ScaleGestureDetector? = null
private var viewFinder: PreviewView = PreviewView(context) private var viewFinder: PreviewView = PreviewView(context)
private var barcodeFrame: BarcodeFrame? = null private var barcodeFrame: BarcodeFrame? = null
private var cameraExecutor: ExecutorService = Executors.newSingleThreadExecutor() private var cameraExecutor: ExecutorService = Executors.newSingleThreadExecutor()
@ -86,8 +82,6 @@ class CKCamera(context: ThemedReactContext) : FrameLayout(context), LifecycleObs
effectLayer.alpha = 0F effectLayer.alpha = 0F
effectLayer.setBackgroundColor(Color.BLACK) effectLayer.setBackgroundColor(Color.BLACK)
addView(effectLayer) addView(effectLayer)
(getActivity() as AppCompatActivity).lifecycle.addObserver(this)
} }
override fun onAttachedToWindow() { override fun onAttachedToWindow() {
@ -154,7 +148,7 @@ class CKCamera(context: ThemedReactContext) : FrameLayout(context), LifecycleObs
} }
orientationListener!!.enable() orientationListener!!.enable()
scaleDetector = ScaleGestureDetector(context, object: ScaleGestureDetector.SimpleOnScaleGestureListener() { val scaleDetector = ScaleGestureDetector(context, object: ScaleGestureDetector.SimpleOnScaleGestureListener() {
override fun onScale(detector: ScaleGestureDetector?): Boolean { override fun onScale(detector: ScaleGestureDetector?): Boolean {
if (zoomMode == "off") return true if (zoomMode == "off") return true
val cameraControl = camera?.cameraControl ?: return true val cameraControl = camera?.cameraControl ?: return true
@ -169,7 +163,7 @@ class CKCamera(context: ThemedReactContext) : FrameLayout(context), LifecycleObs
// Tap to focus // Tap to focus
viewFinder.setOnTouchListener { _, event -> viewFinder.setOnTouchListener { _, event ->
if (event.action != MotionEvent.ACTION_UP) { if (event.action != MotionEvent.ACTION_UP) {
return@setOnTouchListener scaleDetector!!.onTouchEvent(event) return@setOnTouchListener scaleDetector.onTouchEvent(event)
} }
focusOnPoint(event.x, event.y) focusOnPoint(event.x, event.y)
return@setOnTouchListener true return@setOnTouchListener true