From 40794948bc458c6bb2ef6449fef899e60905ad69 Mon Sep 17 00:00:00 2001 From: Jameson Lapp Date: Thu, 19 Dec 2024 14:35:28 -0500 Subject: [PATCH] Add support for onCaptureButtonPressIn and onCaptureButtonPressOut events on Android --- README.md | 4 +-- .../src/main/java/com/rncamerakit/CKCamera.kt | 33 +++++++++++++++++++ .../java/com/rncamerakit/CKCameraManager.kt | 4 ++- .../events/CaptureButtonPressInEvent.kt | 22 +++++++++++++ .../events/CaptureButtonPressOutEvent.kt | 22 +++++++++++++ 5 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 android/src/main/java/com/rncamerakit/events/CaptureButtonPressInEvent.kt create mode 100644 android/src/main/java/com/rncamerakit/events/CaptureButtonPressOutEvent.kt diff --git a/README.md b/README.md index 2185f27..ad48de3 100644 --- a/README.md +++ b/README.md @@ -196,8 +196,8 @@ Additionally, the Camera can be used for barcode scanning | `resizeMode` | `'cover' / 'contain'` | Determines the scaling and cropping behavior of content within the view. `cover` (resizeAspectFill on iOS) scales the content to fill the view completely, potentially cropping content if its aspect ratio differs from the view. `contain` (resizeAspect on iOS) scales the content to fit within the view's bounds without cropping, ensuring all content is visible but may introduce letterboxing. Default behavior depends on the specific use case. | | `scanThrottleDelay` | `number` | Duration between scan detection in milliseconds. Default 2000 (2s) | | `maxPhotoQualityPrioritization` | `'balanced'` / `'quality'` / `'speed'` | [iOS 13 and newer](https://developer.apple.com/documentation/avfoundation/avcapturephotooutput/3182995-maxphotoqualityprioritization). `'speed'` provides a 60-80% median capture time reduction vs 'quality' setting. Tested on iPhone 6S Max (66% faster) and iPhone 15 Pro Max (76% faster!). Default `balanced` | -| `onCaptureButtonPressIn` | Function | Callback when iPhone capture button is pressed in. Ex: `onCaptureButtonPressIn={() => console.log("volume button pressed in")}` | -| `onCaptureButtonPressOut` | Function | Callback when iPhone capture button is released. Ex: `onCaptureButtonPressOut={() => console.log("volume button released")}` | +| `onCaptureButtonPressIn` | Function | Callback when camera capture or volume button is pressed in. Ex: `onCaptureButtonPressIn={() => console.log("volume button pressed in")}` | +| `onCaptureButtonPressOut` | Function | Callback when camera capture or volume button is released. Ex: `onCaptureButtonPressOut={() => console.log("volume button released")}` | | **Barcode only** | | `scanBarcode` | `boolean` | Enable barcode scanner. Default: `false` | | `showFrame` | `boolean` | Show frame in barcode scanner. Default: `false` | diff --git a/android/src/main/java/com/rncamerakit/CKCamera.kt b/android/src/main/java/com/rncamerakit/CKCamera.kt index d2a2a97..a3ad6f3 100644 --- a/android/src/main/java/com/rncamerakit/CKCamera.kt +++ b/android/src/main/java/com/rncamerakit/CKCamera.kt @@ -115,6 +115,8 @@ class CKCamera(context: ThemedReactContext) : FrameLayout(context), LifecycleObs LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT ) + viewFinder.setFocusableInTouchMode(true) + viewFinder.requestFocusFromTouch() installHierarchyFitter(viewFinder) addView(viewFinder) @@ -139,6 +141,22 @@ class CKCamera(context: ThemedReactContext) : FrameLayout(context), LifecycleObs cameraProvider?.unbindAll() } + override fun dispatchKeyEvent(event: KeyEvent?): Boolean { + val keyCode = event?.getKeyCode() + val action = event?.getAction() + + if (keyCode == KeyEvent.KEYCODE_CAMERA || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN || keyCode == KeyEvent.KEYCODE_VOLUME_UP) { + if (action == KeyEvent.ACTION_DOWN) { + onCaptureButtonPressIn(keyCode) + return true + } else if (action == KeyEvent.ACTION_UP) { + onCaptureButtonPressOut(keyCode) + return true + } + } + return super.dispatchKeyEvent(event) + } + // If this is not called correctly, view finder will be black/blank // https://github.com/facebook/react-native/issues/17968#issuecomment-633308615 private fun installHierarchyFitter(view: ViewGroup) { @@ -490,6 +508,21 @@ class CKCamera(context: ThemedReactContext) : FrameLayout(context), LifecycleObs ?.dispatchEvent(PictureTakenEvent(surfaceId, id, uri)) } + private fun onCaptureButtonPressIn(keyCode: Int) { + val surfaceId = UIManagerHelper.getSurfaceId(currentContext) + UIManagerHelper + .getEventDispatcherForReactTag(currentContext, id) + ?.dispatchEvent(CaptureButtonPressInEvent(surfaceId, id, keyCode)) + } + + private fun onCaptureButtonPressOut(keyCode: Int) { + val surfaceId = UIManagerHelper.getSurfaceId(currentContext) + UIManagerHelper + .getEventDispatcherForReactTag(currentContext, id) + ?.dispatchEvent(CaptureButtonPressOutEvent(surfaceId, id, keyCode)) + } + + fun setFlashMode(mode: String?) { val imageCapture = imageCapture ?: return val camera = camera ?: return diff --git a/android/src/main/java/com/rncamerakit/CKCameraManager.kt b/android/src/main/java/com/rncamerakit/CKCameraManager.kt index 6c3b22a..359ebaf 100644 --- a/android/src/main/java/com/rncamerakit/CKCameraManager.kt +++ b/android/src/main/java/com/rncamerakit/CKCameraManager.kt @@ -55,7 +55,9 @@ class CKCameraManager : SimpleViewManager(), CKCameraManagerInterface< ReadCodeEvent.EVENT_NAME, MapBuilder.of("registrationName", "onReadCode"), PictureTakenEvent.EVENT_NAME, MapBuilder.of("registrationName", "onPictureTaken"), ZoomEvent.EVENT_NAME, MapBuilder.of("registrationName", "onZoom"), - ErrorEvent.EVENT_NAME, MapBuilder.of("registrationName", "onError") + ErrorEvent.EVENT_NAME, MapBuilder.of("registrationName", "onError"), + CaptureButtonPressInEvent.EVENT_NAME, MapBuilder.of("registrationName", "onCaptureButtonPressIn"), + CaptureButtonPressOutEvent.EVENT_NAME, MapBuilder.of("registrationName", "onCaptureButtonPressOut") ) } diff --git a/android/src/main/java/com/rncamerakit/events/CaptureButtonPressInEvent.kt b/android/src/main/java/com/rncamerakit/events/CaptureButtonPressInEvent.kt new file mode 100644 index 0000000..43bfbf0 --- /dev/null +++ b/android/src/main/java/com/rncamerakit/events/CaptureButtonPressInEvent.kt @@ -0,0 +1,22 @@ +package com.rncamerakit.events + +import com.facebook.react.bridge.Arguments +import com.facebook.react.bridge.WritableMap +import com.facebook.react.uimanager.events.Event + +class CaptureButtonPressInEvent( + surfaceId: Int, + viewId: Int, + private val keyCode: Int, +) : Event(surfaceId, viewId) { + override fun getEventName(): String = EVENT_NAME + + override fun getEventData(): WritableMap = + Arguments.createMap().apply { + putInt("keyCode", keyCode) + } + + companion object { + const val EVENT_NAME = "captureButtonPressIn" + } +} diff --git a/android/src/main/java/com/rncamerakit/events/CaptureButtonPressOutEvent.kt b/android/src/main/java/com/rncamerakit/events/CaptureButtonPressOutEvent.kt new file mode 100644 index 0000000..ed947f1 --- /dev/null +++ b/android/src/main/java/com/rncamerakit/events/CaptureButtonPressOutEvent.kt @@ -0,0 +1,22 @@ +package com.rncamerakit.events + +import com.facebook.react.bridge.Arguments +import com.facebook.react.bridge.WritableMap +import com.facebook.react.uimanager.events.Event + +class CaptureButtonPressOutEvent( + surfaceId: Int, + viewId: Int, + private val keyCode: Int, +) : Event(surfaceId, viewId) { + override fun getEventName(): String = EVENT_NAME + + override fun getEventData(): WritableMap = + Arguments.createMap().apply { + putInt("keyCode", keyCode) + } + + companion object { + const val EVENT_NAME = "captureButtonPressOut" + } +}