Skip to content

Commit e824c64

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

146 files changed

Lines changed: 1576 additions & 371 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: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ plugins {
44
}
55

66
android {
7-
compileSdk 34
7+
compileSdk 36
88

99
defaultConfig {
1010
applicationId "com.regula.documentreader"
1111
minSdk 21
12-
targetSdk 34
12+
targetSdk 36
1313
versionCode 1
1414
versionName "1.0"
1515
}
@@ -21,12 +21,13 @@ android {
2121
}
2222
}
2323
compileOptions {
24-
sourceCompatibility JavaVersion.VERSION_1_8
25-
targetCompatibility JavaVersion.VERSION_1_8
24+
sourceCompatibility JavaVersion.VERSION_17
25+
targetCompatibility JavaVersion.VERSION_17
2626
}
2727
kotlinOptions {
28-
jvmTarget = '1.8'
28+
jvmTarget = '17'
2929
}
30+
namespace 'com.regula.ble_1120'
3031
}
3132

3233
dependencies {
@@ -37,8 +38,8 @@ dependencies {
3738
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
3839

3940
implementation 'com.regula.btdevice:api:7.6.+@aar'
40-
implementation 'com.regula.documentreader.core:fullauthrfid:8.1.+@aar'
41-
implementation('com.regula.documentreader:api:8.1.+@aar') {
41+
implementation 'com.regula.documentreader.core:fullauthrfid:8.2.+@aar'
42+
implementation('com.regula.documentreader:api:8.2.+@aar') {
4243
transitive = true;
4344
}
4445
}

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@ import android.os.Message
1111
import android.view.View
1212
import android.widget.Button
1313
import android.widget.EditText
14+
import android.widget.LinearLayout
1415
import android.widget.Toast
16+
import androidx.annotation.LayoutRes
1517
import androidx.appcompat.app.AlertDialog
18+
import androidx.core.view.ViewCompat
19+
import androidx.core.view.WindowInsetsCompat
1620
import com.regula.ble_1120.util.BluetoothUtil
1721
import com.regula.ble_1120.util.PermissionUtil
1822
import com.regula.ble_1120.util.PermissionUtil.Companion.respondToPermissionRequest
@@ -183,4 +187,29 @@ class MainActivity : AppCompatActivity() {
183187
initializeReader()
184188
}
185189
}
190+
191+
override fun setContentView(@LayoutRes layoutResID: Int) {
192+
super.setContentView(layoutResID)
193+
194+
applyEdgeToEdgeInsets()
195+
}
196+
197+
private fun applyEdgeToEdgeInsets() {
198+
val rootView = window.decorView.findViewWithTag<View>("content")
199+
if (rootView != null) {
200+
ViewCompat.setOnApplyWindowInsetsListener(rootView) { view, insets ->
201+
val systemBars = insets.getInsets(
202+
WindowInsetsCompat.Type.systemBars()
203+
or WindowInsetsCompat.Type.displayCutout()
204+
)
205+
view.setPadding(
206+
systemBars.left,
207+
systemBars.top,
208+
systemBars.right,
209+
systemBars.bottom
210+
)
211+
insets
212+
}
213+
}
214+
}
186215
}

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@ package com.regula.ble_1120
33
import android.graphics.Bitmap
44
import android.os.Bundle
55
import android.util.Log
6+
import android.view.View
67
import android.widget.Button
78
import android.widget.ImageView
89
import android.widget.Toast
10+
import androidx.annotation.LayoutRes
911
import androidx.appcompat.app.AppCompatActivity
12+
import androidx.core.view.ViewCompat
13+
import androidx.core.view.WindowInsetsCompat
1014
import com.regula.documentreader.api.DocumentReader
1115
import com.regula.documentreader.api.config.ScannerConfig
1216
import com.regula.documentreader.api.enums.*
@@ -121,4 +125,29 @@ class SuccessfulInitActivity : AppCompatActivity() {
121125
uvImage = findViewById(R.id.uvImageView)
122126
rfidImage = findViewById(R.id.documentImageIv)
123127
}
128+
129+
override fun setContentView(@LayoutRes layoutResID: Int) {
130+
super.setContentView(layoutResID)
131+
132+
applyEdgeToEdgeInsets()
133+
}
134+
135+
private fun applyEdgeToEdgeInsets() {
136+
val rootView = window.decorView.findViewWithTag<View>("content")
137+
if (rootView != null) {
138+
ViewCompat.setOnApplyWindowInsetsListener(rootView) { view, insets ->
139+
val systemBars = insets.getInsets(
140+
WindowInsetsCompat.Type.systemBars()
141+
or WindowInsetsCompat.Type.displayCutout()
142+
)
143+
view.setPadding(
144+
systemBars.left,
145+
systemBars.top,
146+
systemBars.right,
147+
systemBars.bottom
148+
)
149+
insets
150+
}
151+
}
152+
}
124153
}

