Skip to content

Commit 5a33cce

Browse files
aechiaraaechiara
authored
v1.0.6
* added button to launch camera * QRCode Scanner login * clean up * fixed load config and bind on config screen
1 parent bc404b8 commit 5a33cce

16 files changed

Lines changed: 1769 additions & 1247 deletions

File tree

‎.idea/inspectionProfiles/Project_Default.xml‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle.kts‎

Lines changed: 76 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,98 @@
11
plugins {
2-
id("com.android.application")
3-
id("org.jetbrains.kotlin.android")
2+
id("com.android.application")
3+
id("org.jetbrains.kotlin.android")
44
}
55

66
android {
7-
namespace = "br.com.sec4you.authfy.app"
8-
compileSdk = 34
7+
namespace = "br.com.sec4you.authfy.app"
8+
compileSdk = 34
99

10-
defaultConfig {
11-
applicationId = "br.com.sec4you.authfy.app"
12-
minSdk = 21
13-
targetSdk = 34
14-
versionCode = 1
15-
versionName = "1.0"
10+
defaultConfig {
11+
applicationId = "br.com.sec4you.authfy.app"
12+
minSdk = 21
13+
targetSdk = 34
14+
versionCode = 1
15+
versionName = "v1.0.6"
1616

17-
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
18-
vectorDrawables {
19-
useSupportLibrary = true
17+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
18+
vectorDrawables {
19+
useSupportLibrary = true
20+
}
2021
}
21-
}
2222

23-
buildTypes {
24-
release {
25-
isMinifyEnabled = false
26-
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
23+
buildTypes {
24+
release {
25+
isMinifyEnabled = false
26+
proguardFiles(
27+
getDefaultProguardFile("proguard-android-optimize.txt"),
28+
"proguard-rules.pro"
29+
)
30+
}
2731
}
28-
}
29-
compileOptions {
30-
sourceCompatibility = JavaVersion.VERSION_1_8
31-
targetCompatibility = JavaVersion.VERSION_1_8
32-
}
33-
kotlinOptions {
34-
jvmTarget = "1.8"
35-
}
36-
buildFeatures {
37-
compose = true
38-
}
39-
composeOptions {
40-
kotlinCompilerExtensionVersion = "1.5.1"
41-
}
42-
packaging {
43-
resources {
44-
excludes += "/META-INF/{AL2.0,LGPL2.1}"
32+
compileOptions {
33+
sourceCompatibility = JavaVersion.VERSION_1_8
34+
targetCompatibility = JavaVersion.VERSION_1_8
35+
}
36+
kotlinOptions {
37+
jvmTarget = "1.8"
38+
}
39+
buildFeatures {
40+
compose = true
41+
}
42+
composeOptions {
43+
kotlinCompilerExtensionVersion = "1.5.1"
44+
}
45+
packaging {
46+
resources {
47+
excludes += "/META-INF/{AL2.0,LGPL2.1}"
48+
}
4549
}
46-
}
4750
}
4851

4952
dependencies {
5053

51-
implementation("androidx.core:core-ktx:1.10.1")
52-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
53-
implementation("androidx.activity:activity-compose:1.7.0")
54-
implementation(platform("androidx.compose:compose-bom:2023.08.00"))
55-
implementation("androidx.compose.ui:ui")
56-
implementation("androidx.compose.ui:ui-graphics")
57-
implementation("androidx.compose.ui:ui-tooling-preview")
58-
implementation("androidx.compose.material3:material3")
59-
implementation("androidx.fragment:fragment-ktx:1.7.0")
60-
testImplementation("junit:junit:4.13.2")
61-
androidTestImplementation("androidx.test.ext:junit:1.1.5")
62-
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
63-
androidTestImplementation(platform("androidx.compose:compose-bom:2023.08.00"))
64-
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
65-
debugImplementation("androidx.compose.ui:ui-tooling")
66-
debugImplementation("androidx.compose.ui:ui-test-manifest")
67-
implementation("androidx.navigation:navigation-compose:2.7.7")
54+
implementation("androidx.core:core-ktx:1.10.1")
55+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
56+
implementation("androidx.activity:activity-compose:1.7.0")
57+
implementation(platform("androidx.compose:compose-bom:2023.08.00"))
58+
implementation("androidx.compose.ui:ui")
59+
implementation("androidx.compose.ui:ui-graphics")
60+
implementation("androidx.compose.ui:ui-tooling-preview")
61+
implementation("androidx.compose.material3:material3")
62+
implementation("androidx.fragment:fragment-ktx:1.7.0")
63+
testImplementation("junit:junit:4.13.2")
64+
androidTestImplementation("androidx.test.ext:junit:1.1.5")
65+
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
66+
androidTestImplementation(platform("androidx.compose:compose-bom:2023.08.00"))
67+
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
68+
debugImplementation("androidx.compose.ui:ui-tooling")
69+
debugImplementation("androidx.compose.ui:ui-test-manifest")
70+
implementation("androidx.navigation:navigation-compose:2.7.7")
71+
implementation("androidx.compose.material:material-icons-extended")
72+
73+
implementation("com.google.android.gms:play-services-location:20.0.0")
74+
75+
// corotines for http call
76+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
6877

69-
implementation("com.google.android.gms:play-services-location:20.0.0")
78+
// to parse the response
79+
implementation("com.google.code.gson:gson:2.10.1")
7080

71-
// corotines for http call
72-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
81+
//appauth-android
82+
implementation("net.openid:appauth:0.11.1")
7383

74-
// to parse the response
75-
implementation("com.google.code.gson:gson:2.10.1")
84+
// qrcode
85+
// ML Kit Barcode Scanning
86+
implementation("com.google.mlkit:barcode-scanning:17.3.0")
7687

77-
//appauth-android
78-
implementation("net.openid:appauth:0.11.1")
88+
// CameraX Dependencies (Mantenha estas com a mesma versão)
89+
implementation("androidx.camera:camera-core:1.4.2")
90+
implementation("androidx.camera:camera-camera2:1.4.2")
91+
implementation("androidx.camera:camera-lifecycle:1.4.2")
92+
implementation("androidx.camera:camera-view:1.4.2")
7993

80-
// authfy-sdk
94+
// authfy-sdk
8195
// implementation fileTree(dir: 'libs', includes: ['*.aar'])
82-
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
96+
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
8397

8498
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools">
44

5-
<uses-permission android:name="android.permission.INTERNET" />
5+
<uses-feature android:name="android.hardware.camera" android:required="true" />
6+
<uses-feature android:name="android.hardware.camera.autofocus" android:required="true" />
7+
<uses-permission android:name="android.permission.INTERNET" />
68
<!-- Used by DNA -->
79
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
810
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
911
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
1012
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
1113

14+
<uses-permission android:name="android.permission.CAMERA" />
15+
1216

1317
<application
1418
android:allowBackup="true"

0 commit comments

Comments
 (0)