Merge pull request #2 from klippa-app/feature/update-implementation

Upgrade to support newest SDK versions.

README.md

@@ -181,7 +181,8 @@ config.imageMovingMessage = "Too much movement";
 config.model.fileName = "model";
 config.model.modelLabels = "labelmap";
 
-// If you would like to enable automatic capturing of images.
+// If you want to adjust the timer options.
+config.timer.allowed = true
 config.timer.enabled = true;
 config.timer.duration = 1.0;
 
@@ -195,6 +196,12 @@ config.success.message = "Success!";
 // The amount of seconds the preview should be visible for, should be a float.
 config.previewDuration = 1.0;
 
+// To limit the amount of images that can be taken.
+config.imageLimit = 10;
+
+// The message to display when the limit has been reached.
+config.imageLimitReachedMessage = "You have reached the image limit";
+
 ```
 
 ## Android only
@@ -209,12 +216,6 @@ config.storagePath = "/sdcard/scanner";
 // The filename to use for the output images, supports replacement tokens %dateTime% and %randomUUID%.
 config.outputFileName = "KlippaScannerExample-%dateTime%-%randomUUID%";
 
-// To limit the amount of images that can be taken.
-config.imageLimit = 10;
-
-// The message to display when the limit has been reached.
-config.imageLimitReachedMessage = "You have reached the image limit";
-
 // The threshold sensitive the motion detection is. (lower value is higher sensitivity, default 50).
 config.imageMovingSensitivityAndroid = 50;
 ```

android/build.gradle

@@ -2,7 +2,7 @@ group 'com.klippa.scanner.klippa_scanner_sdk'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.5.20'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         jcenter()
@@ -55,6 +55,6 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    def klippaScannerVersion = project.hasProperty('klippaScannerVersion') ? project.klippaScannerVersion : "2.0.3"
+    def klippaScannerVersion = project.hasProperty('klippaScannerVersion') ? project.klippaScannerVersion : "2.0.6"
     implementation "com.klippa:scanner:$klippaScannerVersion"
 }

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

@@ -126,6 +126,10 @@ class KlippaScannerSdkPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, P
         KlippaScanner.model.modelLabels = call.argument<String>("Model.modelLabels")!!
       }
 
+      if (call.hasArgument("Timer.allowed")) {
+        KlippaScanner.menu.allowTimer = call.argument<Boolean>("Timer.allowed")!!
+      }
+
       if (call.hasArgument("Timer.enabled")) {
         KlippaScanner.menu.isTimerEnabled = call.argument<Boolean>("Timer.enabled")!!
       }
@@ -159,8 +163,8 @@ class KlippaScannerSdkPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, P
         KlippaScanner.shutterButton.allowShutterButton = call.argument<Boolean>("ShutterButton.allowshutterButton")!!
       }
 
-      if (call.hasArgument("ShutterButton.hideShutterbutton")) {
-        KlippaScanner.shutterButton.hideShutterButton = call.argument<Boolean>("ShutterButton.hideShutterbutton")!!
+      if (call.hasArgument("ShutterButton.hideShutterButton")) {
+        KlippaScanner.shutterButton.hideShutterButton = call.argument<Boolean>("ShutterButton.hideShutterButton")!!
       }
 
       if (call.hasArgument("StoragePath")) {
@@ -215,19 +219,37 @@ class KlippaScannerSdkPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, P
       val receivedData = data ?: return false
       val extras = receivedData.extras ?: return false
 
-      val images: ArrayList<Image> = extras.getParcelableArrayList<Image>(KlippaScanner.IMAGES) as ArrayList<Image>
-      Toast.makeText(context, "Result was " + images.size + " images", Toast.LENGTH_LONG).show()
+      val receivedImages: ArrayList<Image> = extras.getParcelableArrayList<Image>(KlippaScanner.IMAGES) as ArrayList<Image>
+
+      val images: MutableList<Map<String, String>> = mutableListOf()
+
+      for (image in receivedImages) {
+        val imageDict = mapOf("Filepath" to image.filePath)
+        images.add(imageDict)
+      }
+
+      val multipleDocuments: Boolean = extras.getBoolean(KlippaScanner.CREATE_MULTIPLE_RECEIPTS)
+      val cropEnabled: Boolean = extras.getBoolean(KlippaScanner.CROP)
+      val timerEnabled: Boolean = extras.getBoolean(KlippaScanner.TIMER_ENABLED)
+
+      val resultDict = mapOf(
+        "Images" to images,
+        "MultipleDocuments" to multipleDocuments, 
+        "Crop" to cropEnabled, 
+        "TimerEnabled" to timerEnabled)
+
+      resultHandler?.success(resultDict)
+      resultHandler = null
       return true
     } else if (requestCode == this.SESSION_REQUEST_CODE && resultCode == Activity.RESULT_CANCELED) {
       var error: String? = null
       if (data != null) {
         error = data.getStringExtra(KlippaScanner.ERROR)
       }
       if (error != null) {
-        Toast.makeText(context, "Scanner was canceled with error: $error", Toast.LENGTH_LONG).show()
-        println(error)
+        resultHandler?.error(E_CANCELED, "Scanner was canceled with error: $error", null)
       } else {
-        Toast.makeText(context, "Scanner was canceled", Toast.LENGTH_LONG).show()
+        resultHandler?.error(E_CANCELED, "Scanner was canceled", null)
       }
       return false
     }

example/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.5.20'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         jcenter()
@@ -25,7 +25,7 @@ allprojects {
         maven { url "https://jitpack.io/" }
     }
     project.ext {
-        klippaScannerVersion = "2.0.3"
+        klippaScannerVersion = "2.0.6"
     }
 }
 

