Merge pull request #29 from klippa-app/development

Development

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.4
+
+* Bumped Android to 4.0.6
+* Bumped iOS to 2.0.5
+* Added `userShouldAcceptResultToContinue`.
+
 ## 1.0.3
 
 * Bumped Android to 4.0.5

README.md

@@ -207,6 +207,9 @@ config.userCanPickMediaFromStorage = true;
 // Whether the next button in the bottom right of the scanner screen goes to the review screen instead of finishing the session.
 config.shouldGoToReviewScreenOnFinishPressed = true;
 
+// Whether the user must confirm the taken photo before the SDK continues.
+config.userShouldAcceptResultToContinue = false;
+
 // What the default color conversion will be (grayscale, original, enhanced).
 config.defaultColor = DefaultColor.original;
 

android/build.gradle

@@ -77,7 +77,7 @@ android {
 }
 
 dependencies {
-    def fallbackKlippaScannerVersion = "4.0.5"
+    def fallbackKlippaScannerVersion = "4.0.6"
     def klippaScannerVersion = project.hasProperty('klippaScannerVersion') ? project.klippaScannerVersion : fallbackKlippaScannerVersion
     implementation "com.klippa:scanner:$klippaScannerVersion"
 }

android/src/main/kotlin/com/klippa/scanner/klippa_scanner_sdk/KlippaScannerSdkPlugin.kt

@@ -192,6 +192,10 @@ class KlippaScannerSdkPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, P
                 scannerSession.menu.shouldGoToReviewScreenWhenImageLimitReached = it
             }
 
+            call.argument<Boolean>("UserShouldAcceptResultToContinue")?.let {
+                scannerSession.menu.userShouldAcceptResultToContinue = it
+            }
+
             call.argument<Boolean>("UserCanRotateImage")?.let {
                 scannerSession.menu.userCanRotateImage = it
             }
@@ -284,6 +288,10 @@ class KlippaScannerSdkPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, P
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
+        if (requestCode != REQUEST_CODE) {
+            return false
+        }
+
         val reason = ScannerFinishedReason.mapResultCode(resultCode)
 
         when (reason) {

ios/Classes/SwiftKlippaScannerSdkPlugin.swift

@@ -195,6 +195,10 @@ public class SwiftKlippaScannerSdkPlugin: NSObject, FlutterPlugin, KlippaScanner
             builder.klippaMenu.shouldGoToReviewScreenWhenImageLimitReached = shouldGoToReviewScreenWhenImageLimitReached
         }
 
+        if let userShouldAcceptResultToContinue = builderArgs?["UserShouldAcceptResultToContinue"] as? Bool {
+            builder.klippaMenu.userShouldAcceptResultToContinue = userShouldAcceptResultToContinue
+        }
+
         if let userCanRotateImage = builderArgs?["UserCanRotateImage"] as? Bool {
             builder.klippaMenu.userCanRotateImage = userCanRotateImage
         }

ios/sdk_version

@@ -1 +1 @@
-2.0.4
+2.0.5

lib/klippa_scanner_sdk.dart

@@ -112,6 +112,9 @@ class CameraConfig {
   /// Whether to go to the Review Screen once the image limit has been reached. (default false)
   bool? shouldGoToReviewScreenWhenImageLimitReached;
 
+  /// Whether the user must confirm the taken photo before the SDK continues. (default false)
+  bool? userShouldAcceptResultToContinue;
+
   /// Whether to hide or show the rotate button in the Review Screen. (default shown/true)
   bool? userCanRotateImage;
 
@@ -485,6 +488,11 @@ class KlippaScannerSdk {
           config.shouldGoToReviewScreenWhenImageLimitReached;
     }
 
+    if (config.userShouldAcceptResultToContinue != null) {
+      parameters["UserShouldAcceptResultToContinue"] =
+          config.userShouldAcceptResultToContinue;
+    }
+
     if (config.primaryColor != null) {
       parameters["PrimaryColor"] =
           KIVHexColor.flutterColorToHex(config.primaryColor!, true);

pubspec.yaml

@@ -1,6 +1,6 @@
 name: klippa_scanner_sdk
 description: Allows you to do document scanning with the Klippa Scanner SDK from Flutter apps.
-version: 1.0.3
+version: 1.0.4
 homepage: https://github.com/klippa-app/flutter-klippa-scanner-sdk
 
 environment: