MSDKS-424: Fix compatibility with BlinkID

mijo-gracanin · mijo-gracanin · commit 1d9b2291d711 · 2021-09-27T15:22:38.000+02:00
diff --git a/BlinkCard/ios/Classes/BlinkCardFlutterPlugin.h b/BlinkCard/ios/Classes/BlinkCardFlutterPlugin.h
@@ -0,0 +1,5 @@
+#import <Flutter/Flutter.h>
+
+@interface BlinkCardFlutterPlugin : NSObject<FlutterPlugin>
+
+@end
diff --git a/BlinkCard/ios/Classes/BlinkCardFlutterPlugin.m b/BlinkCard/ios/Classes/BlinkCardFlutterPlugin.m
@@ -1,28 +1,28 @@
-#import "MicroblinkFlutterPlugin.h"
+#import "BlinkCardFlutterPlugin.h"
 #import <BlinkCard/BlinkCard.h>
-#import "MicroblinkModule/Overlays/MBOverlayViewControllerDelegate.h"
-#import "MicroblinkModule/Recognizers/MBRecognizerSerializers.h"
-#import "MicroblinkModule/Overlays/MBOverlaySettingsSerializers.h"
-#import "MBSerializationUtils.h"
+#import "MicroblinkModule/Overlays/MBCOverlayViewControllerDelegate.h"
+#import "MicroblinkModule/Recognizers/MBCRecognizerSerializers.h"
+#import "MicroblinkModule/Overlays/MBCOverlaySettingsSerializers.h"
+#import "MBCSerializationUtils.h"
 
-@interface MicroblinkFlutterPlugin () <MBCOverlayViewControllerDelegate>
+@interface BlinkCardFlutterPlugin () <MBCOverlayViewControllerDelegate>
 
 @property (nonatomic, strong) MBCRecognizerCollection *recognizerCollection;
 
 @property (nonatomic, strong) FlutterResult result;
 
 @end
 
-static NSString* const kChannelName = @"microblink_scanner";
+static NSString* const kChannelName = @"blinkcard_scanner";
 static NSString* const kScanWithCameraMethodName = @"scanWithCamera";
 
-@implementation MicroblinkFlutterPlugin
+@implementation BlinkCardFlutterPlugin
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
     FlutterMethodChannel* channel = [FlutterMethodChannel
                                      methodChannelWithName:kChannelName
                                      binaryMessenger:[registrar messenger]];
-    MicroblinkFlutterPlugin* instance = [[MicroblinkFlutterPlugin alloc] init];
+    BlinkCardFlutterPlugin* instance = [[BlinkCardFlutterPlugin alloc] init];
     [registrar addMethodCallDelegate:instance channel:channel];
 }
 
diff --git a/BlinkCard/ios/Classes/MicroblinkFlutterPlugin.h b/BlinkCard/ios/Classes/MicroblinkFlutterPlugin.h
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/MBCBlinkCardSerializationUtils.h b/BlinkCard/ios/Classes/MicroblinkModule/MBCBlinkCardSerializationUtils.h
@@ -1,5 +1,5 @@
 //
-//  MBBlinkIDSerializationUtils.h
+//  MBCBlinkIDSerializationUtils.h
 //  BlinkIdDevDemo
 //
 //  Created by DoDo on 04/06/2018.
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/MBCBlinkCardSerializationUtils.m b/BlinkCard/ios/Classes/MicroblinkModule/MBCBlinkCardSerializationUtils.m
@@ -1,12 +1,12 @@
 //
-//  MBBlinkIDSerializationUtils.m
+//  MBCBlinkIDSerializationUtils.m
 //  BlinkIdDevDemo
 //
 //  Created by DoDo on 04/06/2018.
 //
 
-#import "MBBlinkCardSerializationUtils.h"
-#import "MBSerializationUtils.h"
+#import "MBCBlinkCardSerializationUtils.h"
+#import "MBCSerializationUtils.h"
 
 @implementation MBCBlinkCardSerializationUtils
 
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/MBCCommonSerializationUtils.h b/BlinkCard/ios/Classes/MicroblinkModule/MBCCommonSerializationUtils.h
@@ -1,5 +1,5 @@
 //
-//  MBBlinkIDSerializationUtils.h
+//  MBCBlinkIDSerializationUtils.h
 //  BlinkIdDevDemo
 //
 //  Created by DoDo on 04/06/2018.
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/MBCCommonSerializationUtils.m b/BlinkCard/ios/Classes/MicroblinkModule/MBCCommonSerializationUtils.m
@@ -1,12 +1,12 @@
 //
-//  MBBlinkIDSerializationUtils.m
+//  MBCBlinkIDSerializationUtils.m
 //  BlinkIdDevDemo
 //
 //  Created by DoDo on 04/06/2018.
 //
 
