Skip to content

Commit c85b87c

Browse files
ghensleyghensley
committed
added updates for 2.16
1 parent 575557a commit c85b87c

6 files changed

Lines changed: 199 additions & 78 deletions

File tree

‎src/android/.gitignore‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/android/blinkid-react-native.iml‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.id=":blinkid-react-native" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../../../android" external.system.id="GRADLE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android-gradle" name="Android-Gradle">
5+
<configuration>
6+
<option name="GRADLE_PROJECT_PATH" value=":blinkid-react-native" />
7+
</configuration>
8+
</facet>
9+
<facet type="android" name="Android">
10+
<configuration>
11+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
13+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
14+
<afterSyncTasks>
15+
<task>generateDebugSources</task>
16+
</afterSyncTasks>
17+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
18+
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
19+
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
21+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
22+
<option name="PROJECT_TYPE" value="1" />
23+
</configuration>
24+
</facet>
25+
</component>
26+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
27+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
29+
<exclude-output />
30+
<content url="file://$MODULE_DIR$">
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/jars" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fbui.textlayoutbuilder/textlayoutbuilder/1.0.0/jars" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/drawee/0.11.0/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fbcore/0.11.0/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fresco/0.11.0/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-base/0.11.0/jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-okhttp3/0.11.0/jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.11.0/jars" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.42.3/jars" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.soloader/soloader/0.1.0/jars" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.microblink/blinkid/3.12.0/jars" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.webkit/android-jsc/r174650/jars" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
109+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/typedefs.txt" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
111+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
112+
</content>
113+
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
114+
<orderEntry type="sourceFolder" forTests="false" />
115+
<orderEntry type="library" exported="" name="okio-1.9.0" level="project" />
116+
<orderEntry type="library" exported="" name="imagepipeline-0.11.0" level="project" />
117+
<orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
118+
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
119+
<orderEntry type="library" exported="" name="imagepipeline-base-0.11.0" level="project" />
120+
<orderEntry type="library" exported="" name="textlayoutbuilder-1.0.0" level="project" />
121+
<orderEntry type="library" exported="" name="fresco-0.11.0" level="project" />
122+
<orderEntry type="library" exported="" name="drawee-0.11.0" level="project" />
123+
<orderEntry type="library" exported="" name="soloader-0.1.0" level="project" />
124+
<orderEntry type="library" exported="" name="javax.inject-1" level="project" />
125+
<orderEntry type="library" exported="" name="jsr305-3.0.0" level="project" />
126+
<orderEntry type="library" exported="" name="bolts-tasks-1.4.0" level="project" />
127+
<orderEntry type="library" exported="" name="okhttp-urlconnection-3.4.1" level="project" />
128+
<orderEntry type="library" exported="" name="blinkid-3.12.0" level="project" />
129+
<orderEntry type="library" exported="" name="okhttp-ws-3.4.1" level="project" />
130+
<orderEntry type="library" exported="" name="android-jsc-r174650" level="project" />
131+
<orderEntry type="library" exported="" name="okhttp-3.4.1" level="project" />
132+
<orderEntry type="library" exported="" name="react-native-0.42.3" level="project" />
133+
<orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
134+
<orderEntry type="library" exported="" name="staticlayout-proxy-1.0" level="project" />
135+
<orderEntry type="library" exported="" name="recyclerview-v7-23.4.0" level="project" />
136+
<orderEntry type="library" exported="" name="imagepipeline-okhttp3-0.11.0" level="project" />
137+
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
138+
<orderEntry type="library" exported="" name="fbcore-0.11.0" level="project" />
139+
</component>
140+
</module>

‎src/ios/BlinkIDReactNative/BlinkIDReactNative.xcodeproj/xcuserdata/greysonhensley.xcuserdatad/xcschemes/xcschememanagement.plist‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>SchemeUserState</key>
6+
<dict>
7+
<key>BlinkIDReactNative.xcscheme</key>
8+
<dict>
9+
<key>orderHint</key>
10+
<integer>30</integer>
11+
</dict>
12+
</dict>
13+
</dict>
14+
</plist>

‎src/ios/BlinkIDReactNative/BlinkIDReactNative/BlinkIDReactNative.mm‎

