Skip to content

GitLab

Commit a5cbb656 authored by Javohir Savriy's avatar Javohir Savriy
Browse files

Merge branch '2.1.4' into '2.1.3' 

2.1.4

See merge request !6
parents 7c77618c e2b54af8
Expand all Hide whitespace changes
Inline Side-by-side
.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm_1_6_4.xml deleted 100644 → 0
View file @ 7c77618c
<component name="libraryTable">
<library name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.6.4/2c997cd1c0ef33f3e751d3831929aeff1390cb30/kotlinx-coroutines-core-jvm-1.6.4.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.6.4/fabe8d560081a2a5509ec895d59d0ee3618f8f8e/kotlinx-coroutines-core-jvm-1.6.4-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.6.4/f6a09bbc88df97983306c692aa43889ac78b98ef/kotlinx-coroutines-core-jvm-1.6.4-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_jdk8_1_6_4.xml deleted 100644 → 0
View file @ 7c77618c
<component name="libraryTable">
<library name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-jdk8/1.6.4/5bc4b0bf6fd90fc190fd2f17e919c74c6274cb71/kotlinx-coroutines-jdk8-1.6.4.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-jdk8/1.6.4/cadec3c71bf4a113a2ca423bb68e79de468cd721/kotlinx-coroutines-jdk8-1.6.4-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-jdk8/1.6.4/a6cf02aec3e350593358b80eb6ebb88d4b44f4be/kotlinx-coroutines-jdk8-1.6.4-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_36.xml deleted 100644 → 0
View file @ 7c77618c
<component name="libraryTable">
<library name="Gradle: org.slf4j:slf4j-api:1.7.36">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.36/6c62681a2f655b49963a5983b8b0950a6120ae14/slf4j-api-1.7.36.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.36/f91b284d55365e88248e6493bc5959c8e81d5fa3/slf4j-api-1.7.36-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.36/ae9c1aae0033af915cfa75d850eb9d880f21a701/slf4j-api-1.7.36-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/misc.xml deleted 100644 → 0
View file @ 7c77618c
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
<entry key="app/src/main/res/layout/activity_face.xml" value="0.371875" />
<entry key="app/src/main/res/layout/activity_main.xml" value="0.371875" />
</map>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>
\ No newline at end of file
.idea/modules.xml deleted 100644 → 0
View file @ 7c77618c
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/modules/myid-sample.iml" filepath="$PROJECT_DIR$/.idea/modules/myid-sample.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/myid-sample.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/myid-sample.app.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/myid-sample.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/myid-sample.app.androidTest.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/myid-sample.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/myid-sample.app.main.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/myid-sample.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/myid-sample.app.unitTest.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/modules/app/myid-sample.app.androidTest.iml deleted 100644 → 0
View file @ 7c77618c
This diff is collapsed.
.idea/modules/app/myid-sample.app.iml deleted 100644 → 0
View file @ 7c77618c
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="myid-sample" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":app" />
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="7.3.0" />
<option name="LAST_KNOWN_AGP_VERSION" value="7.3.0" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<afterSyncTasks>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
<output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../../app">
<excludeFolder url="file://$MODULE_DIR$/../../../app/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/../../../app/build" />
</content>
<orderEntry type="jdk" jdkName="Android API 33, extension level 3 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
.idea/modules/app/myid-sample.app.main.iml deleted 100644 → 0
View file @ 7c77618c
This diff is collapsed.
.idea/modules/app/myid-sample.app.unitTest.iml deleted 100644 → 0
View file @ 7c77618c
This diff is collapsed.
.idea/modules/myid-sample.iml deleted 100644 → 0
View file @ 7c77618c
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="myid-sample" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../..">
<excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
<excludeFolder url="file://$MODULE_DIR$/../../build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
.idea/vcs.xml deleted 100644 → 0
View file @ 7c77618c
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
CHANGELOG.md
View file @ a5cbb656
......@@ -2,6 +2,13 @@
All notable changes to this project will be documented in this file.
## [2.1.4] - 21 Feb, 2023
### New features
- Added new `withResidency(value: MyIdResidentType)` method for residency.
- Added new translations to texts in MyID SDK.
## [2.1.3] - 30 Jan, 2023
### New features
......
README.md
View file @ a5cbb656
......@@ -51,11 +51,11 @@ libraries (For example libs) and copy MyID SDK provided libraries.
Add reference to library to module **_build.gradle_**:
``` gradle
implementation(files("libs/myid-sdk-2.1.3-release.aar"))
implementation(files("libs/myid-sdk-2.1.4-release.aar"))
```
**Note:** You can get `myid-sdk-2.1.3-release.aar` file
from [here](android-sample/app/libs/myid-sdk-2.1.3-release.aar)
**Note:** You can get `myid-sdk-2.1.4-release.aar` file
from [here](android-sample/app/libs/myid-sdk-2.1.4-release.aar)
After synchronization, You should be able to access to SDK classes from your source code.
......@@ -63,7 +63,7 @@ MyID Android SDK also requires following libraries to be added:
``` gradle
dependencies {
implementation(files("libs/myid-sdk-2.1.3-release.aar"))
implementation(files("libs/myid-sdk-2.1.4-release.aar"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
......@@ -130,6 +130,7 @@ class ExampleActivity : AppCompatActivity(), MyIdResultListener {
.withThreshold(threshold)
.withBuildMode(MyIdBuildMode.PRODUCTION)
.withEntryType(MyIdEntryType.AUTH)
.withResidency(MyIdResidentType.RESIDENT)
.withLocale(Locale("en"))
.withCameraShape(MyIdCameraShape.CIRCLE)
.withOrganizationDetails(organizationDetails)
......@@ -175,6 +176,7 @@ class ExampleActivity : AppCompatActivity(), MyIdResultListener {
.withThreshold(threshold)
.withBuildMode(MyIdBuildMode.PRODUCTION)
.withEntryType(MyIdEntryType.AUTH)
.withResidency(MyIdResidentType.RESIDENT)
.withLocale(Locale("en"))
.withCameraShape(MyIdCameraShape.CIRCLE)
.withOrganizationDetails(organizationDetails)
......@@ -202,6 +204,7 @@ Method | Notes | Default
`withThreshold(value: Float)` | The value can be in the range of `0.50` - `0.99` | 0.50
`withBuildMode(value: MyIdBuildMode)` | Build mode | MyIdBuildMode.PRODUCTION
`withEntryType(value: MyIdEntryType)` | Customizing the SDK Entry types | MyIdEntryType.AUTH
`withResidency(value: MyIdResidentType)` | To set a specific resident type | MyIdResidentType.RESIDENT
`withLocale(value: Locale)` | To set a specific locale | Locale("uz")
`withCameraShape(value: MyIdCameraShape)` | To set a specific camera shape | MyIdCameraShape.CIRCLE
`withOrganizationDetails(value: OrganizationDetails)` | Custom Organization Details | Optional
......
android-sample/app/build.gradle
View file @ a5cbb656
......@@ -37,7 +37,7 @@ android {
}
dependencies {
implementation(files("libs/myid-sdk-2.1.3-release.aar"))
implementation(files("libs/myid-sdk-2.1.4-release.aar"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
......
android-sample/app/src/main/java/uz/myid/sdk/sample/ExampleJavaActivity.java
View file @ a5cbb656
......@@ -17,6 +17,7 @@ import uz.myid.android.sdk.capture.MyIdClient;
import uz.myid.android.sdk.capture.MyIdConfig;
import uz.myid.android.sdk.capture.MyIdEntryType;
import uz.myid.android.sdk.capture.MyIdException;
import uz.myid.android.sdk.capture.MyIdResidentType;
import uz.myid.android.sdk.capture.MyIdResult;
import uz.myid.android.sdk.capture.MyIdResultListener;
......@@ -61,6 +62,7 @@ public class ExampleJavaActivity extends AppCompatActivity implements MyIdResult
.withThreshold(threshold)
.withBuildMode(MyIdBuildMode.PRODUCTION)
.withEntryType(MyIdEntryType.AUTH)
.withResidency(MyIdResidentType.RESIDENT)
.withLocale(new Locale("en"))
.withCameraShape(MyIdCameraShape.CIRCLE)
.withPhoto(false)
......
android-sample/app/src/main/java/uz/myid/sdk/sample/ExampleJavaFragment.java
View file @ a5cbb656
......@@ -17,6 +17,7 @@ import uz.myid.android.sdk.capture.MyIdClient;
import uz.myid.android.sdk.capture.MyIdConfig;
import uz.myid.android.sdk.capture.MyIdEntryType;
import uz.myid.android.sdk.capture.MyIdException;
import uz.myid.android.sdk.capture.MyIdResidentType;
import uz.myid.android.sdk.capture.MyIdResult;
import uz.myid.android.sdk.capture.MyIdResultListener;
......@@ -61,6 +62,7 @@ public class ExampleJavaFragment extends Fragment implements MyIdResultListener
.withThreshold(threshold)
.withBuildMode(MyIdBuildMode.PRODUCTION)
.withEntryType(MyIdEntryType.AUTH)
.withResidency(MyIdResidentType.RESIDENT)
.withLocale(new Locale("en"))
.withCameraShape(MyIdCameraShape.CIRCLE)
.withPhoto(false)
......
android-sample/app/src/main/java/uz/myid/sdk/sample/ExampleKotlinFragment.kt
View file @ a5cbb656
......@@ -47,6 +47,7 @@ class ExampleKotlinFragment : Fragment(), MyIdResultListener {
.withThreshold(threshold)
.withBuildMode(MyIdBuildMode.PRODUCTION)
.withEntryType(MyIdEntryType.AUTH)
.withResidency(MyIdResidentType.RESIDENT)
.withLocale(Locale("en"))
.withCameraShape(MyIdCameraShape.CIRCLE)
.withOrganizationDetails(organizationDetails)
......
android-sample/app/src/main/java/uz/myid/sdk/sample/ExampleWithOnActivityResultActivity.kt
View file @ a5cbb656
......@@ -53,6 +53,7 @@ class ExampleWithOnActivityResultActivity : AppCompatActivity(), MyIdResultListe
.withThreshold(threshold)
.withBuildMode(MyIdBuildMode.PRODUCTION)
.withEntryType(MyIdEntryType.AUTH)
.withResidency(MyIdResidentType.RESIDENT)
.withLocale(Locale("en"))
.withCameraShape(MyIdCameraShape.CIRCLE)
.withOrganizationDetails(organizationDetails)
......
android-sample/app/src/main/java/uz/myid/sdk/sample/MainActivity.kt
View file @ a5cbb656
......@@ -15,10 +15,11 @@ class MainActivity : AppCompatActivity(), MyIdResultListener {
private val myIdClient = MyIdClient()
private var clientId = ""
private var myIdBuildMode = MyIdBuildMode.PRODUCTION
private var myIdEntryType = MyIdEntryType.AUTH
private var myIdLocale = Locale("en")
private var myIdCameraShape = MyIdCameraShape.CIRCLE
private var buildMode = MyIdBuildMode.PRODUCTION
private var entryType = MyIdEntryType.AUTH
private var residency = MyIdResidentType.RESIDENT
private var locale = Locale("en")
private var shape = MyIdCameraShape.CIRCLE
private var code = ""
......@@ -30,28 +31,37 @@ class MainActivity : AppCompatActivity(), MyIdResultListener {
inputClientId.setText(clientId)
radioGroupLang.setOnCheckedChangeListener { _, checkedId ->
myIdLocale = when (checkedId) {
locale = when (checkedId) {
R.id.radioUz -> Locale("uz")
R.id.radioEn -> Locale("en")
else -> Locale("ru")
}
}
radioGroupEntryType.setOnCheckedChangeListener { _, checkedId ->
myIdEntryType = if (checkedId == R.id.radioFace) {
entryType = if (checkedId == R.id.radioFace) {
MyIdEntryType.FACE
} else {
MyIdEntryType.AUTH
}
}
radioGroupResidentType.setOnCheckedChangeListener { _, checkedId ->
residency = when (checkedId) {
R.id.radioManual -> MyIdResidentType.USER_DEFINED
R.id.radioNonResident -> MyIdResidentType.NON_RESIDENT
else -> MyIdResidentType.RESIDENT
}
}
radioGroupBuildMode.setOnCheckedChangeListener { _, checkedId ->
myIdBuildMode = if (checkedId == R.id.radioProd) {
buildMode = if (checkedId == R.id.radioProd) {
MyIdBuildMode.PRODUCTION
} else {
MyIdBuildMode.DEBUG
}
inputClientId.setText(clientId)
}
radioGroupShape.setOnCheckedChangeListener { _, checkedId ->
myIdCameraShape = if (checkedId == R.id.radioCircle) {
shape = if (checkedId == R.id.radioCircle) {
MyIdCameraShape.CIRCLE
} else {
MyIdCameraShape.ELLIPSE
......@@ -106,10 +116,11 @@ class MainActivity : AppCompatActivity(), MyIdResultListener {
.withSdkHash(binding.inputSdkHash.value)
.withExternalId(binding.inputExternalId.value)
.withThreshold(binding.thresholdSlider.value)
.withBuildMode(myIdBuildMode)
.withEntryType(myIdEntryType)
.withLocale(myIdLocale)
.withCameraShape(myIdCameraShape)
.withBuildMode(buildMode)
.withEntryType(entryType)
.withResidency(residency)
.withLocale(locale)
.withCameraShape(shape)
.withOrganizationDetails(organizationDetails)
.withPhoto(binding.checkboxWithPhoto.isChecked)
.build()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment