Skip to content

Commit 8759e94

Browse files
authored
Merge pull request #81 from klippa-app/development
Development
2 parents d519937 + f44e26a commit 8759e94

File tree

8 files changed

+27
-3
lines changed

8 files changed

+27
-3
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 1.0.2
2+
3+
* Bumped Android to 4.0.6
4+
* Bumped iOS to 2.0.5
5+
* Added `UserShouldAcceptResultToContinue`.
6+
17
## 1.0.1
28

39
* Bumped Android to 4.0.5

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@ KlippaScannerSDK.getCameraPermission().then((authStatus) => {
154154
// Whether to go to the Review Screen once the image limit has been reached. (default false)
155155
ShouldGoToReviewScreenWhenImageLimitReached: false,
156156

157+
// Whether the user must confirm the taken photo before the SDK continues.
158+
UserShouldAcceptResultToContinue: false,
159+
157160
// Whether to hide or show the rotate button in the Review Screen. (default shown/true)
158161
UserCanRotateImage: true,
159162

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ repositories {
8888
}
8989

9090
dependencies {
91-
def fallbackKlippaScannerVersion = "4.0.5"
91+
def fallbackKlippaScannerVersion = "4.0.6"
9292
def klippaScannerVersion = project.hasProperty('klippaScannerVersion') ? project.klippaScannerVersion : fallbackKlippaScannerVersion
9393

9494
//noinspection GradleDynamicVersion

android/src/main/java/com/klippa/reactscanner/KlippaScannerSDKModule.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,20 @@ class KlippaScannerSDKModule(
183183
scannerSession.menu.shouldGoToReviewScreenWhenImageLimitReached =
184184
config.getBoolean("ShouldGoToReviewScreenWhenImageLimitReached")
185185
}
186+
187+
if (config.hasKey("UserShouldAcceptResultToContinue")) {
188+
scannerSession.menu.userShouldAcceptResultToContinue =
189+
config.getBoolean("UserShouldAcceptResultToContinue")
190+
}
191+
186192
if (config.hasKey("UserCanRotateImage")) {
187193
scannerSession.menu.userCanRotateImage = config.getBoolean("UserCanRotateImage")
188194
}
195+
189196
if (config.hasKey("UserCanCropManually")) {
190197
scannerSession.menu.userCanCropManually = config.getBoolean("UserCanCropManually")
191198
}
199+
192200
if (config.hasKey("UserCanChangeColorSetting")) {
193201
scannerSession.menu.userCanChangeColorSetting = config.getBoolean("UserCanChangeColorSetting")
194202
}

ios/.sdk_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.4
1+
2.0.5

ios/KlippaScannerSDK.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,10 @@ class KlippaScannerSDK: NSObject {
283283
builder.klippaMenu.shouldGoToReviewScreenWhenImageLimitReached = shouldGoToReviewScreenWhenImageLimitReached
284284
}
285285

286+
if let userShouldAcceptResultToContinue = config["UserShouldAcceptResultToContinue"] as? Bool {
287+
builder.klippaMenu.userShouldAcceptResultToContinue = userShouldAcceptResultToContinue
288+
}
289+
286290
if let isViewFinderEnabled = config["IsViewFinderEnabled"] as? Bool {
287291
builder.klippaMenu.isViewFinderEnabled = isViewFinderEnabled
288292
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@klippa/react-native-klippa-scanner-sdk",
33
"title": "React Native Klippa Scanner SDK",
4-
"version": "1.0.1",
4+
"version": "1.0.2",
55
"description": "Allows you to take pictures with the Klippa Scanner SDK from React Native.",
66
"main": "index.js",
77
"files": [

types/index.d.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ export class CameraConfig {
128128
// Whether the next button in the bottom right of the scanner screen goes to the review screen instead of finishing the session.
129129
ShouldGoToReviewScreenOnFinishPressed: boolean;
130130

131+
// Whether the user must confirm the taken photo before the SDK continues.
132+
UserShouldAcceptResultToContinue: boolean;
133+
131134
// Android options.
132135

133136
// Where to put the image results.

0 commit comments

Comments
 (0)