anyline-ocr-react-native-module 43.0.0 → 44.1.0

package/android/src/main/res/layout/activity_scan.xml

@@ -18,10 +18,61 @@
         android:padding="40px">
         <ImageView
             android:id="@+id/imageview_change_orientation"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
             android:scaleType="fitStart"
             android:background="@drawable/rotate_screen_background"
             android:src="@drawable/rotate_screen_white" />
     </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/layout_instruction"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:layout_gravity="bottom"
+        android:gravity="bottom"
+        android:layout_marginVertical="30dp"
+        android:paddingBottom="30dp"
+        android:orientation="vertical">
+        <TextView
+            android:id="@+id/textview_instruction"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="bottom|center_horizontal"
+            android:padding="10dp"
+            android:text=""
+            android:textColor="@color/white"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/layout_bright_distance_feedback"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:layout_centerHorizontal="true"
+        android:gravity="center_horizontal"
+        android:paddingTop="100px"
+        android:orientation="vertical">
+        <ImageView
+            android:id="@+id/imageview_bright_distance_feedback"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_marginVertical="5dp" />
+        <TextView
+            android:id="@+id/textview_bright_distance_feedback"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textColor="@color/white"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/imageview_cutout_overlay"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:scaleType="fitStart" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

package/ios/ALJsonUIConfiguration.m

@@ -57,7 +57,9 @@ NSString * const ENABLE_NATIVE_BARCODE = @"nativeBarcodeScanningFormats";
         _labelXPositionOffset = 0.0f;
         _labelYPositionOffset = 0.0f;
 
-        _nativeBarcodeFormats = @[];
+        // (ACO) 20230313
+        // nativeBarcodeFormats = [] would be interpreted as ['ALL']
+        _nativeBarcodeFormats = nil;
 
         if ([dictionary valueForKey:ENABLE_NATIVE_BARCODE]) {
             NSArray<NSString *> *formats = [dictionary valueForKey:ENABLE_NATIVE_BARCODE];

package/ios/ALNFCScanViewController.m

@@ -21,11 +21,6 @@ API_AVAILABLE(ios(13.0))
 // the result from NFC scanning is retained while NFC reading is initiated, and the results aggregated later
 @property (nonatomic, strong) NSMutableDictionary *resultDict;
 
-// TODO: make sure the following use the `options` group in the uiConfig
-// BOOL showingLabel
-// UILabel scannedLabel
-// ALRoundedView
-// Segment
 @property (nonatomic, strong) ALJSONUIConfiguration *uiConfig;
 
 @property (nonatomic, strong) UIView *hintView;
@@ -48,9 +43,6 @@ API_AVAILABLE(ios(13.0))
 
 @property (nonatomic, strong) NSMutableArray<NSDictionary *> *detectedBarcodes;
 
-// not used
-@property (nonatomic, strong) NSString *cropAndTransformErrorMessage;
-
 // JPEG compression quality 0-100
 @property (nonatomic, assign) NSUInteger quality;
 
@@ -71,7 +63,6 @@ API_AVAILABLE(ios(13.0))
         _uiConfig = uiConfig;
         
         self.quality = 90;
-        self.cropAndTransformErrorMessage = @"";
     }
     return self;
 }
@@ -245,7 +236,6 @@ API_AVAILABLE(ios(13.0))
     }
 
     NSObject<ALScanViewPluginBase> *scanViewPluginBase = self.scanView.scanViewPlugin;
-    // TODO: handle this for composites: cancelOnResult = true? dismiss
     if ([scanViewPluginBase isKindOfClass:ALScanViewPlugin.class]) {
         ALScanViewPlugin *scanViewPlugin = (ALScanViewPlugin *)scanViewPluginBase;
         BOOL cancelOnResult = scanViewPlugin.scanPlugin.scanPluginConfig.cancelOnResult;

package/ios/ALPluginHelper.m

@@ -4,7 +4,7 @@
 #import <objc/runtime.h>
 
 // Predefined domain for errors from most AppKit and Foundation APIs.
-NSErrorDomain const ALFlutterDomain = @"ALFlutterDomain";
+NSErrorDomain const ALDefaultDomain = @"ALDefaultErrorDomain";
 
 @implementation ALPluginHelper
 
@@ -51,16 +51,10 @@ NSErrorDomain const ALFlutterDomain = @"ALFlutterDomain";
                                                                                                       uiConfiguration:jsonUIConf
                                                                                                              finished:callback];
         
-        // TODO: should remove these extras
         if ([pluginConf valueForKey:@"quality"]){
             pluginScanViewController.quality = [[pluginConf valueForKey:@"quality"] integerValue];
         }
         
