Skip to content

Commit 057234b

Browse files
KubiriaKubiria
committed
Doc snippets cleanup
1 parent edb7286 commit 057234b

File tree

10 files changed

+18
-24
lines changed

10 files changed

+18
-24
lines changed

‎document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/DocumentDetectionSnippet.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class DocumentDetectionSnippet : AppCompatActivity() {
4040
scanbotSDK.documentApi.createDocument().onSuccess { document ->
4141
getUrisFromGalleryResult(imagePickerResult)
4242
.asSequence() // process images one by one instead of collecting the whole list - less memory consumption
43-
.map { it.toImageRef(contentResolver)?.getOrNull() }
43+
.map { it.toImageRef(contentResolver).getOrNull() }
4444
.forEach { image ->
4545
if (image == null) {
4646
Log.e(

‎document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/DocumentQualityCheckSnippet.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class DocumentQualityCheckSnippet : AppCompatActivity() {
3939
scanbotSDK.documentApi.createDocument().onSuccess { document ->
4040
getUrisFromGalleryResult(imagePickerResult)
4141
.asSequence() // process images one by one instead of collecting the whole list - less memory consumption
42-
.map { it.toImageRef(contentResolver)?.getOrNull() }
42+
.map { it.toImageRef(contentResolver).getOrNull() }
4343
.forEach { image ->
4444
if (image == null) {
4545
Log.e(

‎document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/ImageFilterSnippet.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class ImageFilterSnippet : AppCompatActivity() {
4343
val document = scanbotSDK.documentApi.createDocument()
4444
getUrisFromGalleryResult(imagePickerResult)
4545
.asSequence() // process images one by one instead of collecting the whole list - less memory consumption
46-
.mapNotNull { it.toImageRef(contentResolver)?.getOrNull() }.apply {
46+
.mapNotNull { it.toImageRef(contentResolver).getOrNull() }.apply {
4747
startFiltering(this.toList())
4848
}
4949
}

‎document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/ImageProcessorSnippet.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ImageProcessorSnippet : AppCompatActivity() {
3939
withContext(Dispatchers.Default) {
4040
getUrisFromGalleryResult(imagePickerResult)
4141
.asSequence() // process images one by one instead of collecting the whole list - less memory consumption
42-
.mapNotNull { it.toImageRef(contentResolver)?.getOrNull() }.apply {
42+
.mapNotNull { it.toImageRef(contentResolver).getOrNull() }.apply {
4343
startFiltering(this.toList())
4444
}
4545

‎document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/ImageQualityCheckSnippet.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class ImageQualityCheckSnippet : AppCompatActivity() {
3636
withContext(Dispatchers.Default) {
3737
getUrisFromGalleryResult(imagePickerResult)
3838
.asSequence() // process images one by one instead of collecting the whole list - less memory consumption
39-
.mapNotNull { it.toImageRef(contentResolver)?.getOrNull() }.apply {
39+
.mapNotNull { it.toImageRef(contentResolver).getOrNull() }.apply {
4040
startFiltering(this.toList())
4141
}
4242

‎document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/PdfFromDocumentSnippet.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class PdfFromDocumentSnippet : AppCompatActivity() {
4646
scanbotSDK.documentApi.createDocument().onSuccess { document ->
4747
getUrisFromGalleryResult(imagePickerResult)
4848
.asSequence() // process images one by one instead of collecting the whole list - less memory consumption
49-
.map { it.toImageRef(contentResolver)?.getOrNull() }
49+
.map { it.toImageRef(contentResolver).getOrNull() }
5050
.forEach { bitmap ->
5151
if (bitmap == null) {
5252
Log.e(

‎document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/TiffFromDocumentSnippet.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class TiffFromDocumentSnippet : AppCompatActivity() {
4141
scanbotSDK.documentApi.createDocument().onSuccess { document ->
4242
getUrisFromGalleryResult(imagePickerResult)
4343
.asSequence() // process images one by one instead of collecting the whole list - less memory consumption
44-
.map { it.toImageRef(contentResolver)?.getOrNull() }
44+
.map { it.toImageRef(contentResolver).getOrNull() }
4545
.forEach { image ->
4646
if (image == null) {
4747
Log.e(

‎document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/rtu_ui/StandaloneCropScreenSnippet.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class StandaloneCropScreenSnippet : AppCompatActivity() {
4444
getUrisFromGalleryResult(imagePickerResult)
4545
// Process images one by one instead of collecting the whole list - less memory consumption.
4646
.asSequence()
47-
.map { it.toImageRef(contentResolver)?.getOrNull() }
47+
.map { it.toImageRef(contentResolver).getOrNull() }
4848
.forEach { image ->
4949
if (image == null) {
5050
Log.e(

‎document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/doc_code_snippet/shared/ImageImport.kt‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ package com.example.scanbot.doc_code_snippet.shared
33
import android.app.Activity
44
import android.content.Context
55
import android.content.Intent
6-
import android.graphics.Bitmap
7-
import android.provider.MediaStore
86
import android.view.View
97
import android.widget.Toast
108
import androidx.activity.result.contract.ActivityResultContract
@@ -14,10 +12,12 @@ import kotlinx.coroutines.Dispatchers
1412
import kotlinx.coroutines.launch
1513
import kotlinx.coroutines.withContext
1614
import io.scanbot.sdk.ScanbotSDK
15+
import io.scanbot.sdk.image.ImageRef
1716
import io.scanbot.sdk.usecases.documents.R
17+
import io.scanbot.sdk.util.toImageRef
1818

1919
// @Tag("Import image Contract")
20-
class ImportImageContract(private val context: Context) : ActivityResultContract<Unit, Bitmap?>() {
20+
class ImportImageContract(private val context: Context) : ActivityResultContract<Unit, ImageRef?>() {
2121
override fun createIntent(context: Context, input: Unit): Intent {
2222
// An image is selected from the photo library and document detection is run on it:
2323
val imageIntent = Intent()
@@ -29,14 +29,10 @@ class ImportImageContract(private val context: Context) : ActivityResultContract
2929
return Intent.createChooser(imageIntent, "Select a picture")
3030
}
3131

32-
private fun processGalleryResult(data: Intent): Bitmap? {
33-
val imageUri = data.data
34-
return MediaStore.Images.Media.getBitmap(context.contentResolver, imageUri)
35-
}
36-
37-
override fun parseResult(resultCode: Int, intent: Intent?): Bitmap? {
32+
override fun parseResult(resultCode: Int, intent: Intent?): ImageRef? {
3833
return if (resultCode == Activity.RESULT_OK && intent != null) {
39-
return processGalleryResult(intent)
34+
// use the extension function `Uri.toImageRef(contentResolver)` to create an instance of `ImageRef`
35+
return intent.data?.toImageRef(contentResolver = context.contentResolver)?.getOrNull()
4036
} else {
4137
null
4238
}
@@ -49,7 +45,7 @@ fun galleryImageLauncher(activity: AppCompatActivity) {
4945
activity.apply {
5046
// @Tag("Import image launcher")
5147
val galleryImageLauncher =
52-
this.registerForActivityResult(ImportImageContract(this)) { resultEntity ->
48+
this.registerForActivityResult(ImportImageContract(this)) { resultImage ->
5349
lifecycleScope.launch(Dispatchers.Default) {
5450
val activity = this
5551
val sdk = ScanbotSDK(activity as Context)
@@ -62,10 +58,8 @@ fun galleryImageLauncher(activity: AppCompatActivity) {
6258
).show()
6359
}
6460
} else {
65-
resultEntity?.let { bitmap ->
66-
// Image processing is carried out
67-
// processImage()
68-
}
61+
// Image processing is carried out
62+
// processImage(resultImage)
6963
}
7064
}
7165
}

‎document-scanner-ready-to-use-ui-example/app/src/main/java/com/example/scanbot/main/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class MainActivity : AppCompatActivity() {
6060
scanbotSDK.documentApi.createDocument().onSuccess { document ->
6161
getUrisFromGalleryResult(imagePickerResult)
6262
.asSequence() // process images one by one instead of collecting the whole list - less memory consumption
63-
.map { it.toImageRef(contentResolver)?.getOrNull() }
63+
.map { it.toImageRef(contentResolver).getOrNull() }
6464
.forEach { image ->
6565
if (image == null) {
6666
Log.e(

0 commit comments

Comments
 (0)