-#import "MBCommonSerializationUtils.h"
-#import "MBSerializationUtils.h"
+#import "MBCCommonSerializationUtils.h"
+#import "MBCSerializationUtils.h"
 
 @implementation MBCCommonSerializationUtils
 
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/MBCSerializationUtils.h b/BlinkCard/ios/Classes/MicroblinkModule/MBCSerializationUtils.h
@@ -1,5 +1,5 @@
 //
-//  MBSerializationUtils.h
+//  MBCSerializationUtils.h
 //  BlinkIdDevDemo
 //
 //  Created by DoDo on 01/06/2018.
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/MBCSerializationUtils.m b/BlinkCard/ios/Classes/MicroblinkModule/MBCSerializationUtils.m
@@ -1,11 +1,11 @@
 //
-//  MBSerializationUtils.m
+//  MBCSerializationUtils.m
 //  BlinkIdDevDemo
 //
 //  Created by DoDo on 01/06/2018.
 //
 
-#import "MBSerializationUtils.h"
+#import "MBCSerializationUtils.h"
 
 @implementation MBCSerializationUtils
 
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Overlays/MBCOverlaySerializationUtils.h b/BlinkCard/ios/Classes/MicroblinkModule/Overlays/MBCOverlaySerializationUtils.h
@@ -1,5 +1,5 @@
 //
-//  MBOverlaySerializationUtils.h
+//  MBCOverlaySerializationUtils.h
 //  MicroblinkModule
 //
 //  Created by DoDo on 08/06/2018.
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Overlays/MBCOverlaySerializationUtils.m b/BlinkCard/ios/Classes/MicroblinkModule/Overlays/MBCOverlaySerializationUtils.m
@@ -1,12 +1,12 @@
 //
-//  MBOverlaySerializationUtils.m
+//  MBCOverlaySerializationUtils.m
 //  MicroblinkModule
 //
 //  Created by DoDo on 08/06/2018.
 //  Copyright © 2018 Jura Skrlec. All rights reserved.
 //
 
-#import "MBOverlaySerializationUtils.h"
+#import "MBCOverlaySerializationUtils.h"
 
 @implementation MBCOverlaySerializationUtils
 
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Overlays/MBCOverlaySettingsSerializers.h b/BlinkCard/ios/Classes/MicroblinkModule/Overlays/MBCOverlaySettingsSerializers.h
@@ -1,11 +1,11 @@
 //
-//  MBOverlaySettingsSerializers.h
+//  MBCOverlaySettingsSerializers.h
 //  BlinkIdDevDemo
 //
 //  Created by DoDo on 04/06/2018.
 //
 
-#import "MBOverlayViewControllerDelegate.h"
+#import "MBCOverlayViewControllerDelegate.h"
 
 #import <BlinkCard/BlinkCard.h>
 
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Overlays/MBCOverlaySettingsSerializers.m b/BlinkCard/ios/Classes/MicroblinkModule/Overlays/MBCOverlaySettingsSerializers.m
@@ -1,14 +1,14 @@
 //
-//  MBOverlaySettingsSerializers.m
+//  MBCOverlaySettingsSerializers.m
 //  BlinkIdDevDemo
 //
 //  Created by DoDo on 04/06/2018.
 //
 
-#import "MBOverlaySettingsSerializers.h"
+#import "MBCOverlaySettingsSerializers.h"
 
-#import "MBOverlayVCCreator.h"
-#import "MBBlinkCardOverlaySettingsSerialization.h"
+#import "MBCOverlayVCCreator.h"
+#import "MBCBlinkCardOverlaySettingsSerialization.h"
 
 @interface MBCOverlaySettingsSerializers ()
 
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Overlays/MBCOverlayVCCreator.h b/BlinkCard/ios/Classes/MicroblinkModule/Overlays/MBCOverlayVCCreator.h
@@ -1,5 +1,5 @@
 //
-//  MBOverlayVCCreator.h
+//  MBCOverlayVCCreator.h
 //  MicroblinkModule
 //
 //  Created by DoDo on 08/06/2018.
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#import "MBOverlayViewControllerDelegate.h"
+#import "MBCOverlayViewControllerDelegate.h"
 
 #import <BlinkCard/BlinkCard.h>
 #import <Foundation/Foundation.h>
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Overlays/MBCOverlayViewControllerDelegate.h b/BlinkCard/ios/Classes/MicroblinkModule/Overlays/MBCOverlayViewControllerDelegate.h
@@ -1,5 +1,5 @@
 //
