diff --git a/package/android/src/main/java/com/mrousavy/camera/react/CameraViewManager.kt b/package/android/src/main/java/com/mrousavy/camera/react/CameraViewManager.kt index e890d93a4a..d41300e57d 100644 --- a/package/android/src/main/java/com/mrousavy/camera/react/CameraViewManager.kt +++ b/package/android/src/main/java/com/mrousavy/camera/react/CameraViewManager.kt @@ -29,18 +29,18 @@ class CameraViewManager : ViewGroupManager() { override fun getExportedCustomDirectEventTypeConstants(): MutableMap? = MapBuilder.builder() - .put("cameraViewReady", MapBuilder.of("registrationName", "onViewReady")) - .put("cameraInitialized", MapBuilder.of("registrationName", "onInitialized")) - .put("cameraStarted", MapBuilder.of("registrationName", "onStarted")) - .put("cameraStopped", MapBuilder.of("registrationName", "onStopped")) - .put("cameraPreviewStarted", MapBuilder.of("registrationName", "onPreviewStarted")) - .put("cameraPreviewStopped", MapBuilder.of("registrationName", "onPreviewStopped")) - .put("cameraShutter", MapBuilder.of("registrationName", "onShutter")) - .put("cameraOutputOrientationChanged", MapBuilder.of("registrationName", "onOutputOrientationChanged")) - .put("cameraPreviewOrientationChanged", MapBuilder.of("registrationName", "onPreviewOrientationChanged")) - .put("averageFpsChanged", MapBuilder.of("registrationName", "onAverageFpsChanged")) - .put("cameraError", MapBuilder.of("registrationName", "onError")) - .put("cameraCodeScanned", MapBuilder.of("registrationName", "onCodeScanned")) + .put(CameraViewReadyEvent.EVENT_NAME, MapBuilder.of("registrationName", "onViewReady")) + .put(CameraInitializedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onInitialized")) + .put(CameraStartedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onStarted")) + .put(CameraStoppedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onStopped")) + .put(CameraShutterEvent.EVENT_NAME, MapBuilder.of("registrationName", "onShutter")) + .put(CameraErrorEvent.EVENT_NAME, MapBuilder.of("registrationName", "onError")) + .put(CameraCodeScannedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onCodeScanned")) + .put(CameraPreviewStartedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onPreviewStarted")) + .put(CameraPreviewStoppedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onPreviewStopped")) + .put(CameraOutputOrientationChangedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onOutputOrientationChanged")) + .put(CameraPreviewOrientationChangedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onPreviewOrientationChanged")) + .put(AverageFpsChangedEvent.EVENT_NAME, MapBuilder.of("registrationName", "onAverageFpsChanged")) .build() override fun getName(): String = TAG diff --git a/package/android/src/main/java/com/mrousavy/camera/react/Events.kt b/package/android/src/main/java/com/mrousavy/camera/react/Events.kt index 0281626cdd..acbb77aa92 100644 --- a/package/android/src/main/java/com/mrousavy/camera/react/Events.kt +++ b/package/android/src/main/java/com/mrousavy/camera/react/Events.kt @@ -5,64 +5,100 @@ import com.facebook.react.bridge.WritableMap import com.facebook.react.uimanager.events.Event class CameraInitializedEvent(surfaceId: Int, viewId: Int) : Event(surfaceId, viewId) { - override fun getEventName() = "cameraInitialized" + override fun getEventName() = EVENT_NAME override fun getEventData(): WritableMap = Arguments.createMap() + companion object { + const val EVENT_NAME = "topCameraInitialized" + } } class CameraStartedEvent(surfaceId: Int, viewId: Int) : Event(surfaceId, viewId) { - override fun getEventName() = "cameraStarted" + override fun getEventName() = EVENT_NAME override fun getEventData(): WritableMap = Arguments.createMap() + companion object { + const val EVENT_NAME = "topCameraStarted" + } } class CameraStoppedEvent(surfaceId: Int, viewId: Int) : Event(surfaceId, viewId) { - override fun getEventName() = "cameraStopped" + override fun getEventName() = EVENT_NAME override fun getEventData(): WritableMap = Arguments.createMap() + companion object { + const val EVENT_NAME = "topCameraStopped" + } } class CameraPreviewStartedEvent(surfaceId: Int, viewId: Int) : Event(surfaceId, viewId) { - override fun getEventName() = "cameraPreviewStarted" + override fun getEventName() = EVENT_NAME override fun getEventData(): WritableMap = Arguments.createMap() + companion object { + const val EVENT_NAME = "topCameraPreviewStarted" + } } class CameraPreviewStoppedEvent(surfaceId: Int, viewId: Int) : Event(surfaceId, viewId) { - override fun getEventName() = "cameraPreviewStopped" + override fun getEventName() = EVENT_NAME override fun getEventData(): WritableMap = Arguments.createMap() + companion object { + const val EVENT_NAME = "topCameraPreviewStopped" + } } class CameraShutterEvent(surfaceId: Int, viewId: Int, private val data: WritableMap) : Event(surfaceId, viewId) { - override fun getEventName() = "cameraShutter" + override fun getEventName() = EVENT_NAME override fun getEventData() = data + companion object { + const val EVENT_NAME = "topCameraShutter" + } } class CameraOutputOrientationChangedEvent(surfaceId: Int, viewId: Int, private val data: WritableMap) : Event(surfaceId, viewId) { - override fun getEventName() = "cameraOutputOrientationChanged" + override fun getEventName() = EVENT_NAME override fun getEventData() = data + companion object { + const val EVENT_NAME = "topCameraOutputOrientationChanged" + } } class CameraPreviewOrientationChangedEvent(surfaceId: Int, viewId: Int, private val data: WritableMap) : Event(surfaceId, viewId) { - override fun getEventName() = "cameraPreviewOrientationChanged" + override fun getEventName() = EVENT_NAME override fun getEventData() = data + companion object { + const val EVENT_NAME = "topCameraPreviewOrientationChanged" + } } class AverageFpsChangedEvent(surfaceId: Int, viewId: Int, private val data: WritableMap) : Event(surfaceId, viewId) { - override fun getEventName() = "averageFpsChanged" + override fun getEventName() = EVENT_NAME override fun getEventData() = data + companion object { + const val EVENT_NAME = "topCameraAverageFpsChanged" + } } class CameraErrorEvent(surfaceId: Int, viewId: Int, private val data: WritableMap) : Event(surfaceId, viewId) { - override fun getEventName() = "cameraError" + override fun getEventName() = EVENT_NAME override fun getEventData() = data + companion object { + const val EVENT_NAME = "topCameraError" + } } class CameraViewReadyEvent(surfaceId: Int, viewId: Int) : Event(surfaceId, viewId) { - override fun getEventName() = "cameraViewReady" + override fun getEventName() = EVENT_NAME override fun getEventData(): WritableMap = Arguments.createMap() + companion object { + const val EVENT_NAME = "topCameraViewReady" + } } class CameraCodeScannedEvent(surfaceId: Int, viewId: Int, private val data: WritableMap) : Event(surfaceId, viewId) { - override fun getEventName() = "cameraCodeScanned" + override fun getEventName() = EVENT_NAME override fun getEventData() = data + companion object { + const val EVENT_NAME = "topCameraCodeScanned" + } }