diff --git a/android/build.gradle b/android/build.gradle index f89ca88f0e..3d672fb3d9 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,9 +25,7 @@ buildscript { classpath("com.android.tools.build:gradle") classpath("com.facebook.react:react-native-gradle-plugin") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin") - - // Needed for react-native-camera-kit - classpath("com.google.protobuf:protobuf-gradle-plugin:0.9.3") + classpath("com.google.protobuf:protobuf-gradle-plugin:0.9.4") // LN address notifications classpath("com.google.gms:google-services:4.3.15") diff --git a/android/gradle.properties b/android/gradle.properties index 9682d43c54..e77c303d30 100755 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -41,6 +41,3 @@ newArchEnabled=false # Use this property to enable or disable the Hermes JS engine. # If set to false, you will be using JSC instead. hermesEnabled=true - -# Necessary for react-native-camera-kit -kotlin_version=1.8.0 diff --git a/ios/Podfile b/ios/Podfile index 88f69f9f86..b9da3864fd 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -25,8 +25,6 @@ target 'zeus' do pod 'react-native-blob-util', :path => '../node_modules/react-native-blob-util' - pod 'ReactNativeCameraKit', :path => '../node_modules/react-native-camera-kit' - target 'zeusTests' do inherit! :complete # Pods for testing diff --git a/ios/Podfile.lock b/ios/Podfile.lock index bd019fa4b0..4750033b52 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1210,7 +1210,6 @@ DEPENDENCIES: - React-runtimescheduler (from `../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`) - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - - ReactNativeCameraKit (from `../node_modules/react-native-camera-kit`) - "RemobileReactNativeQrcodeLocalImage (from `../node_modules/@remobile/react-native-qrcode-local-image`)" - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)" - "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)" @@ -1373,8 +1372,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/react/utils" ReactCommon: :path: "../node_modules/react-native/ReactCommon" - ReactNativeCameraKit: - :path: "../node_modules/react-native-camera-kit" RemobileReactNativeQrcodeLocalImage: :path: "../node_modules/@remobile/react-native-qrcode-local-image" RNCAsyncStorage: diff --git a/package.json b/package.json index 84d28b7623..deac139f6e 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,6 @@ "react-native": "0.73.7", "react-native-biometrics": "3.0.1", "react-native-blob-util": "0.19.1", - "react-native-camera-kit": "13.0.0", "react-native-circular-progress-indicator": "4.4.2", "react-native-crypto": "2.2.0", "react-native-date-picker": "4.3.3", diff --git a/patches/react-native-camera-kit.patch b/patches/react-native-camera-kit.patch deleted file mode 100644 index 3abd803818..0000000000 --- a/patches/react-native-camera-kit.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 30feb1c4bc1ee7c973d51eaa50cc858c6fdef967 Mon Sep 17 00:00:00 2001 -From: Corey Phillips -Date: Thu, 29 Jun 2023 11:06:40 -0400 -Subject: [PATCH] Fix: Correct onScale method signature in CKCamera.kt - -The 'onScale' method was attempting to override the interface method with a nullable parameter, causing a mismatch with the parent interface. This change corrects the method signature by changing the nullable parameter to non-nullable, aligning it with the interface and ensuring proper method overriding. ---- - android/src/main/java/com/rncamerakit/CKCamera.kt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/node_modules/react-native-camera-kit/android/src/main/java/com/rncamerakit/CKCamera.kt b/node_modules/react-native-camera-kit/android/src/main/java/com/rncamerakit/CKCamera.kt -index 294df4f1f..2023e0bad 100644 ---- a/node_modules/react-native-camera-kit/android/src/main/java/com/rncamerakit/CKCamera.kt -+++ b/node_modules/react-native-camera-kit/android/src/main/java/com/rncamerakit/CKCamera.kt -@@ -180,11 +180,11 @@ class CKCamera(context: ThemedReactContext) : FrameLayout(context), LifecycleObs - orientationListener!!.enable() - - val scaleDetector = ScaleGestureDetector(context, object: ScaleGestureDetector.SimpleOnScaleGestureListener() { -- override fun onScale(detector: ScaleGestureDetector?): Boolean { -+ override fun onScale(detector: ScaleGestureDetector): Boolean { - if (zoomMode == "off") return true - val cameraControl = camera?.cameraControl ?: return true - val zoom = camera?.cameraInfo?.zoomState?.value?.zoomRatio ?: return true -- val scaleFactor = detector?.scaleFactor ?: return true -+ val scaleFactor = detector.scaleFactor - val scale = zoom * scaleFactor - cameraControl.setZoomRatio(scale) - return true diff --git a/yarn.lock b/yarn.lock index ee71a04b5f..ed8ee740f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6944,7 +6944,7 @@ lodash.throttle@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ== -lodash@4.17.21, lodash@^4.14.2, lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.21: +lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -8256,13 +8256,6 @@ react-native-blob-util@0.19.1: base-64 "0.1.0" glob "^7.2.3" -react-native-camera-kit@13.0.0: - version "13.0.0" - resolved "https://registry.yarnpkg.com/react-native-camera-kit/-/react-native-camera-kit-13.0.0.tgz#983d9146cdeb0ec0cb0c0a86b7fa5f7690df08f6" - integrity sha512-fnkyivCG2xzS+14/doP8pCAYNafYaTyg5J0t+JJltJdgKSHf328OG44Rd+fnbbEOydZxgy/bcuLB24R0kCbynw== - dependencies: - lodash "^4.14.2" - react-native-circular-progress-indicator@4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/react-native-circular-progress-indicator/-/react-native-circular-progress-indicator-4.4.2.tgz#5475d045950e6fcc622e54fb63863b274790fb8e"