-        if ([pluginConf valueForKey:@"cropAndTransformErrorMessage"]) {
-            NSString *str = [pluginConf objectForKey:@"cropAndTransformErrorMessage"];
-            pluginScanViewController.cropAndTransformErrorMessage = str;
-        }
-
         if (pluginScanViewController) {
             [pluginScanViewController setModalPresentationStyle:UIModalPresentationFullScreen];
             [[[UIApplication sharedApplication] keyWindow].rootViewController presentViewController:pluginScanViewController
@@ -264,21 +258,6 @@ NSErrorDomain const ALFlutterDomain = @"ALFlutterDomain";
 }
 
 #pragma mark - Date Parsing Utils
-//
-//+ (NSString *)stringForDate:(NSDate *)date {
-//    if (!date) {
-//        return nil;
-//    }
-//    
-//    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-//    [dateFormatter setTimeZone:[NSTimeZone timeZoneWithAbbreviation:@"UTC+0:00"]];
-//    [dateFormatter setDateFormat:@"EEE MMM d hh:mm:ss ZZZZ yyyy"];
-//    
-//    //Date will be formatted to string - e.g.: "Fri Jan 11 12:00:00 GMT+0:00 1980"
-//    NSString *dateString = [dateFormatter stringFromDate:date];
-//    
-//    return dateString;
-//}
 
 // MARK: Utilities
 
@@ -321,7 +300,7 @@ NSErrorDomain const ALFlutterDomain = @"ALFlutterDomain";
 }
 
 + (NSError *)errorWithMessage:(NSString *)message {
-    return [NSError errorWithDomain:ALFlutterDomain code:1000 userInfo:@{ NSLocalizedDescriptionKey: message }];
+    return [NSError errorWithDomain:ALDefaultDomain code:1000 userInfo:@{ NSLocalizedDescriptionKey: message }];
 }
 
 // MARK: - Date Utils
@@ -373,5 +352,12 @@ NSErrorDomain const ALFlutterDomain = @"ALFlutterDomain";
     return nil;
 }
 
+// MARK: - Miscellaneous
+
+// actual implementation are in the view controllers
+- (void)segmentChange:(id)segment {}
+
+- (void)doneButtonPressed:(id)doneButton {}
+
 
 @end

package/ios/ALPluginScanViewController.h

@@ -5,8 +5,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface ALPluginScanViewController : UIViewController
 
-@property (nonatomic, strong) NSString *cropAndTransformErrorMessage;
-
 @property (nonatomic, assign) NSUInteger quality;
 
 - (instancetype)initWithLicensekey:(NSString *)licenseKey

package/ios/ALPluginScanViewController.m

@@ -55,7 +55,6 @@
         _uiConfig = JSONUIConfig;
         
         self.quality = 100;
-        self.cropAndTransformErrorMessage = @"";
     }
     return self;
 }

package/ios/AnylineReact.podspec

@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/Anyline/anyline-ocr-react-native-module.git", :tag => "#{s.version}" }
 
   s.source_files  = "*.{h,m}"
-  s.dependency "Anyline", "~> 43.0.0"
+  s.dependency "Anyline", "~> 44.1.0"
   s.dependency "React"
 
-end
+end

package/ios/AnylineSDKPlugin.m

@@ -66,8 +66,7 @@ RCT_EXPORT_METHOD(getSDKVersion:(RCTPromiseResolveBlock)resolve rejecter:(RCTPro
    resolve(AnylineSDK.versionNumber);
 }
 
-
--(void)initView:(NSString *)scanMode {
+- (void)initView:(NSString *)scanMode {
     NSData *data = [self.config dataUsingEncoding:NSUTF8StringEncoding];
     if(!data) {
       [NSException raise:@"Config could not be loaded from disk" format:@"Config could not be loaded from disk"];

package/package.json

@@ -1,6 +1,6 @@
 {
-  "_from": "anyline-ocr-react-native-module@^43.0.0",
-  "_id": "anyline-ocr-react-native-module@^43.0.0",
+  "_from": "anyline-ocr-react-native-module@^44.1.0",
+  "_id": "anyline-ocr-react-native-module@^44.1.0",
   "_inBundle": false,
   "_integrity": "sha512-BGi9zNkSsoxXywDBIqzgBRvKUBniQOJHDKBrozZubKthZNRBAj8Ry5tW0Me0yLXt/fauME//hbC0wsenfPJZqw==",
   "_location": "/anyline-ocr-react-native-module",
@@ -8,19 +8,19 @@
   "_requested": {
     "type": "range",
     "registry": true,
-    "raw": "anyline-ocr-react-native-module@^43.0.0",
+    "raw": "anyline-ocr-react-native-module@^44.1.0",
     "name": "anyline-ocr-react-native-module",
     "escapedName": "anyline-ocr-react-native-module",
-    "rawSpec": "^43.0.0",
+    "rawSpec": "^44.1.0",
     "saveSpec": null,
-    "fetchSpec": "^43.0.0"
+    "fetchSpec": "^44.1.0"
   },
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/anyline-ocr-react-native-module/-/anyline-ocr-react-native-module-43.0.0.tgz",
+  "_resolved": "https://registry.npmjs.org/anyline-ocr-react-native-module/-/anyline-ocr-react-native-module-44.1.0.tgz",
   "_shasum": "bacbcd260cc662244f59393ed81a6edba009b52c",
-  "_spec": "anyline-ocr-react-native-module@^43.0.0",
+  "_spec": "anyline-ocr-react-native-module@^44.1.0",
   "_where": "/Users/amiransari/Projects/anyline-ocr-react-native-module1/example/RNExampleApp",
   "bugs": {
     "url": "https://github.com/Anyline/anyline-ocr-react-native-module/issues"
@@ -47,5 +47,5 @@
     "type": "git",
     "url": "git+https://github.com/Anyline/anyline-ocr-react-native-module.git"
   },
-  "version": "43.0.0"
+  "version": "44.1.0"
 }