Merge pull request #46 from klippa-app/development

Merge `development` into `master`

Author: RobinFarmer

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.10
+
+* Bump iOS to 0.5.3
+
 ## 0.2.9
 
 * Bump Android to 2.1.7

README.md

@@ -174,6 +174,18 @@ KlippaScannerSDK.getCameraPermission().then((authStatus) => {
 
         // The warning message when the camera result is too dark.
         ImageTooDarkMessage: "The image is too dark",
+
+        // What the default color conversion will be (grayscale, original, enhanced).
+        DefaultImageColor: "original",
+
+        // The text inside of the color selection alert dialog button named original.
+        ImageColorOriginalText: "original",
+
+        // The text inside of the color selection alert dialog button named grayscale.
+        ImageColorGrayscaleText: "grayscale",
+  
+        // The text inside of the color selection alert dialog button named enhanced.
+        ImageColorEnhancedText: "enhanced",
 
         // The primary color of the interface, should be a UIColor.
         PrimaryColor: null,
@@ -342,7 +354,7 @@ Add or edit the file `android/app/src/main/res/values/strings.xml`, add the foll
 
 ### iOS
 
-Use the following properties in the config when running `getCameraResult`: `ImageTooBrightMessage`, `ImageTooDarkMessage`, `DeleteButtonText`, `RetakeButtonText`, `CancelButtonText`, `CancelAndDeleteImagesButtonText`, `CancelConfirmationMessage`, `MoveCloserMessage`, `ImageMovingMessage`, `ImageLimitReachedMessage`, `OrientationWarningMessage`.
+Use the following properties in the config when running `getCameraResult`: `ImageTooBrightMessage`, `ImageTooDarkMessage`, `DeleteButtonText`, `RetakeButtonText`, `CancelButtonText`, `CancelAndDeleteImagesButtonText`, `CancelConfirmationMessage`, `MoveCloserMessage`, `ImageMovingMessage`, `ImageLimitReachedMessage`, `OrientationWarningMessage`, `ImageColorOriginalText`, `ImageColorGrayscaleText`, `ImageColorEnhancedText`.
 
 
 ## Important iOS notes

ios/KlippaScannerSDK.m

@@ -62,6 +62,10 @@ @implementation KlippaScannerSDK
         KlippaScanner.setup.isMultipleDocumentsModeEnabled = [[config objectForKey:@"DefaultMultipleDocuments"] boolValue];
     }
 
+    if ([config objectForKey:@"DefaultImageColor"]) {
+        KlippaScanner.setup.defaultImageColor = [config objectForKey:@"DefaultImageColor"];
+    }
+
     if ([config objectForKey:@"DefaultCrop"]) {
         KlippaScanner.setup.isCropEnabled = [[config objectForKey:@"DefaultCrop"] boolValue];
     }
@@ -114,6 +118,18 @@ @implementation KlippaScannerSDK
         KlippaScanner.setup.cancelButtonText = [config objectForKey:@"CancelButtonText"];
     }
 
+    if ([config objectForKey:@"ImageColorOriginalText"]) {
+        KlippaScanner.setup.imageColorOriginalText = [config objectForKey:@"ImageColorOriginalText"];
+    }
+
+    if ([config objectForKey:@"ImageColorGrayscaleText"]) {
+        KlippaScanner.setup.imageColorGrayscaleText = [config objectForKey:@"ImageColorGrayscaleText"];
+    }
+
+    if ([config objectForKey:@"ImageColorEnhancedText"]) {
+        KlippaScanner.setup.imageColorEnhancedText = [config objectForKey:@"ImageColorEnhancedText"];
+    }
+
     if ([config objectForKey:@"CancelAndDeleteImagesButtonText"]) {
         KlippaScanner.setup.cancelAndDeleteImagesButtonText = [config objectForKey:@"CancelAndDeleteImagesButtonText"];
     }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@klippa/react-native-klippa-scanner-sdk",
   "title": "React Native Klippa Scanner SDK",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "Allows you to take pictures with the Klippa Scanner SDK from React Native.",
   "main": "index.js",
   "files": [

types/index.d.ts

@@ -117,8 +117,8 @@ export class CameraConfig {
   // Where to put the image results.
   StoragePath?: string;
 
-  // What the default color conversion will be (grayscale, original).
-  DefaultColor?: 'original' | 'grayscale';
+  // What the default color conversion will be (original, grayscale, enhanced).
+  DefaultColor?: 'original' | 'grayscale' | 'enhanced';
 
   OutputFilename?: string;
 
@@ -136,6 +136,15 @@ export class CameraConfig {
   // The text inside of the cancel button.
   CancelButtonText?: string;
 
+  // The text inside of the color selection alert dialog button named original.
+  ImageColorOriginalText?: string;
+
+  // The text inside of the color selection alert dialog button named grayscale.
+  ImageColorGrayscaleText?: string;
+  
+  // The text inside of the color selection alert dialog button named enhanced.
+  ImageColorEnhancedText?: string;
+
   // The text inside of the cancel alert button.
   CancelAndDeleteImagesButtonText?: string;
 
@@ -148,6 +157,9 @@ export class CameraConfig {
   // The warning message when the camera result is too dark.
   ImageTooDarkMessage?: string;
 
+  // What the default color conversion will be (original, grayscale, enhanced).
+  DefaultImageColor?: 'original' | 'grayscale' | 'enhanced';
+
   // The iOS colors to be configured as RGB Hex. For Android see the readme.
 
   // The primary color of the interface, should be a hex RGB color string.
@@ -200,7 +212,7 @@ export class CameraResult {
   // Android only.
 
   // What color option was used, so you can save it as default.
-  Color?: 'original' | 'grayscale';
+  Color?:  'original' | 'grayscale' | 'enhanced';
 }
 
 export class CameraResultImage {