‎1120-Without License/app/src/main/res/layout/activity_main.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
88
android:orientation="vertical"
9-
tools:context=".MainActivity">
9+
tools:context=".MainActivity"
10+
android:tag="content">
11+
12+
<com.google.android.material.appbar.MaterialToolbar
13+
android:layout_width="match_parent"
14+
android:layout_height="wrap_content"
15+
app:title="@string/app_name"/>
1016

1117
<TextView
1218
android:id="@+id/tv_device"

‎1120-Without License/app/src/main/res/layout/sucessfull_init_activity.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:layout_width="match_parent"
5-
android:layout_height="match_parent">
5+
android:layout_height="match_parent"
6+
android:orientation="vertical"
7+
android:tag="content">
68

79
<ScrollView
810
android:layout_width="0dp"

‎1120-Without License/app/src/main/res/values-night/themes.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<resources xmlns:tools="http://schemas.android.com/tools">
22
<!-- Base application theme. -->
3-
<style name="Theme.Ble_1120" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
3+
<style name="Theme.Ble_1120" parent="Theme.MaterialComponents.DayNight.NoActionBar">
44
<!-- Primary brand color. -->
55
<item name="colorPrimary">@color/purple_200</item>
66
<item name="colorPrimaryVariant">@color/purple_700</item>

‎1120-Without License/app/src/main/res/values/themes.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<resources xmlns:tools="http://schemas.android.com/tools">
22
<!-- Base application theme. -->
3-
<style name="Theme.Ble_1120" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
3+
<style name="Theme.Ble_1120" parent="Theme.MaterialComponents.DayNight.NoActionBar">
44
<!-- Primary brand color. -->
55
<item name="colorPrimary">@color/purple_500</item>
66
<item name="colorPrimaryVariant">@color/purple_700</item>

‎1120-Without License/build.gradle‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
plugins {
3-
id 'com.android.application' version '7.2.1' apply false
4-
id 'com.android.library' version '7.2.1' apply false
5-
id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
1+
buildscript {
2+
ext.kotlin_version = '1.6.21'
3+
repositories {
4+
google()
5+
mavenCentral()
6+
}
7+
dependencies {
8+
classpath 'com.android.tools.build:gradle:8.10.0'
9+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
10+
}
611
}
712

813
task clean(type: Delete) {

‎1120-Without License/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Mon Jul 25 11:46:03 MSK 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,21 @@ plugins {
55

66
android {
77

8-
compileSdk 34
8+
compileSdk 36
99
defaultConfig {
1010
applicationId "com.regula.documentreader"
1111
minSdk 23
12-
targetSdk 34
12+
targetSdk 36
1313
versionCode 1
1414
versionName "1.0"
1515
}
16-
16+
compileOptions {
17+
sourceCompatibility JavaVersion.VERSION_17
18+
targetCompatibility JavaVersion.VERSION_17
19+
}
20+
kotlinOptions {
21+
jvmTarget = "17"
22+
}
1723
buildTypes {
1824
release {
1925
minifyEnabled true
@@ -44,9 +50,9 @@ dependencies {
4450

4551
implementation 'com.regula.btdevice:api:7.6.+@aar'
4652
//noinspection GradleDynamicVersion
47-
implementation 'com.regula.documentreader.core:fullrfid:8.1.+@aar'
53+
implementation 'com.regula.documentreader.core:fullrfid:8.2.+@aar'
4854
//noinspection GradleDynamicVersion
49-
implementation('com.regula.documentreader:api:8.1.+@aar') {
55+
implementation('com.regula.documentreader:api:8.2.+@aar') {
5056
transitive = true
5157
}
5258

0 commit comments

Comments
 (0)