Skip to content

Commit 4e5002a

Browse files
committed
Added data encryption mode, updated to the SDK v5.6
1 parent 3823184 commit 4e5002a

18 files changed

Lines changed: 124 additions & 239 deletions

File tree

Samples/Advanced/DocumentReader-Kotlin/.idea/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

Samples/Advanced/DocumentReader-Kotlin/.idea/codeStyles/Project.xml

Lines changed: 0 additions & 139 deletions
This file was deleted.

Samples/Advanced/DocumentReader-Kotlin/.idea/codeStyles/codeStyleConfig.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

Samples/Advanced/DocumentReader-Kotlin/.idea/compiler.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

Samples/Advanced/DocumentReader-Kotlin/.idea/jarRepositories.xml

Lines changed: 0 additions & 30 deletions
This file was deleted.

Samples/Advanced/DocumentReader-Kotlin/.idea/misc.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ android {
4747

4848
dependencies {
4949
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
50-
implementation 'androidx.core:core-ktx:1.3.2'
51-
implementation 'androidx.appcompat:appcompat:1.2.0'
50+
implementation 'androidx.core:core-ktx:1.5.0'
51+
implementation 'androidx.appcompat:appcompat:1.3.0'
5252
implementation 'com.google.android.material:material:1.3.0'
5353
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
5454
implementation 'androidx.preference:preference-ktx:1.1.1'
@@ -60,14 +60,16 @@ dependencies {
6060
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
6161

6262
//noinspection GradleDynamicVersion
63-
implementation 'com.regula.documentreader.core:fullrfid:5.5.+@aar'
63+
implementation 'com.regula.documentreader.core:fullrfid:5.6.+@aar'
6464
//noinspection GradleDynamicVersion
65-
implementation('com.regula.documentreader:api:5.5.+@aar') {
65+
implementation('com.regula.documentreader:api:5.6.+@aar') {
6666
transitive = true
6767
}
6868

6969
implementation "androidx.recyclerview:recyclerview:1.2.0"
7070
implementation "com.google.android.material:material:1.3.0"
7171
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
72-
implementation 'com.google.android.material:material:1.4.0-alpha02'
72+
implementation 'com.google.android.material:material:1.4.0-beta01'
73+
74+
implementation 'com.github.kittinunf.fuel:fuel:2.3.1'
7375
}
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<lint>
3+
<issue id="IconLauncherShape">
4+
<ignore path="src/main/res/drawable/r_icon.png" />
5+
</issue>
36
<issue id="IconLocation">
47
<ignore path="src/main/res/drawable/big_close.png" />
58
<ignore path="src/main/res/drawable/camera.png" />
@@ -8,13 +11,17 @@
811
<ignore path="src/main/res/drawable/collapse.png" />
912
<ignore path="src/main/res/drawable/credit_card.png" />
1013
<ignore path="src/main/res/drawable/expand.png" />
14+
<ignore path="src/main/res/drawable/info_barcode.png" />
15+
<ignore path="src/main/res/drawable/info_mrz.png" />
16+
<ignore path="src/main/res/drawable/info_viz.png" />
1117
<ignore path="src/main/res/drawable/light_off.png" />
1218
<ignore path="src/main/res/drawable/light_off.png" />
1319
<ignore path="src/main/res/drawable/light_off.png" />
1420
<ignore path="src/main/res/drawable/light_off.png" />
1521
<ignore path="src/main/res/drawable/light_on.png" />
1622
<ignore path="src/main/res/drawable/one.png" />
23+
<ignore path="src/main/res/drawable/r_icon.png" />
1724
<ignore path="src/main/res/drawable/two.png" />
1825
<ignore path="src/main/res/drawable/viewfinder.png" />
1926
</issue>
20-
</lint>
27+
</lint>

Samples/Advanced/DocumentReader-Kotlin/app/src/main/AndroidManifest.xml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,22 @@
1616
<activity
1717
android:name=".DirectResultsActivity"
1818
android:label="@string/title_activity_direct_results"
19-
android:screenOrientation="portrait" />
19+
android:screenOrientation="portrait"
20+
tools:ignore="LockedOrientationActivity" />
2021
<activity
2122
android:name=".ResultsActivity"
2223
android:label="@string/title_activity_results"
23-
android:screenOrientation="portrait" />
24+
android:screenOrientation="portrait"
25+
tools:ignore="LockedOrientationActivity" />
2426
<activity
2527
android:name=".SettingsActivity"
2628
android:label="@string/title_activity_settings"
27-
android:screenOrientation="portrait" />
29+
android:screenOrientation="portrait"
30+
tools:ignore="LockedOrientationActivity" />
2831
<activity
2932
android:name=".MainActivity"
30-
android:screenOrientation="portrait">
33+
android:screenOrientation="portrait"
34+
tools:ignore="LockedOrientationActivity">
3135
<intent-filter>
3236
<action android:name="android.intent.action.MAIN" />
3337
<category android:name="android.intent.category.LAUNCHER" />
@@ -36,6 +40,7 @@
3640
<activity
3741
android:name=".CustomRfidActivity"
3842
android:launchMode="singleTask"
39-
android:screenOrientation="portrait" />
43+
android:screenOrientation="portrait"
44+
tools:ignore="LockedOrientationActivity" />
4045
</application>
4146
</manifest>

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ class CommonRecyclerAdapter(private val items: List<Base>) :
107107
scan = base as Scan
108108
binding.title.text = base.title
109109
binding.root.setOnClickListener {
110+
if (scan.actionType == ACTION_TYPE_CUSTOM) return@setOnClickListener
111+
110112
Helpers.setCustomization(ParamsCustomization())
111113
if (scan.resetFunctionality)
112114
Helpers.setFunctionality(Functionality())
@@ -287,7 +289,7 @@ class CommonRecyclerAdapter(private val items: List<Base>) :
287289
class TextResultVH(private val binding: RvTextResultBinding) : VH(binding.root) {
288290
override fun bind(base: Base) {
289291
val textResult = base as TextResult
290-
binding.title.text = textResult.title.toUpperCase(Locale.ROOT)
292+
binding.title.text = textResult.title.uppercase(Locale.ROOT)
291293
binding.value.text = textResult.value
292294
binding.value.setTextColor(textResult.color)
293295
binding.lcid.text = textResult.lcid
@@ -297,15 +299,15 @@ class CommonRecyclerAdapter(private val items: List<Base>) :
297299
class ImageVH(private val binding: RvImageBinding) : VH(binding.root) {
298300
override fun bind(base: Base) {
299301
val image = base as Image
300-
binding.title.text = image.title.toUpperCase(Locale.ROOT)
302+
binding.title.text = image.title.uppercase(Locale.ROOT)
301303
binding.image.setImageBitmap(image.value)
302304
}
303305
}
304306

305307
class StatusVH(private val binding: RvStatusBinding) : VH(binding.root) {
306308
override fun bind(base: Base) {
307309
val status = base as Status
308-
binding.title.text = status.title.toUpperCase(Locale.ROOT)
310+
binding.title.text = status.title.uppercase(Locale.ROOT)
309311
when (status.value) {
310312
0 -> binding.value.setImageResource(R.drawable.reg_ok)
311313
1 -> binding.value.setImageResource(R.drawable.reg_fail)

0 commit comments

Comments
 (0)