Skip to content

Commit 5bcfa46

Browse files
committed
Added vector launcher icon. Use Ver-ID UI elements package for common activities.
1 parent dde1267 commit 5bcfa46

29 files changed

+35
-206
lines changed

app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ android {
1111
versionName rootProject.generateVersionName()
1212
buildConfigField "String", "BLINK_LICENCE_KEY", "\"" + blink5LicenceKey + "\""
1313
buildConfigField "String", "INTELLICHECK_URL", "\"https://dev.ver-id.com/id-check/parse-verify\""
14+
manifestPlaceholders = ["veridPassword": "8f821baf-4ae4-41cd-a175-91d7ef6a6db8"]
1415
}
1516
buildTypes {
1617
release {
@@ -30,11 +31,11 @@ dependencies {
3031
implementation "androidx.appcompat:appcompat:$rootProject.appcompatVersion"
3132
implementation "com.appliedrec.verid:rx:$rootProject.rxveridVersion"
3233
implementation "com.appliedrec.verid:ui:$rootProject.veridVersion"
34+
implementation "com.appliedrec.verid:ui-elements:$rootProject.veriduielementsVersion"
3335
implementation("com.microblink:blinkid:$rootProject.blinkidVersion@aar") {
3436
transitive = true
3537
}
3638
implementation 'androidx.appcompat:appcompat:1.1.0'
3739
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
38-
implementation 'org.apache.commons:commons-math3:3.0'
3940
implementation 'androidx.security:security-crypto:1.0.0-alpha02'
4041
}

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,18 @@
1111
android:allowBackup="true"
1212
android:icon="@mipmap/ic_launcher"
1313
android:label="@string/app_name"
14-
android:roundIcon="@mipmap/ic_launcher_round"
1514
android:supportsRtl="true"
1615
android:theme="@style/Theme.AppCompat.Light.DarkActionBar">
17-
<activity android:name=".SettingsActivity"></activity>
16+
<activity android:name=".SettingsActivity" />
1817
<activity
1918
android:name=".DocumentDetailsActivity"
2019
android:label="@string/details" />
2120
<activity
2221
android:name=".AboutActivity"
2322
android:label="@string/about" />
24-
<activity
25-
android:name=".ScoreTableActivity"
26-
android:label="@string/false_acceptance_rates" />
2723
<activity
2824
android:name=".WebViewActivity"
2925
android:label="@string/supported_documents" />
30-
<activity
31-
android:name=".ResultActivity"
32-
android:label="@string/comparison_result" />
3326
<activity
3427
android:name=".IDCardActivity"
3528
android:label="@string/your_id_card" />
@@ -44,8 +37,8 @@
4437
</activity>
4538

4639
<meta-data
47-
android:name="com.appliedrec.verid.apiSecret"
48-
android:value="f33570cf95f874b1b260ba4def154fb23618ab89a142a726a56d70e33128181e" />
40+
android:name="com.appliedrec.verid.password"
41+
android:value="${veridPassword}" />
4942
</application>
5043

5144
</manifest>
5.65 KB
Binary file not shown.

app/src/main/java/com/appliedrec/credentials/app/BlinkLicenceKeyUpdater.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,7 @@ Single<String> getLicenceKeyFromRemote() {
5757
return Single.<String>create(emitter -> {
5858
try {
5959
String packageName = context.getApplicationContext().getPackageName();
60-
String uri = new Uri.Builder()
61-
.scheme("https")
62-
.authority("dev.ver-id.com")
63-
.path("blink_key")
64-
.appendQueryParameter("package", packageName)
65-
.build().toString();
66-
URL url = new URL(uri);
60+
URL url = new URL("https://ver-id.s3.us-east-1.amazonaws.com/ios/microblink_keys/com.appliedrec.credentials.app.txt");
6761
HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
6862
connection.setUseCaches(false);
6963
connection.setRequestMethod("GET");

app/src/main/java/com/appliedrec/credentials/app/CredentialsApplication.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,19 @@
22

33
import android.app.Application;
44

5-
import com.appliedrec.rxverid.RxVerID;
65
import com.microblink.MicroblinkSDK;
76
import com.microblink.intent.IntentDataTransferMode;
87

98
public class CredentialsApplication extends Application {
109

11-
private RxVerID rxVerID;
12-
1310
@Override
1411
public void onCreate() {
1512
super.onCreate();
1613
setupMicroblink();
17-
setupVerID();
1814
}
1915

2016
private void setupMicroblink() {
2117
MicroblinkSDK.setIntentDataTransferMode(IntentDataTransferMode.PERSISTED_OPTIMISED);
2218
MicroblinkSDK.setShowTimeLimitedLicenseWarning(false);
2319
}
24-
25-
private void setupVerID() {
26-
rxVerID = new RxVerID.Builder(this).build();
27-
}
28-
29-
public RxVerID getRxVerID() {
30-
return rxVerID;
31-
}
3220
}

app/src/main/java/com/appliedrec/credentials/app/DocumentDetailsActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import androidx.recyclerview.widget.LinearLayoutManager;
1515
import androidx.recyclerview.widget.RecyclerView;
1616

17+
import com.appliedrec.uielements.RxVerIDActivity;
18+
1719
import java.util.ArrayList;
1820
import java.util.List;
1921

app/src/main/java/com/appliedrec/credentials/app/IDCardActivity.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
import androidx.core.graphics.drawable.RoundedBitmapDrawable;
1414
import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
1515

16+
import com.appliedrec.uielements.RxVerIDActivity;
17+
import com.appliedrec.uielements.facecomparison.ResultActivity;
1618
import com.appliedrec.verid.core.Bearing;
1719
import com.appliedrec.verid.core.DetectedFace;
1820
import com.appliedrec.verid.core.LivenessDetectionSessionSettings;
1921
import com.appliedrec.verid.core.RecognizableFace;
2022
import com.appliedrec.verid.ui.VerIDSessionIntent;
2123

22-
import java.util.ArrayList;
23-
2424
import io.reactivex.Single;
2525
import io.reactivex.android.schedulers.AndroidSchedulers;
2626
import io.reactivex.schedulers.Schedulers;
@@ -81,7 +81,6 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
8181
if (item.getItemId() == R.id.action_details) {
8282
Intent intent = new Intent(this, DocumentDetailsActivity.class);
8383
intent.putExtra(EXTRA_DOCUMENT_DATA, documentData);
84-
// intent.putExtra(EXTRA_DETECTED_FACE, cardFace);
8584
startActivity(intent);
8685
return true;
8786
}
@@ -123,10 +122,8 @@ private void startLivenessDetection() {
123122

124123
private void showResult(DetectedFace detectedFace) {
125124
Intent intent = new Intent(this, ResultActivity.class);
126-
ArrayList<DetectedFace> detectedFaces = new ArrayList<>();
127-
detectedFaces.add(cardFace);
128-
detectedFaces.add(detectedFace);
129-
intent.putParcelableArrayListExtra(ResultActivity.EXTRA_DETECTED_FACES, detectedFaces);
125+
intent.putExtra(ResultActivity.EXTRA_DETECTED_FACE1, cardFace);
126+
intent.putExtra(ResultActivity.EXTRA_DETECTED_FACE2, detectedFace);
130127
startActivity(intent);
131128
}
132129
}

app/src/main/java/com/appliedrec/credentials/app/MainActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import androidx.appcompat.app.AlertDialog;
1414
import androidx.constraintlayout.widget.Group;
1515

16+
import com.appliedrec.uielements.RxVerIDActivity;
1617
import com.appliedrec.verid.core.Bearing;
1718
import com.appliedrec.verid.core.DetectedFace;
1819
import com.microblink.entities.recognizers.Recognizer;

app/src/main/java/com/appliedrec/credentials/app/ResultActivity.java

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

app/src/main/java/com/appliedrec/credentials/app/RxVerIDActivity.java

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

app/src/main/java/com/appliedrec/credentials/app/ScoreTableActivity.java

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

app/src/main/java/com/appliedrec/credentials/app/SettingsActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import android.widget.ProgressBar;
1010
import android.widget.Toast;
1111

12+
import com.appliedrec.uielements.RxVerIDActivity;
13+
1214
import io.reactivex.android.schedulers.AndroidSchedulers;
1315

1416
public class SettingsActivity extends RxVerIDActivity {
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="108dp"
3+
android:height="108dp"
4+
android:viewportWidth="108"
5+
android:viewportHeight="108">
6+
<path
7+
android:pathData="M34.453,45.402L28.963,62.707L26.404,62.707L21,45.69L23.415,45L27.669,59.488L27.698,59.488L31.923,45.402L34.453,45.402ZM43.853,60.178L44.658,61.989C43.364,62.707 42.042,63.024 40.403,63.024C36.408,63.024 34.395,60.379 34.395,55.895C34.395,51.726 36.58,48.938 39.972,48.938C43.22,48.938 44.543,51.094 44.543,54.055L44.543,55.665L36.638,55.665C36.666,59.258 37.931,60.983 40.892,60.983C42.013,60.983 42.847,60.666 43.853,60.178ZM36.753,54.055L42.387,54.055C42.387,52.014 41.668,50.778 39.857,50.778C38.132,50.778 37.069,52.1 36.753,54.055ZM54.115,48.967L54.115,51.238C52.534,51.238 51.413,51.64 50.378,52.589L50.378,62.707L48.078,62.707L48.078,52.359L47.676,49.398L49.947,49.024L50.177,50.864L50.206,50.864C51.125,49.829 52.304,48.967 54.115,48.967ZM62.595,55.291L55.897,55.291L55.897,53.365L62.595,53.365L62.595,55.291ZM68.66,62.707L66.246,62.707L66.246,45.402L68.66,45.402L68.66,62.707ZM87,52.963C87,59.287 83.177,62.707 77.054,62.707L73.432,62.707L73.432,45.517C73.921,45.489 74.409,45.431 74.956,45.374C75.875,45.287 77.083,45.23 78.376,45.23C83.752,45.23 87,48.018 87,52.963ZM84.499,53.307C84.499,49.254 81.74,47.271 77.974,47.271C77.37,47.271 76.824,47.3 76.45,47.3C76.249,47.328 76.048,47.328 75.847,47.328L75.847,60.551L77.514,60.551C81.625,60.551 84.499,58.108 84.499,53.307Z"
8+
android:strokeWidth="1"
9+
android:fillColor="#0A0B09"
10+
android:fillType="evenOdd"
11+
android:strokeColor="#00000000"/>
12+
</vector>

app/src/main/res/layout/activity_idcard.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
tools:context=".IDCardActivity">
88

99
<ImageView
10-
android:id="@+id/imageView3"
1110
android:layout_width="wrap_content"
1211
android:layout_height="wrap_content"
1312
android:adjustViewBounds="true"
@@ -45,7 +44,6 @@
4544
app:layout_constraintTop_toTopOf="parent" />
4645

4746
<androidx.constraintlayout.widget.Guideline
48-
android:id="@+id/guideline"
4947
android:layout_width="wrap_content"
5048
android:layout_height="wrap_content"
5149
android:orientation="horizontal"

app/src/main/res/layout/activity_main.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
app:srcCompat="@drawable/woman_with_licence" />
4040

4141
<TextView
42-
android:id="@+id/textView"
4342
android:layout_width="wrap_content"
4443
android:layout_height="wrap_content"
4544
android:text="@string/home_instructions"

app/src/main/res/layout/activity_settings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
app:layout_constraintTop_toTopOf="@+id/password" />
4747

4848
<TextView
49-
android:id="@+id/textView2"
5049
android:layout_width="0dp"
5150
android:layout_height="wrap_content"
5251
android:layout_marginStart="16dp"
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@android:color/white" />
4+
<foreground android:drawable="@drawable/ic_ver_id_icon" />
5+
</adaptive-icon>
215 Bytes
Loading
Binary file not shown.
42 Bytes
Loading
Binary file not shown.
-51 Bytes
Loading
Binary file not shown.
509 Bytes
Loading
Binary file not shown.
-103 Bytes
Loading
Binary file not shown.

app/src/main/res/values/strings.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@
44
<string name="compare_to_selfie">Compare to Selfie</string>
55
<string name="scan_id_card">Scan ID Card</string>
66
<string name="home_instructions">1. Scan your ID card\n2. Compare the face on \nthe ID card to a selfie</string>
7-
<string name="result_score"><xliff:g example="3.60" id="score">%1$.02f</xliff:g> (<xliff:g example="4.00" id="threshold">%2$.02f</xliff:g> needed to pass)</string>
8-
<string name="what_does_it_mean">What does it mean?</string>
97
<string name="score">Score</string>
108
<string name="false_acceptance_rate">False acceptance rate</string>
119
<string name="about">About</string>
12-
<string name="score_explanation">Score explanation</string>
1310
<string name="supported_documents">Supported documents</string>
14-
<string name="comparison_result">Comparison result</string>
1511
<string name="your_id_card">Your ID card</string>
1612
<string name="id_capture">ID capture</string>
1713
<string name="invalid_mb_key">Invalid Microblink licence key</string>

0 commit comments

Comments
 (0)