From 54a35f62ac166778dee9ce674409ab8290bc6a5c Mon Sep 17 00:00:00 2001 From: Elliott Kember Date: Tue, 3 Oct 2023 10:37:53 -0700 Subject: [PATCH] Fix: Correct onScale method signature in CKCamera.kt (again) #559 broke a change in #551 regarding override types. This restores the fix --- android/src/main/java/com/rncamerakit/CKCamera.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/src/main/java/com/rncamerakit/CKCamera.kt b/android/src/main/java/com/rncamerakit/CKCamera.kt index 6238473f1..efbfe8632 100644 --- a/android/src/main/java/com/rncamerakit/CKCamera.kt +++ b/android/src/main/java/com/rncamerakit/CKCamera.kt @@ -185,14 +185,14 @@ class CKCamera(context: ThemedReactContext) : FrameLayout(context), LifecycleObs orientationListener!!.enable() val scaleDetector = ScaleGestureDetector(context, object: ScaleGestureDetector.SimpleOnScaleGestureListener() { - override fun onScaleBegin(detector: ScaleGestureDetector?): Boolean { + override fun onScaleBegin(detector: ScaleGestureDetector): Boolean { val cameraZoom = camera?.cameraInfo?.zoomState?.value?.zoomRatio ?: return false detector ?: return false zoomStartedAt = cameraZoom pinchGestureStartedAt = detector.currentSpan return true } - override fun onScale(detector: ScaleGestureDetector?): Boolean { + override fun onScale(detector: ScaleGestureDetector): Boolean { if (zoomMode == "off") return true if (detector == null) return true val videoDevice = camera ?: return true