Lines changed: 5 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,6 @@ - (PPCameraCoordinator *)coordinatorWithError:(NSError**)error {
270270
[settings.scanSettings addRecognizerSettings:[self documentFaceRecognizerSettings]];
271271
}
272272

273-
if ([self shouldUseMyKadRecognizer]) {
274-
[settings.scanSettings addRecognizerSettings:[self myKadRecognizerSettings]];
275-
}
276-
277273
if ([self shouldUsePDF417Recognizer]) {
278274
[settings.scanSettings addRecognizerSettings:[self pdf417RecognizerSettings]];
279275
}
@@ -406,13 +402,6 @@ - (void)setDictionary:(NSMutableDictionary *)dict withDocumentFaceResult:(PPDocu
406402
[dict setObject:kDocumentFaceResultType forKey:kResultType];
407403
}
408404

409-
- (void)setDictionary:(NSMutableDictionary *)dict withMyKadRecognizerResult:(PPMyKadRecognizerResult *)myKadResult {
410-
NSMutableDictionary *stringElements = [NSMutableDictionary dictionaryWithDictionary:[myKadResult getAllStringElements]];
411-
[stringElements setObject:myKadResult.rawOwnerBirthDate forKey:kMyKadBirthDate];
412-
[dict setObject:stringElements forKey:kFields];
413-
[dict setObject:kMyKadResultType forKey:kResultType];
414-
}
415-
416405
- (void)setDictionary:(NSMutableDictionary *)dict withPdf417Result:(PPPdf417RecognizerResult *)pdf417Result {
417406
[dict setObject:[pdf417Result getAllStringElements] forKey:kFields];
418407
[dict setObject:kPDF417ResultType forKey:kResultType];
@@ -460,15 +449,6 @@ - (void)returnResults:(NSArray *)results{
460449

461450
[resultArray addObject:dict];
462451
}
463-
464-
if ([result isKindOfClass:[PPMyKadRecognizerResult class]]) {
465-
PPMyKadRecognizerResult *myKadDecoderResult = (PPMyKadRecognizerResult *)result;
466-
467-
NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
468-
[self setDictionary:dict withMyKadRecognizerResult:myKadDecoderResult];
469-
470-
[resultArray addObject:dict];
471-
}
472452

473453
if ([result isKindOfClass:[PPPdf417RecognizerResult class]]) {
474454
PPPdf417RecognizerResult *pdf417Result = (PPPdf417RecognizerResult *)result;
@@ -620,28 +600,18 @@ - (PPUsdlRecognizerSettings *)usdlRecognizerSettings {
620600
}
621601

622602
- (PPDocumentFaceRecognizerSettings *)documentFaceRecognizerSettings {
623-
624-
PPDocumentFaceRecognizerSettings *documentFaceReconizerSettings = [[PPDocumentFaceRecognizerSettings alloc] init];
603+
604+
PPDocumentFaceRecognizerSettings *documentFaceRecognizerSettings = [[PPDocumentFaceRecognizerSettings alloc] init];
625605

626606
// This property is useful if you're at the same time obtaining Dewarped image metadata, since it allows you to obtain dewarped and
627607
// cropped
628608
// images of MRTD documents. Dewarped images are returned to scanningViewController:didOutputMetadata: callback,
629609
// as PPImageMetadata objects with name @"MRTD"
630610

631-
documentFaceReconizerSettings.returnFaceImage = self.shouldReturnFaceImage;
632-
633-
documentFaceReconizerSettings.returnFullDocument = self.shouldReturnCroppedImage;
634-
635-
return documentFaceReconizerSettings;
636-
}
637-
638-
- (PPMyKadRecognizerSettings *)myKadRecognizerSettings {
639-
640-
PPMyKadRecognizerSettings *myKadRecognizerSettings = [[PPMyKadRecognizerSettings alloc] init];
641-
642-
myKadRecognizerSettings.showFullDocument = self.shouldReturnCroppedImage;
611+
documentFaceRecognizerSettings.returnFaceImage = self.shouldReturnFaceImage;
612+
documentFaceRecognizerSettings.returnFullDocument = self.shouldReturnCroppedImage;
643613

644-
return myKadRecognizerSettings;
614+
return documentFaceRecognizerSettings;
645615
}
646616

647617
- (PPPdf417RecognizerSettings *)pdf417RecognizerSettings {

0 commit comments

Comments
 (0)