Skip to content

Commit

Permalink
Fix Android project
Browse files Browse the repository at this point in the history
  • Loading branch information
aarongrider committed Feb 21, 2022
1 parent 2cc9a77 commit dd88556
Show file tree
Hide file tree
Showing 11 changed files with 50 additions and 38 deletions.
7 changes: 5 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {

repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -52,7 +52,7 @@ android {

repositories {
mavenCentral()
jcenter()
mavenLocal()
google()

def found = false
Expand Down Expand Up @@ -127,4 +127,7 @@ dependencies {
// noinspection GradleDynamicVersion
api 'com.facebook.react:react-native:+'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

implementation project(':react-native-vision-camera')
implementation "androidx.camera:camera-core:1.1.0-alpha08"
}
9 changes: 5 additions & 4 deletions android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
VisionCameraOcr_kotlinVersion=1.3.50
VisionCameraOcr_compileSdkVersion=29
VisionCameraOcr_buildToolsVersion=29.0.2
VisionCameraOcr_targetSdkVersion=29
VisionCameraOcr_kotlinVersion=1.5.30
VisionCameraOcr_compileSdkVersion=31
VisionCameraOcr_buildToolsVersion=30.0.0
VisionCameraOcr_targetSdkVersion=31
VisionCameraOcr_ndkVersion=21.4.7075529
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.visioncameraocr

import androidx.camera.core.ImageProxy
import com.facebook.react.bridge.WritableNativeArray
import com.facebook.react.bridge.WritableNativeMap
import com.mrousavy.camera.frameprocessor.FrameProcessorPlugin


class OCRFrameProcessorPlugin: FrameProcessorPlugin("scanOCR") {

override fun callback(image: ImageProxy, params: Array<Any>): Any? {
val result = WritableNativeMap()
result.putString("text", "Test Text")

val blocks = WritableNativeArray()
result.putArray("blocks", blocks)

val data = WritableNativeMap()
data.putMap("result", result)

return data
}
}
24 changes: 0 additions & 24 deletions android/src/main/java/com/visioncameraocr/VisionCameraOcrModule.kt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ import com.facebook.react.ReactPackage
import com.facebook.react.bridge.NativeModule
import com.facebook.react.bridge.ReactApplicationContext
import com.facebook.react.uimanager.ViewManager
import com.mrousavy.camera.frameprocessor.FrameProcessorPlugin


class VisionCameraOcrPackage : ReactPackage {
override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
return listOf(VisionCameraOcrModule(reactContext))
FrameProcessorPlugin.register(OCRFrameProcessorPlugin())
return emptyList()
}

override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
Expand Down
2 changes: 1 addition & 1 deletion example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ import com.android.build.OutputFile
*/

project.ext.react = [
enableHermes: false, // clean and rebuild if changing
enableHermes: true, // clean and rebuild if changing
entryFile: "index.tsx",
]

Expand Down
6 changes: 6 additions & 0 deletions example/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@

<uses-permission android:name="android.permission.INTERNET" />

<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />

<application
android:name=".MainApplication"
android:label="@string/app_name"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import java.lang.reflect.InvocationTargetException;
import java.util.List;
import com.visioncameraocr.VisionCameraOcrPackage;
import com.facebook.react.bridge.JSIModulePackage;
import com.swmansion.reanimated.ReanimatedJSIModulePackage;

public class MainApplication extends Application implements ReactApplication {

Expand All @@ -26,7 +28,6 @@ protected List<ReactPackage> getPackages() {
@SuppressWarnings("UnnecessaryLocalVariable")
List<ReactPackage> packages = new PackageList(this).getPackages();
// Packages that cannot be autolinked yet can be added manually here, for VisionCameraOcrExample:
// packages.add(new MyReactNativePackage());
packages.add(new VisionCameraOcrPackage());
return packages;
}
Expand Down
4 changes: 2 additions & 2 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
buildscript {
ext {
minSdkVersion = 21
compileSdkVersion = 30
compileSdkVersion = 31
targetSdkVersion = 30
ndkVersion = "20.1.5948944"
}
Expand All @@ -12,7 +12,7 @@ buildscript {
jcenter()
}
dependencies {
classpath("com.android.tools.build:gradle:3.5.3")
classpath("com.android.tools.build:gradle:4.1.0")

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
2 changes: 1 addition & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions example/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ export default function App() {

const frameProcessor = useFrameProcessor((frame) => {
'worklet';
const scannedOcr = scanOCR(frame);
runOnJS(setOcr)(scannedOcr);
const data = scanOCR(frame);
runOnJS(setOcr)(data);
}, []);

React.useEffect(() => {
Expand Down

0 comments on commit dd88556

Please sign in to comment.