ios/.sdk_version

@@ -1 +1 @@
-0.4.7
+0.4.10

ios/Classes/SwiftKlippaScannerSdkPlugin.swift

@@ -73,6 +73,10 @@ public class SwiftKlippaScannerSdkPlugin: NSObject, FlutterPlugin, ImageScannerC
             KlippaScanner.setup.previewDuration = previewDuration as? Double ?? 0
         }
 
+        if let isTimerAllowed = builderArgs?["Timer.allowed"] {
+            KlippaScanner.setup.allowTimer = isTimerAllowed as? Bool ?? false
+        }
+
         if let isTimerEnabled = builderArgs?["Timer.enabled"] {
             KlippaScanner.setup.isTimerEnabled = isTimerEnabled as? Bool ?? false
         }
@@ -95,7 +99,7 @@ public class SwiftKlippaScannerSdkPlugin: NSObject, FlutterPlugin, ImageScannerC
         }
 
         if let allowShutterButton = builderArgs?["ShutterButton.allowShutterButton"] {
-            if let hideShutterButton = builderArgs?["ShutterButton.hideShutterbutton"] {
+            if let hideShutterButton = builderArgs?["ShutterButton.hideShutterButton"] {
                KlippaScanner.setup.set(allowShutterButton: allowShutterButton as? Bool ?? true, hideShutterButton: hideShutterButton as? Bool ?? false)
             }
         }
@@ -107,6 +111,10 @@ public class SwiftKlippaScannerSdkPlugin: NSObject, FlutterPlugin, ImageScannerC
         if let imageTooDarkMessage = builderArgs?["ImageTooDarkMessage"] {
             KlippaScanner.setup.imageTooDarkMessage = imageTooDarkMessage  as? String ?? ""
         }
+
+        if let imageLimitReachedMessage = builderArgs?["ImageLimitReachedMessage"] {
+            KlippaScanner.setup.imageLimitReachedMessage = imageLimitReachedMessage  as? String ?? ""
+        }
 
         if let primaryColor = builderArgs?["PrimaryColor"] {
             let color = primaryColor as? String ?? ""
@@ -164,6 +172,10 @@ public class SwiftKlippaScannerSdkPlugin: NSObject, FlutterPlugin, ImageScannerC
             KlippaScanner.setup.storeImagesToCameraRoll = storeImagesToCameraRoll as? Bool ?? true
         }
 
+        if let imageLimit = builderArgs?["ImageLimit"] {
+            KlippaScanner.setup.imageLimit = imageLimit as? Int ?? 0
+        }
+
         let rootViewController = UIApplication.shared.windows.last!.rootViewController!
 
         let modelFile = builderArgs?["Model.fileName"] as? String ?? ""
@@ -205,7 +217,9 @@ public class SwiftKlippaScannerSdkPlugin: NSObject, FlutterPlugin, ImageScannerC
 
         let resultDict = [
             "Images" : images,
-            "MultipleDocuments" : result.multipleDocumentsModeEnabled
+            "MultipleDocuments" : result.multipleDocumentsModeEnabled,
+            "Crop": result.cropEnabled,
+            "TimerEnabled" : result.timerEnabled
         ] as [String : Any]
 
         resultHandler!(resultDict)

ios/klippa_scanner_sdk.podspec

@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'klippa_scanner_sdk'
-  s.version          = '0.0.1'
+  s.version          = '0.0.2'
   s.summary          = 'Allows you to do document scanning with the Klippa Scanner SDK from Flutter apps.'
   s.description      = <<-DESC
 Allows you to do document scanning with the Klippa Scanner SDK from Flutter apps.