Skip to content

Commit b8417d8

Browse files
committed
fix: apply changes from review
1 parent 3b0f913 commit b8417d8

File tree

7 files changed

+8
-9
lines changed

7 files changed

+8
-9
lines changed

android/src/main/java/com/rncamerakit/RNCameraKitModule.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ class RNCameraKitModule(private val reactContext: ReactApplicationContext) : Nat
6969
*/
7070
@ReactMethod
7171
override fun capture(options: ReadableMap?, tag: Double?, promise: Promise) {
72-
// CameraManager does not allow us to return values
73-
val context = reactContext
7472
val viewTag = tag?.toInt()
7573
if (viewTag != null && options != null) {
7674
val uiManager = UIManagerHelper.getUIManagerForReactTag(reactContext, viewTag)
77-
context.runOnUiQueueThread {
75+
reactContext.runOnUiQueueThread {
7876
val camera = uiManager?.resolveView(viewTag) as CKCamera
7977
camera.capture(options.toHashMap(), promise)
8078
}
79+
} else {
80+
promise.reject("E_CAPTURE_FAILED", "options or/and tag arguments are null, options: $options, tag: $viewTag")
8181
}
8282
}
8383
}

android/src/main/java/com/rncamerakit/RNCameraKitPackage.kt

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class RNCameraKitPackage : TurboReactPackage() {
3434
RNCameraKitModule.REACT_CLASS,
3535
false, // canOverrideExistingModule
3636
false, // needsEagerInit
37-
true, // hasConstants
3837
false, // isCxxModule
3938
isTurboModule // isTurboModule
4039
)

android/src/main/java/com/rncamerakit/events/ErrorEvent.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class ErrorEvent(
1111
) : Event<ErrorEvent>(surfaceId, viewId) {
1212
override fun getEventName(): String = EVENT_NAME
1313

14-
override fun getEventData(): WritableMap? =
14+
override fun getEventData(): WritableMap =
1515
Arguments.createMap().apply {
1616
putString("errorMessage", errorMessage)
1717
}

android/src/main/java/com/rncamerakit/events/OrientationChangeEvent.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class OrientationChangeEvent(
1111
) : Event<OrientationChangeEvent>(surfaceId, viewId) {
1212
override fun getEventName(): String = EVENT_NAME
1313

14-
override fun getEventData(): WritableMap? =
14+
override fun getEventData(): WritableMap =
1515
Arguments.createMap().apply {
1616
putInt("orientation", orientation)
1717
}

android/src/main/java/com/rncamerakit/events/PictureTakenEvent.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class PictureTakenEvent(
1111
) : Event<PictureTakenEvent>(surfaceId, viewId) {
1212
override fun getEventName(): String = EVENT_NAME
1313

14-
override fun getEventData(): WritableMap? =
14+
override fun getEventData(): WritableMap =
1515
Arguments.createMap().apply {
1616
putString("uri", uri)
1717
}

android/src/main/java/com/rncamerakit/events/ReadCodeEvent.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class ReadCodeEvent(
1212
) : Event<ReadCodeEvent>(surfaceId, viewId) {
1313
override fun getEventName(): String = EVENT_NAME
1414

15-
override fun getEventData(): WritableMap? =
15+
override fun getEventData(): WritableMap =
1616
Arguments.createMap().apply {
1717
putString("codeFormat", codeFormat)
1818
putString("codeStringValue", codeStringValue)

android/src/main/java/com/rncamerakit/events/ZoomEvent.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class ZoomEvent(
1111
) : Event<ZoomEvent>(surfaceId, viewId) {
1212
override fun getEventName(): String = EVENT_NAME
1313

14-
override fun getEventData(): WritableMap? =
14+
override fun getEventData(): WritableMap =
1515
Arguments.createMap().apply {
1616
putDouble("zoom", zoom)
1717
}

0 commit comments

Comments
 (0)