-//  MBOverlayViewControllerDelegate.h
+//  MBCOverlayViewControllerDelegate.h
 //
 //  Created by DoDo on 01/06/2018.
 //
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Overlays/Serialization/MBCBlinkCardOverlaySettingsSerialization.h b/BlinkCard/ios/Classes/MicroblinkModule/Overlays/Serialization/MBCBlinkCardOverlaySettingsSerialization.h
@@ -1,11 +1,11 @@
 //
-//  MBBlinkCardOverlaySettingsSerialization.h
+//  MBCBlinkCardOverlaySettingsSerialization.h
 //  BlinkIdDevDemo
 //
 //  Created by DoDo on 04/06/2018.
 //
 
-#import "MBOverlayVCCreator.h"
+#import "MBCOverlayVCCreator.h"
 
 #import <Foundation/Foundation.h>
 
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Overlays/Serialization/MBCBlinkCardOverlaySettingsSerialization.m b/BlinkCard/ios/Classes/MicroblinkModule/Overlays/Serialization/MBCBlinkCardOverlaySettingsSerialization.m
@@ -1,12 +1,12 @@
 //
-//  MBBlinkCardOverlaySettingsSerialization.m
+//  MBCBlinkCardOverlaySettingsSerialization.m
 //  BlinkIdDevDemo
 //
 //  Created by DoDo on 04/06/2018.
 //
 
-#import "MBBlinkCardOverlaySettingsSerialization.h"
-#import "MBOverlaySerializationUtils.h"
+#import "MBCBlinkCardOverlaySettingsSerialization.h"
+#import "MBCOverlaySerializationUtils.h"
 
 @interface MBCBlinkCardOverlaySettingsSerialization ()
 
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/MBCRecognizerSerializers.h b/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/MBCRecognizerSerializers.h
@@ -1,4 +1,4 @@
-#import "MBRecognizerWrapper.h"
+#import "MBCRecognizerWrapper.h"
 
 #import <BlinkCard/BlinkCard.h>
 
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/MBCRecognizerSerializers.m b/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/MBCRecognizerSerializers.m
@@ -1,10 +1,10 @@
-#import "MBRecognizerSerializers.h"
+#import "MBCRecognizerSerializers.h"
 
-#import "MBRecognizerWrapper.h"
-#import "MBSuccessFrameGrabberRecognizerWrapper.h"
-#import "MBBlinkCardRecognizerWrapper.h"
-#import "MBLegacyBlinkCardEliteRecognizerWrapper.h"
-#import "MBLegacyBlinkCardRecognizerWrapper.h"
+#import "MBCRecognizerWrapper.h"
+#import "MBCSuccessFrameGrabberRecognizerWrapper.h"
+#import "MBCBlinkCardRecognizerWrapper.h"
+#import "MBCLegacyBlinkCardEliteRecognizerWrapper.h"
+#import "MBCLegacyBlinkCardRecognizerWrapper.h"
 
 @interface MBCRecognizerSerializers ()
 
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/MBCRecognizerWrapper.h b/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/MBCRecognizerWrapper.h
@@ -1,5 +1,5 @@
 //
-//  MBRecognizerWrapper.h
+//  MBCRecognizerWrapper.h
 //  BlinkIdDevDemo
 //
 //  Created by DoDo on 01/06/2018.
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/MBCRecognizerWrapper.m b/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/MBCRecognizerWrapper.m
@@ -1,11 +1,11 @@
 //
-//  MBCRecognizer+MBRecognizerWrapper_m.h
+//  MBCRecognizer+MBCRecognizerWrapper_m.h
 //  BlinkIdDevDemo
 //
 //  Created by DoDo on 01/06/2018.
 //
 
