Release 54.0.0 (#181)

Anyline · Sep 9, 2024 · d4836aa · d4836aa
1 parent 368c80f
commit d4836aa
Show file tree

Hide file tree

Showing 19 changed files with 80 additions and 688 deletions.
diff --git a/example/RNExampleApp/android/app/build.gradle b/example/RNExampleApp/android/app/build.gradle
@@ -87,7 +87,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 5
-        versionName "53.3.0"
+        versionName "54.0.0"
         multiDexEnabled true
 
         buildConfigField("boolean", "REACT_NATIVE_UNSTABLE_USE_RUNTIME_SCHEDULER_ALWAYS", (findProperty("reactNative.unstable_useRuntimeSchedulerAlways") ?: true).toString())

diff --git a/example/RNExampleApp/config/NFCMRZConfig.js b/example/RNExampleApp/config/NFCMRZConfig.js
diff --git a/example/RNExampleApp/ios/RNExampleApp.xcodeproj/project.pbxproj b/example/RNExampleApp/ios/RNExampleApp.xcodeproj/project.pbxproj
@@ -272,7 +272,7 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-RNExampleApp/Pods-RNExampleApp-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-				"${PODS_ROOT}/Anyline/AnylineSDK_iOS_53.3.0/Framework/AnylineResources.bundle",
+				"${PODS_ROOT}/Anyline/AnylineSDK_iOS_54.0.0/Framework/AnylineResources.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
@@ -347,7 +347,7 @@
 				INFOPLIST_FILE = RNExampleApp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 53.3.0;
+				MARKETING_VERSION = 54.0.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -380,7 +380,7 @@
 				INFOPLIST_FILE = RNExampleApp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 53.3.0;
+				MARKETING_VERSION = 54.0.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/example/RNExampleApp/ios/RNExampleApp/Info.plist b/example/RNExampleApp/ios/RNExampleApp/Info.plist
@@ -26,8 +26,6 @@
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>NFCReaderUsageDescription</key>
-	<string>Please allow NFC access to read passports</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
@@ -59,9 +57,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>com.apple.developer.nfc.readersession.iso7816.select-identifiers</key>
-	<array>
-		<string>A0000002471001</string>
-	</array>
 </dict>
 </plist>
diff --git a/example/RNExampleApp/ios/RNExampleApp/RNExampleApp.entitlements b/example/RNExampleApp/ios/RNExampleApp/RNExampleApp.entitlements
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
-    <key>aps-environment</key>
-    <string>development</string>
-    <key>com.apple.developer.nfc.readersession.formats</key>
-    <array>
-      <string>TAG</string>
-      <string>NDEF</string>
-    </array>
-  </dict>
-</plist>
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
+</plist>
diff --git a/example/RNExampleApp/package.json b/example/RNExampleApp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-example-app",
-  "version": "53.3.0",
+  "version": "54.0.0",
   "private": true,
   "scripts": {
     "initProject": "yarn add expo && yarn add ../../plugin",

diff --git a/example/RNExampleApp/src/Overview.js b/example/RNExampleApp/src/Overview.js
@@ -2,10 +2,17 @@
  * Created by jonas on 14.03.17.
  */
 import React from 'react';
+import PropTypes from 'prop-types';
 import { Button, Platform, StyleSheet, Text, View, ScrollView } from 'react-native';
 
 export default function Overview({ updateAnyline, checkCameraPermissionAndOpen, disabled }) {
 
+  Overview.propTypes = {
+    updateAnyline: PropTypes.func.isRequired,
+    checkCameraPermissionAndOpen: PropTypes.func.isRequired,
+    disabled: PropTypes.bool.isRequired
+  };
+
   const platformPermissionCheck = (Platform.OS === 'android') ? checkCameraPermissionAndOpen : updateAnyline;
 
   const iOS = Platform.OS === 'ios';
@@ -83,16 +90,6 @@ export default function Overview({ updateAnyline, checkCameraPermissionAndOpen,
           }} />
       </View>
 
-      {iOS &&
-        <View style={styles.buttons}>
-          <Button style={styles.buttons} title={'NFC+MRZ'} color="#0099FF"
-            disabled={disabled}
-            onPress={() => {
-              platformPermissionCheck('NFC+MRZ')
-            }} />
-        </View>
-      }
-
       <View style={styles.buttons}>
         <Button style={styles.buttons} title={'PDF 417 (AAMVA)'} color="#0099FF"
           disabled={disabled}

diff --git a/example/RNExampleApp/src/Result.js b/example/RNExampleApp/src/Result.js
@@ -12,6 +12,7 @@ import {
   Platform,
   TextInput,
 } from 'react-native';
+import PropTypes from 'prop-types';
 import AnylineOCR from 'anyline-ocr-react-native-module';
 
 const withoutImagePaths = value =>
@@ -26,6 +27,15 @@ export default function Result({
   title = false,
 }) {
 
+  Result.propTypes = {
+    result: PropTypes.object.isRequired,
+    imagePath: PropTypes.string.isRequired,
+    fullImagePath: PropTypes.string.isRequired,
+    emptyResult: PropTypes.func.isRequired,
+    hasBackButton: PropTypes.bool.isRequired,
+    title: PropTypes.any.isRequired
+  };
+
   const [correctedResult, setCorrectedResult] = useState('');
   const [responseText, setResponseText] = useState('');
 

diff --git a/example/RNExampleApp/src/index.js b/example/RNExampleApp/src/index.js
@@ -19,7 +19,6 @@ import Overview from './Overview';
 import BarcodeConfig from '../config/BarcodeConfig';
 import BarcodePDF417Config from '../config/Barcode_PDF417Config';
 import MRZConfig from '../config/MRZConfig';
-import NFCMRZConfig from '../config/NFCMRZConfig';
 import UniversalIdConfig from '../config/UniversalIdConfig';
 import ArabicIdConfig from '../config/ArabicIdConfig';
 import CyrillicIdConfig from '../config/CyrillicIdConfig';
@@ -198,9 +197,6 @@ class Anyline extends Component {
       case 'CYRILLIC_ID':
         config = CyrillicIdConfig;
         break;
-      case 'NFC+MRZ':
-        config = NFCMRZConfig;
-        break;
       case 'VRC':
         config = VRCConfig;
         break;

diff --git a/plugin/android/build.gradle b/plugin/android/build.gradle
@@ -61,7 +61,7 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'io.anyline:anylinesdk:53.3.0'
+    implementation 'io.anyline:anylinesdk:54.0.0'
     implementation "com.facebook.react:react-native:+"
     implementation("com.google.android.material:material:1.9.0")
     implementation 'androidx.multidex:multidex:2.0.1'

diff --git a/plugin/android/src/main/java/com/anyline/reactnative/ScanActivity.java b/plugin/android/src/main/java/com/anyline/reactnative/ScanActivity.java
@@ -377,7 +377,7 @@ private JSONObject getResultWithImagePath(ScanResult scanResult) {
             resultObject.put("fullImagePath", fullImagePath);
             resultObject.put("imagePath", cutoutImagePath);
         } catch (Exception e) {
-            e.printStackTrace();
+            finishWithError("Error save scan image: " + e.getMessage());
         }
         return resultObject;
     }

diff --git a/plugin/ios/ALJsonUIConfiguration.m b/plugin/ios/ALJsonUIConfiguration.m
@@ -208,6 +208,9 @@ + (ALButtonType)stringToButtonType:(NSString *)str {
 }
 
 + (UIColor *)colorFromHexString:(NSString *)hexString {
+    if (!hexString) {
+        return nil;
+    }
     unsigned rgbValue = 0;
     NSScanner *scanner = [NSScanner scannerWithString:hexString];
     // [scanner setScanLocation:1]; // bypass '#' character

diff --git a/plugin/ios/ALNFCScanViewController.h b/plugin/ios/ALNFCScanViewController.h