Skip to content

Commit f8edb4c

Browse files
author
ci-bot
committed
Updated projects
1 parent 792c490 commit f8edb4c

59 files changed

Lines changed: 656 additions & 433 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎1120-Without License/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ dependencies {
3737
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
3838

3939
implementation 'com.regula.btdevice:api:7.6.+@aar'
40-
implementation 'com.regula.documentreader.core:fullauthrfid:7.7.+@aar'
41-
implementation('com.regula.documentreader:api:7.7.+@aar') {
40+
implementation 'com.regula.documentreader.core:fullauthrfid:8.1.+@aar'
41+
implementation('com.regula.documentreader:api:8.1.+@aar') {
4242
transitive = true;
4343
}
4444
}

‎1120-Without License/app/src/main/java/com/regula/ble_1120/SuccessfulInitActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class SuccessfulInitActivity : AppCompatActivity() {
3131
showScannerBtn!!.isEnabled = false
3232
showScannerBtn!!.setOnClickListener {
3333
val scannerConfig = ScannerConfig.Builder(Scenario.SCENARIO_FULL_AUTH).build()
34-
DocumentReader.Instance().showScanner(
34+
DocumentReader.Instance().startScanner(
3535
this, scannerConfig
3636
) { action, results, error ->
3737
if (action == DocReaderAction.COMPLETE) {

‎Advanced/DocumentReader-Kotlin/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,5 @@ lint/tmp/
8686

8787

8888
app/src/main/assets/Regula/db.dat
89+
*.license
8990
.idea/

‎Advanced/DocumentReader-Kotlin/app/build.gradle‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ android {
2525
viewBinding true
2626
}
2727
namespace 'com.regula.documentreader'
28+
29+
lintOptions {
30+
abortOnError false
31+
ignoreWarnings true
32+
}
2833
}
2934

3035
dependencies {
@@ -39,9 +44,9 @@ dependencies {
3944

4045
implementation 'com.regula.btdevice:api:7.6.+@aar'
4146
//noinspection GradleDynamicVersion
42-
implementation 'com.regula.documentreader.core:fullrfid:7.7.+@aar'
47+
implementation 'com.regula.documentreader.core:fullrfid:8.1.+@aar'
4348
//noinspection GradleDynamicVersion
44-
implementation('com.regula.documentreader:api:7.7.+@aar') {
49+
implementation('com.regula.documentreader:api:8.1.+@aar') {
4550
transitive = true
4651
}
4752

‎Advanced/DocumentReader-Kotlin/app/src/main/assets/buttons.json‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,6 @@
1313
}
1414
}
1515
},
16-
{
17-
"button": {
18-
"title": "Frame",
19-
"alignment": "center",
20-
"tag": 1004,
21-
"margin": {
22-
"start": 10
23-
},
24-
"position": {
25-
"v": 1.6
26-
}
27-
}
28-
},
2916
{
3017
"button": {
3118
"title": "Close",

‎Advanced/DocumentReader-Kotlin/app/src/main/assets/layer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"start": 10
4141
},
4242
"position": {
43-
"v": 0.3
43+
"v": 0.28
4444
}
4545
}
4646
},
@@ -61,7 +61,7 @@
6161
"bottom": 10
6262
},
6363
"position": {
64-
"v": 1.75
64+
"v": 1.65
6565
},
6666
"image": {
6767
"name1": "close",

‎Advanced/DocumentReader-Kotlin/app/src/main/assets/layer_animation.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"fontStyle": "normal",
77
"fontColor": "#FF000000",
88
"fontSize": 16,
9-
"fontName": "Arial",
9+
"fontName": "my_font",
1010
"alignment": "center",
1111
"background": "#AAFFFFFF",
1212
"borderRadius": 8,

‎Advanced/DocumentReader-Kotlin/app/src/main/java/com/regula/documentreader/CommonRecyclerAdapter.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ import com.regula.documentreader.Scan.Companion.ACTION_TYPE_MANUAL_MULTIPAGE_MOD
2121
import com.regula.documentreader.Scan.Companion.ACTION_TYPE_SCANNER
2222
import com.regula.documentreader.api.DocumentReader
2323
import com.regula.documentreader.api.enums.eCheckResult
24-
import com.regula.documentreader.api.params.Functionality
25-
import com.regula.documentreader.api.params.ParamsCustomization
2624
import com.regula.documentreader.databinding.*
2725
import java.io.Serializable
2826
import java.util.*
@@ -165,9 +163,9 @@ class CommonRecyclerAdapter(private val items: List<Base>) :
165163
binding.title.text = base.title
166164
binding.root.setOnClickListener {
167165

168-
Helpers.setCustomization(ParamsCustomization())
166+
Helpers.resetCustomization()
169167
if (scan.resetFunctionality)
170-
Helpers.setFunctionality(Functionality())
168+
Helpers.resetFunctionality()
171169
scan.customize()
172170

173171
when (scan.actionType) {

‎Advanced/DocumentReader-Kotlin/app/src/main/java/com/regula/documentreader/Helpers.kt‎

Lines changed: 12 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ import com.regula.documentreader.api.DocumentReader.Instance
1919
import com.regula.documentreader.api.enums.eRPRM_ResultType
2020
import com.regula.documentreader.api.enums.eRPRM_ResultType.RPRM_RESULT_TYPE_MRZ_OCR_EXTENDED
2121
import com.regula.documentreader.api.enums.eVisualFieldType
22-
import com.regula.documentreader.api.params.Functionality
23-
import com.regula.documentreader.api.params.ParamsCustomization
24-
import com.regula.documentreader.api.params.ProcessParam
2522
import java.io.FileNotFoundException
2623
import java.io.InputStream
2724

@@ -140,99 +137,22 @@ class Helpers {
140137
return Bitmap.createScaledBitmap(bitmap, newWidth, newHeight, false)
141138
}
142139

143-
fun setFunctionality(from: Functionality) {
144-
val to = Instance().functionality().edit()
145-
to.setShowChangeFrameButton(from.isShowChangeFrameButton)
146-
to.setBtDeviceName(from.btDeviceName)
147-
to.setCameraFrame(from.cameraFrame)
148-
to.setDatabaseAutoupdate(from.isDatabaseAutoupdate)
149-
to.setOrientation(from.orientation)
150-
to.setPictureOnBoundsReady(from.isPictureOnBoundsReady)
151-
to.setShowCameraSwitchButton(from.isShowCameraSwitchButton)
152-
to.setShowCaptureButton(from.isShowCaptureButton)
153-
to.setShowCaptureButtonDelayFromDetect(from.showCaptureButtonDelayFromDetect)
154-
to.setShowCaptureButtonDelayFromStart(from.showCaptureButtonDelayFromStart)
155-
to.setShowCloseButton(from.isShowCloseButton)
156-
to.setShowSkipNextPageButton(from.isShowSkipNextPageButton)
157-
to.setShowTorchButton(from.isShowTorchButton)
158-
to.setSkipFocusingFrames(from.isSkipFocusingFrames)
159-
to.setStartDocReaderForResult(from.startDocReaderForResult)
160-
try {
161-
to.setUseAuthenticator(from.isUseAuthenticator)
162-
} catch (e: Exception) {
163-
e.printStackTrace()
164-
}
165-
to.setVideoCaptureMotionControl(from.isVideoCaptureMotionControl)
166-
to.setCaptureMode(from.captureMode)
167-
to.setDisplayMetadata(from.isDisplayMetaData)
168-
to.setCameraSize(from.cameraWidth, from.cameraHeight)
169-
to.setZoomEnabled(from.isZoomEnabled)
170-
to.setZoomFactor(from.zoomFactor)
171-
to.setCameraMode(from.cameraMode)
172-
to.setExcludedCamera2Models(from.excludedCamera2Models)
173-
to.setIsCameraTorchCheckDisabled(from.isCameraTorchCheckDisabled)
174-
to.apply()
140+
fun resetFunctionality() {
141+
val customization = Instance().customization()
142+
val processParam = Instance().processParams()
143+
Instance().resetConfiguration()
144+
Instance().customization().fromJson(customization.toJsonObject())
145+
Instance().processParams().fromJson(processParam.toJSONObject())
175146
}
176147

177-
fun setCustomization(from: ParamsCustomization) {
178-
val to = Instance().customization().edit()
179-
to.setCustomLabelStatus(from.customLabelStatus)
180-
to.setActivityIndicatorColor(from.activityIndicatorColor)
181-
to.setBackgroundMaskAlpha(from.backgroundMaskAlpha)
182-
to.setBorderBackgroundImage(from.borderBackgroundImage)
183-
to.setCameraFrameActiveColor(from.cameraFrameActiveColor)
184-
to.setCameraFrameBorderWidth(from.cameraFrameBorderWidth)
185-
to.setCameraFrameCornerRadius(from.cameraFrameCornerRadius)
186-
to.setCameraFrameDefaultColor(from.cameraFrameDefaultColor)
187-
to.setCameraFrameLandscapeAspectRatio(from.cameraFrameLandscapeAspectRatio)
188-
to.setCameraFrameLineCap(from.cameraFrameLineCap)
189-
to.setCameraFrameLineLength(from.cameraFrameLineLength)
190-
to.setCameraFramePortraitAspectRatio(from.cameraFramePortraitAspectRatio)
191-
to.setCameraFrameShapeType(from.cameraFrameShapeType)
192-
to.setCameraFrameVerticalPositionMultiplier(from.cameraFrameVerticalPositionMultiplier)
193-
to.setCameraFrameOffsetWidth(from.cameraFrameOffsetWidth)
194-
to.setCustomStatusPositionMultiplier(from.customStatusPositionMultiplier)
195-
to.setHelpAnimationImage(from.helpAnimationImageDrawable)
196-
to.setHelpAnimationImageMatrix(from.helpAnimationImageMatrix)
197-
to.setHelpAnimationImageScaleType(from.helpAnimationImageScaleType)
198-
to.setMultipageAnimationBackImage(from.multipageAnimationBackImage)
199-
to.setMultipageAnimationBackImageMatrix(from.multipageAnimationBackImageMatrix)
200-
to.setMultipageAnimationBackImageScaleType(from.multipageAnimationBackImageScaleType)
201-
to.setMultipageAnimationFrontImage(from.multipageAnimationFrontImage)
202-
to.setMultipageAnimationFrontImageMatrix(from.multipageAnimationFrontImageMatrix)
203-
to.setMultipageAnimationFrontImageScaleType(from.multipageAnimationFrontImageScaleType)
204-
to.setMultipageButtonBackgroundColor(from.multipageButtonBackgroundColor)
205-
to.setResultStatus(from.resultStatus)
206-
to.setResultStatusBackgroundColor(from.resultStatusBackgroundColor)
207-
to.setShowResultStatusMessages(from.isShowResultStatusMessages)
208-
to.setResultStatusPositionMultiplier(from.resultStatusPositionMultiplier)
209-
to.setResultStatusTextColor(from.resultStatusTextColor)
210-
to.setResultStatusTextFont(from.resultStatusTextFont)
211-
to.setResultStatusTextSize(from.resultStatusTextSize)
212-
to.setStatus(from.status)
213-
to.setShowBackgroundMask(from.isShowBackgroundMask)
214-
to.setShowHelpAnimation(from.isShowHelpAnimation)
215-
to.setShowNextPageAnimation(from.isShowNextPageAnimation)
216-
to.setShowStatusMessages(from.isShowStatusMessages)
217-
to.setStatusPositionMultiplier(from.statusPositionMultiplier)
218-
to.setStatusTextColor(from.statusTextColor)
219-
to.setStatusTextFont(from.statusTextFont)
220-
to.setStatusTextSize(from.statusTextSize)
221-
to.setTintColor(from.tintColor)
222-
to.setTorchImageOn(from.torchImageOnDrawable)
223-
to.setTorchImageOff(from.torchImageOffDrawable)
224-
to.setCloseButtonImage(from.closeButtonDrawable)
225-
to.setCaptureButtonImage(from.captureButtonDrawable)
226-
to.setChangeFrameCollapseButtonImage(from.changeFrameCollapseButtonDrawable)
227-
to.setChangeFrameExpandButtonImage(from.changeFrameExpandButtonDrawable)
228-
to.setCameraSwitchButtonImage(from.cameraSwitchButtonDrawable)
229-
to.setToolbarSize(from.toolbarSize)
230-
to.apply()
148+
fun resetCustomization() {
149+
val functionality = Instance().functionality()
150+
val processParam = Instance().processParams()
151+
Instance().resetConfiguration()
152+
Instance().functionality().fromJson(functionality.toJsonObject())
153+
Instance().processParams().fromJson(processParam.toJSONObject())
231154
}
232155

233-
fun setProcessParams(from: ProcessParam) =
234-
Instance().processParams().fromJson(from.toJson())
235-
236156
fun getBitmap(
237157
selectedImage: Uri?,
238158
targetWidth: Int,

‎Advanced/DocumentReader-Kotlin/app/src/main/java/com/regula/documentreader/MainActivity.kt‎

Lines changed: 15 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,24 @@ import com.regula.documentreader.Helpers.Companion.getBitmap
3434
import com.regula.documentreader.Scan.Companion.ACTION_TYPE_CUSTOM
3535
import com.regula.documentreader.Scan.Companion.ACTION_TYPE_GALLERY
3636
import com.regula.documentreader.Scan.Companion.ACTION_TYPE_MANUAL_MULTIPAGE_MODE
37-
import com.regula.documentreader.Scan.Companion.ACTION_TYPE_SCANNER
38-
import com.regula.documentreader.SettingsActivity.Companion.functionality
3937
import com.regula.documentreader.SettingsActivity.Companion.isDataEncryptionEnabled
4038
import com.regula.documentreader.SettingsActivity.Companion.isRfidEnabled
4139
import com.regula.documentreader.api.DocumentReader.Instance
4240
import com.regula.documentreader.api.completions.IDocumentReaderCompletion
41+
import com.regula.documentreader.api.completions.rfid.IRfidReaderCompletion
4342
import com.regula.documentreader.api.config.RecognizeConfig
4443
import com.regula.documentreader.api.config.ScannerConfig
4544
import com.regula.documentreader.api.enums.DocReaderAction
4645
import com.regula.documentreader.api.enums.FrameShapeType
4746
import com.regula.documentreader.api.enums.Scenario
48-
import com.regula.documentreader.api.completions.rfid.IRfidReaderCompletion
4947
import com.regula.documentreader.api.enums.Scenario.Scenarios
5048
import com.regula.documentreader.api.enums.eRFID_DataFile_Type
5149
import com.regula.documentreader.api.enums.eRFID_NotificationCodes
52-
import com.regula.documentreader.api.enums.eRPRM_Lights
5350
import com.regula.documentreader.api.errors.DocReaderRfidException
5451
import com.regula.documentreader.api.errors.DocumentReaderException
5552
import com.regula.documentreader.api.internal.parser.DocReaderResultsJsonParser
5653
import com.regula.documentreader.api.params.DocReaderConfig
5754
import com.regula.documentreader.api.params.FaceApiParams
58-
import com.regula.documentreader.api.params.ImageInputData
5955
import com.regula.documentreader.api.results.DocumentReaderNotification
6056
import com.regula.documentreader.api.results.DocumentReaderResults
6157
import com.regula.documentreader.databinding.ActivityMainBinding
@@ -278,6 +274,7 @@ class MainActivity : FragmentActivity(), Serializable {
278274
) {
279275
if (rfidAction == DocReaderAction.COMPLETE
280276
|| rfidAction == DocReaderAction.ERROR
277+
|| rfidAction == DocReaderAction.TIMEOUT
281278
|| rfidAction == DocReaderAction.CANCEL)
282279
displayResults(results_RFIDReader!!)
283280
}
@@ -350,7 +347,7 @@ class MainActivity : FragmentActivity(), Serializable {
350347

351348
fun showScanner() {
352349
val scannerConfig = ScannerConfig.Builder(currentScenario).build()
353-
Instance().showScanner(this@MainActivity, scannerConfig, completion)
350+
Instance().startScanner(this@MainActivity, scannerConfig, completion)
354351
}
355352

356353
fun createImageBrowsingRequest() {
@@ -363,9 +360,7 @@ class MainActivity : FragmentActivity(), Serializable {
363360
private fun getRvData(): List<Base> {
364361
val rvData = mutableListOf<Base>()
365362
rvData.add(Section("Default"))
366-
rvData.add(Scan("Default (showScanner)", resetFunctionality = false) {
367-
Helpers.setFunctionality(functionality)
368-
})
363+
rvData.add(Scan("Default (startScanner)", resetFunctionality = false))
369364
rvData.add(Scan("Gallery (recognizeImage)", ACTION_TYPE_GALLERY))
370365

371366
rvData.add(Section("Custom"))
@@ -418,13 +413,6 @@ class MainActivity : FragmentActivity(), Serializable {
418413
Instance().customization().edit()
419414
.setCaptureButtonImage(drawable(R.drawable.capture, this)).apply()
420415
})
421-
rvData.add(Scan("Custom change frame button") {
422-
Instance().functionality().edit().setShowChangeFrameButton(true).apply()
423-
Instance().customization().edit()
424-
.setChangeFrameExpandButtonImage(drawable(R.drawable.expand, this)).apply()
425-
Instance().customization().edit()
426-
.setChangeFrameCollapseButtonImage(drawable(R.drawable.collapse, this)).apply()
427-
})
428416
rvData.add(Scan("Custom close button") {
429417
Instance().functionality().edit().setShowCloseButton(true).apply()
430418
Instance().customization().edit().setCloseButtonImage(drawable(R.drawable.close, this))
@@ -457,30 +445,6 @@ class MainActivity : FragmentActivity(), Serializable {
457445
Instance().customization().edit().setShowStatusMessages(true).apply()
458446
Instance().customization().edit().setStatusPositionMultiplier(0.5f).apply()
459447
})
460-
rvData.add(Section("Custom result status messages"))
461-
rvData.add(Scan("Custom text") {
462-
Instance().customization().edit().setShowResultStatusMessages(true).apply()
463-
Instance().customization().edit().setResultStatus("Custom result status").apply()
464-
})
465-
rvData.add(Scan("Custom text font") {
466-
Instance().customization().edit().setShowResultStatusMessages(true).apply()
467-
Instance().customization().edit().setResultStatusTextFont(Typeface.DEFAULT_BOLD).apply()
468-
Instance().customization().edit().setResultStatusTextSize(24).apply()
469-
})
470-
rvData.add(Scan("Custom text color") {
471-
Instance().customization().edit().setShowResultStatusMessages(true).apply()
472-
Instance().customization().edit().setResultStatusTextColor(colorString(Color.BLUE))
473-
.apply()
474-
})
475-
rvData.add(Scan("Custom background color") {
476-
Instance().customization().edit().setShowResultStatusMessages(true).apply()
477-
Instance().customization().edit()
478-
.setResultStatusBackgroundColor(colorString(Color.BLUE)).apply()
479-
})
480-
rvData.add(Scan("Custom position") {
481-
Instance().customization().edit().setShowResultStatusMessages(true).apply()
482-
Instance().customization().edit().setResultStatusPositionMultiplier(0.5f).apply()
483-
})
484448
rvData.add(Section("Free custom status"))
485449
rvData.add(Scan("Free text + position") {
486450
val status = SpannableString("Hello, world!")
@@ -525,7 +489,7 @@ class MainActivity : FragmentActivity(), Serializable {
525489
rvData.add(Scan("Custom Liveness animation") {
526490
// NOTE: for a runtime animation change take a look at `showScanner` completion handler.
527491
Instance().customization().edit()
528-
.setLivenessAnimationImage(getDrawable(R.drawable.reg_id_front_mrz)).apply()
492+
.setLivenessAnimationImage(getDrawable(com.regula.documentreader.api.R.drawable.reg_passport_single)).apply()
529493
Instance().customization().edit()
530494
.setLivenessAnimationPositionMultiplier(0.4f).apply()
531495
Instance().customization().edit()
@@ -541,9 +505,15 @@ class MainActivity : FragmentActivity(), Serializable {
541505
.apply()
542506
})
543507
rvData.add(Scan("Next page button") {
508+
val typeface = ResourcesCompat.getFont(this, R.font.my_font)
544509
Instance().functionality().edit().setShowSkipNextPageButton(true).apply()
545510
Instance().customization().edit()
546-
.setMultipageButtonBackgroundColor(colorString(Color.RED)).apply()
511+
.setMultipageButtonBackgroundColor(colorString(Color.RED))
512+
.setMultipageButtonText("Skip page")
513+
.setMultipageButtonTextColor("#FFFFFF")
514+
.setMultipageButtonTextSize(20)
515+
.setMultipageButtonTextFont(typeface)
516+
.apply()
547517
})
548518
rvData.add(Scan("All visual elements") {
549519
Instance().customization().edit().setTintColor(colorString(Color.BLUE)).apply()
@@ -559,8 +529,8 @@ class MainActivity : FragmentActivity(), Serializable {
559529
val matrix = Matrix()
560530
Instance().customization().edit()
561531
.setBorderBackgroundImage(drawable(R.drawable.viewfinder, this))
562-
.setBorderBackgroundImageScaleType(ImageView.ScaleType.MATRIX)
563-
.setBorderBackgroundImageMatrix(matrix)
532+
//.setBorderBackgroundImageScaleType(ImageView.ScaleType.MATRIX)
533+
//.setBorderBackgroundImageMatrix(matrix)
564534
.apply()
565535
})
566536

@@ -597,7 +567,7 @@ class MainActivity : FragmentActivity(), Serializable {
597567
.setTitle("Error")
598568
.setMessage("license in assets is missed")
599569
.setPositiveButton(
600-
getString(R.string.strAccessibilityCloseButton)
570+
getString(com.regula.documentreader.api.R.string.strAccessibilityCloseButton)
601571
) { dialog, which ->
602572
finish()
603573
}

0 commit comments

Comments
 (0)