-#import "MBRecognizerWrapper.h"
+#import "MBCRecognizerWrapper.h"
 #import <Foundation/Foundation.h>
 
 @implementation MBCRecognizer (JsonSerialization)
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCBlinkCardRecognizerWrapper.h b/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCBlinkCardRecognizerWrapper.h
@@ -1,4 +1,4 @@
-#import "MBRecognizerWrapper.h"
+#import "MBCRecognizerWrapper.h"
 #import <BlinkCard/BlinkCard.h>
 
 @interface MBCBlinkCardRecognizerCreator : NSObject<MBCRecognizerCreator>
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCBlinkCardRecognizerWrapper.m b/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCBlinkCardRecognizerWrapper.m
@@ -1,7 +1,7 @@
-#import "MBBlinkCardRecognizerWrapper.h"
-#import "MBSerializationUtils.h"
-#import "MBBlinkCardSerializationUtils.h"
-#import "MBCommonSerializationUtils.h"
+#import "MBCBlinkCardRecognizerWrapper.h"
+#import "MBCSerializationUtils.h"
+#import "MBCBlinkCardSerializationUtils.h"
+#import "MBCCommonSerializationUtils.h"
 
 @implementation MBCBlinkCardRecognizerCreator
 
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCLegacyBlinkCardEliteRecognizerWrapper.h b/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCLegacyBlinkCardEliteRecognizerWrapper.h
@@ -1,4 +1,4 @@
-#import "MBRecognizerWrapper.h"
+#import "MBCRecognizerWrapper.h"
 #import <BlinkCard/BlinkCard.h>
 
 @interface MBCLegacyBlinkCardEliteRecognizerCreator : NSObject<MBCRecognizerCreator>
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCLegacyBlinkCardEliteRecognizerWrapper.m b/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCLegacyBlinkCardEliteRecognizerWrapper.m
@@ -1,7 +1,7 @@
-#import "MBLegacyBlinkCardEliteRecognizerWrapper.h"
-#import "MBSerializationUtils.h"
-#import "MBBlinkCardSerializationUtils.h"
-#import "MBCommonSerializationUtils.h"
+#import "MBCLegacyBlinkCardEliteRecognizerWrapper.h"
+#import "MBCSerializationUtils.h"
+#import "MBCBlinkCardSerializationUtils.h"
+#import "MBCCommonSerializationUtils.h"
 
 @implementation MBCLegacyBlinkCardEliteRecognizerCreator
 
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCLegacyBlinkCardRecognizerWrapper.h b/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCLegacyBlinkCardRecognizerWrapper.h
@@ -1,4 +1,4 @@
-#import "MBRecognizerWrapper.h"
+#import "MBCRecognizerWrapper.h"
 #import <BlinkCard/BlinkCard.h>
 
 @interface MBCLegacyBlinkCardRecognizerCreator : NSObject<MBCRecognizerCreator>
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCLegacyBlinkCardRecognizerWrapper.m b/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCLegacyBlinkCardRecognizerWrapper.m
@@ -1,7 +1,7 @@
-#import "MBLegacyBlinkCardRecognizerWrapper.h"
-#import "MBSerializationUtils.h"
-#import "MBBlinkCardSerializationUtils.h"
-#import "MBCommonSerializationUtils.h"
+#import "MBCLegacyBlinkCardRecognizerWrapper.h"
+#import "MBCSerializationUtils.h"
+#import "MBCBlinkCardSerializationUtils.h"
+#import "MBCCommonSerializationUtils.h"
 
 @implementation MBCLegacyBlinkCardRecognizerCreator
 
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCSuccessFrameGrabberRecognizerWrapper.h b/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCSuccessFrameGrabberRecognizerWrapper.h
@@ -1,12 +1,12 @@
 //
-//  MBSuccessFrameGrabberRecognizerWrapper.h
+//  MBCSuccessFrameGrabberRecognizerWrapper.h
 //  MicroblinkModule
 //
 //  Created by DoDo on 15/06/2018.
 //  Copyright © 2018 Jura Skrlec. All rights reserved.
 //
 
-#import "MBRecognizerWrapper.h"
+#import "MBCRecognizerWrapper.h"
 #import <BlinkCard/BlinkCard.h>
 
 @interface MBCSuccessFrameGrabberRecognizerCreator : NSObject<MBCRecognizerCreator>
diff --git a/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCSuccessFrameGrabberRecognizerWrapper.m b/BlinkCard/ios/Classes/MicroblinkModule/Recognizers/Wrappers/MBCSuccessFrameGrabberRecognizerWrapper.m
@@ -1,15 +1,15 @@
 //
-//  MBSuccessFrameGrabberRecognizerWrapper.m
+//  MBCSuccessFrameGrabberRecognizerWrapper.m
 //  MicroblinkModule
 //
 //  Created by DoDo on 15/06/2018.
 //  Copyright © 2018 Jura Skrlec. All rights reserved.
 //
 
-#import "MBSuccessFrameGrabberRecognizerWrapper.h"
+#import "MBCSuccessFrameGrabberRecognizerWrapper.h"
 
-#import "MBRecognizerSerializers.h"
-#import "MBSerializationUtils.h"
+#import "MBCRecognizerSerializers.h"
+#import "MBCSerializationUtils.h"
 
 @implementation MBCSuccessFrameGrabberRecognizerCreator
 
diff --git a/BlinkCard/lib/microblink_scanner.dart b/BlinkCard/lib/microblink_scanner.dart
@@ -11,7 +11,7 @@ export 'package:blinkcard_flutter/types.dart';
 
 class MicroblinkScanner {
 
-  static const MethodChannel _channel = const MethodChannel('microblink_scanner');
+  static const MethodChannel _channel = const MethodChannel('blinkcard_scanner');
 
   static const String METHOD_SCAN_WITH_CAMERA = 'scanWithCamera';
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +#import <Flutter/Flutter.h>
++
 +@interface BlinkCardFlutterPlugin : NSObject<FlutterPlugin>
++
 +@end