Merge pull request #33 from Anyline/release/40.0.0

Release/40.0.0
Anyline · Jun 22, 2022 · ce4d4cc · ce4d4cc
2 parents 85e3969 + dbe4d84
commit ce4d4cc
Show file tree

Hide file tree

Showing 51 changed files with 1,598 additions and 2,660 deletions.
diff --git a/AnylineSDK-Examples/AnylineSDK-Examples-Source/app/build.gradle b/AnylineSDK-Examples/AnylineSDK-Examples-Source/app/build.gradle
@@ -9,8 +9,9 @@ apply plugin: 'dagger.hilt.android.plugin'
 
 buildscript {
     ext {
-        sdk_version = "39.0.0"
-        version_code = 365
+        sdk_version = "40.0.0"
+        app_version = "40.0.0"
+        version_code = 367
 
         timber_version = '5.0.1'
         leakcanary_version = '2.8.1'
@@ -25,15 +26,15 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion versions.compileSdk
     buildToolsVersion '28.0.3'
 
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdkVersion versions.minSdk
+        targetSdkVersion versions.targetSdk
         versionCode version_code
-        versionName sdk_version
+        versionName app_version
 
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a"
@@ -98,7 +99,7 @@ dependencies {
     //implementation 'com.google.android.play:core:1.9.0'
 
     //uncomment if you want to import the AnylineSdk project
-//    implementation project(':AnylineSdk')
+    //implementation project(':AnylineSdk')
 
     //include AnylineSDK from maven
     implementation "io.anyline:anylinesdk:$sdk_version"
@@ -110,7 +111,7 @@ dependencies {
 
     //Kotlin
     implementation "androidx.core:core-ktx:1.3.2"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
 
     //Kotlin coroutines
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1'

diff --git a/AnylineSDK-Examples/AnylineSDK-Examples-Source/app/src/main/AndroidManifest.xml b/AnylineSDK-Examples/AnylineSDK-Examples-Source/app/src/main/AndroidManifest.xml
@@ -268,6 +268,15 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="io.anyline.examples.MainActivity" />
         </activity>
+        <activity
+            android:name=".id.ScanVehicleRegistrationCertificateActivity"
+            android:label="@string/vehicle_registration_certificate"
+            android:parentActivityName=".MainActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="io.anyline.examples.MainActivity" />
+        </activity>
+
         <activity
             android:name=".ocr.ScanVehicleIdentificationNumberActivity"
             android:label="@string/vin"
@@ -338,16 +347,6 @@
             android:name=".id.NFC.NFCScanActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name=".ocr.tin.ScanTINActivity"
-            android:label="@string/tin"
-            android:parentActivityName=".MainActivity"
-            android:screenOrientation="portrait">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="io.anyline.examples.MainActivity" />
-        </activity>
-
         <activity
             android:name=".tire.tin.ScanTINActivity"
             android:label="@string/tin"
@@ -412,8 +411,6 @@
             android:parentActivityName=".id.ScanUniversalIdActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.DarkActionBar" />
-
-
     </application>
 
 </manifest>
diff --git a/...SDK-Examples-Source/app/src/main/assets/vehicle_registration_certificate_view_config.json b/...SDK-Examples-Source/app/src/main/assets/vehicle_registration_certificate_view_config.json
@@ -0,0 +1,69 @@
+{
+  "camera" : {
+    "captureResolution" : "1080p"
+  },
+  "flash" : {
+    "mode": "manual",
+    "alignment": "bottom_right",
+    "imageOn": "flash_on",
+    "imageOff": "flash_off"
+  },
+  "viewPlugin" : {
+    "plugin":{
+      "id":"ID",
+      "idPlugin": {
+        "vehicleRegistrationCertificateConfig": {
+          "layoutVehicleCertificate": {
+            "documentNumber": {"scanOption": 0, "minConfidence": 50},
+            "licensePlate": {"scanOption": 0, "minConfidence": 50},
+            "lastName": {"scanOption": 0, "minConfidence": 50},
+            "firstName": {"scanOption": 0, "minConfidence": 50},
+            "address": {"scanOption": 0, "minConfidence": 50},
+            "firstIssued": {"scanOption": 0, "minConfidence": 50},
+            "manufacturerCode": {"scanOption": 0, "minConfidence": 50},
+            "vehicleTypeCode": {"scanOption": 0, "minConfidence": 50},
+            "vehicleIdentificationNumber": {"scanOption": 0, "minConfidence": 50},
+            "brand": {"scanOption": 0, "minConfidence": 50},
+            "vehicleType": {"scanOption": 0, "minConfidence": 50},
+            "displacement": {"scanOption": 0, "minConfidence": 50},
+            "tire": {"scanOption": 0, "minConfidence": 50}
+          }
+        }
+      }
+    },
+    "cutoutConfig" : {
+      "style": "animated_rect",
+      "maxWidthPercent": "90%",
+      "maxHeightPercent": "80%",
+      "alignment": "center",
+      "strokeWidth": 3,
+      "cornerRadius": 8,
+      "strokeColor": "FFFFFF",
+      "outerColor": "000000",
+      "outerAlpha": 0.3,
+      "ratioFromSize": {
+        "width": 90,
+        "height": 46
+      },
+      "cropPadding": {
+        "x": -50,
+        "y": -50
+      },
+      "cropOffset": {
+        "x": 0,
+        "y": 0
+      },
+      "feedbackStrokeColor": "0099FF"
+    },
+    "scanFeedback" : {
+      "style": "CONTOUR_RECT",
+      "visualFeedbackRedrawTimeout": 100,
+      "strokeColor": "0099FF",
+      "fillColor" : "220099FF",
+      "beepOnResult": true,
+      "vibrateOnResult": true,
+      "strokeWidth": 2
+    },
+    "cancelOnResult" : true
+  }
+}
diff --git a/...amples/AnylineSDK-Examples-Source/app/src/main/java/io/anyline/examples/MainActivity.java b/...amples/AnylineSDK-Examples-Source/app/src/main/java/io/anyline/examples/MainActivity.java
@@ -5,7 +5,6 @@
 import android.os.Bundle;
 import android.widget.TextView;
 
-
 import androidx.appcompat.app.AlertDialog;
 import at.nineyards.anyline.core.LicenseException;
 import io.anyline.AnylineSDK;
@@ -18,12 +17,8 @@
 
 public class MainActivity extends BaseToolbarActivity {
 
-    private TextView messageCounter;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-
-
         super.onCreate(savedInstanceState);
 
         try {
@@ -50,8 +45,8 @@ public void onClick(DialogInterface dialog, int which) {
         //add the view pager
         if (getSupportFragmentManager().findFragmentById(R.id.fragment_container) == null) {
             getSupportFragmentManager().beginTransaction()
-                                       .add(R.id.fragment_container,
-                                            new ViewPagerFragment()).commit();
+                    .add(R.id.fragment_container,
+                            new ViewPagerFragment()).commit();
         }
     }
 

diff --git a/...ples/AnylineSDK-Examples-Source/app/src/main/java/io/anyline/examples/ScanModuleEnum.java b/...ples/AnylineSDK-Examples-Source/app/src/main/java/io/anyline/examples/ScanModuleEnum.java
@@ -37,6 +37,7 @@ public enum ScanModule {
         CATTLE_TAG,
         ID_CARD,
         PASSPORT_VISA,
+        VEHICLE_REGISTRATION_CERTIFICATE,
 
         /**
          * @deprecated As the background-selection does not exist anymore, the mode should not be used anymore
@@ -80,7 +81,8 @@ public static Boolean isIDScanModule (ScanModule scanModule) {
                 scanModule == ScanModule.GERMAN_ID_FRONT ||
                 scanModule == ScanModule.UNIVERSAL_ID ||
                 scanModule == ScanModule.ID_CARD ||
-                scanModule == ScanModule.PASSPORT_VISA;
+                scanModule == ScanModule.PASSPORT_VISA ||
+                scanModule == ScanModule.VEHICLE_REGISTRATION_CERTIFICATE;
     }
 }
 
diff --git a/...K-Examples-Source/app/src/main/java/io/anyline/examples/basefragments/OthersFragment.java b/...K-Examples-Source/app/src/main/java/io/anyline/examples/basefragments/OthersFragment.java
@@ -3,7 +3,9 @@
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
+
 import androidx.fragment.app.Fragment;
+
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -14,10 +16,10 @@
 
 public class OthersFragment extends BaseFragment implements BaseGridListAdapter.OnItemClickListener {
 
-    public static final String MRO = "MRO_FRAGMENT";
+    public static final String VEHICLE = "VEHICLE_FRAGMENT";
     public static final String DOCUMENT_IDENTITY_FRAGMENT = "DOCUMENT_IDENTITY_FRAGMENT";
 
-    private boolean isMRO = false;
+    private boolean isVehicle = false;
     private boolean isIdentityDocument = false;
 
     private String[] classes;
@@ -31,7 +33,7 @@ public OthersFragment() {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getArguments() != null) {
-            isMRO = getArguments().getBoolean(MRO);
+            isVehicle = getArguments().getBoolean(VEHICLE);
             isIdentityDocument = getArguments().getBoolean(DOCUMENT_IDENTITY_FRAGMENT);
         }
     }
@@ -40,17 +42,17 @@ public void onCreate(Bundle savedInstanceState) {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
         Resources res = getContext().getResources();
-        if(isIdentityDocument){
+        if (isIdentityDocument) {
 
             classes = res.getStringArray(R.array.example_identity_documents_classes);
             names = res.getStringArray(R.array.example_identity_documents_names);
 
-        }else if(isMRO){
+        } else if (isVehicle) {
 
-            classes = res.getStringArray(R.array.example_mro_classes);
-            names = res.getStringArray(R.array.example_mro_names);
+            classes = res.getStringArray(R.array.example_vehicle_classes);
+            names = res.getStringArray(R.array.example_vehicle_names);
 
-        }else {
+        } else {
 
             classes = res.getStringArray(R.array.example_others_classes);
             names = res.getStringArray(R.array.example_others_names);
@@ -67,7 +69,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     public void onItemClick(int position) {
 
         try {
-            if(mAdapter.getItemViewType(position) == 1) {
+            if (mAdapter.getItemViewType(position) == 1) {
                 Fragment fragment = null;
                 switch (mAdapter.getItemName(position)) {
 

diff --git a/...Examples-Source/app/src/main/java/io/anyline/examples/basefragments/ProductsFragment.java b/...Examples-Source/app/src/main/java/io/anyline/examples/basefragments/ProductsFragment.java
@@ -58,12 +58,12 @@ public void onItemClick(int position) {
                         replaceFragment(fragment, "OTHERS_FRAGMENT");
                         break;
 
-                    case "MRO":
+                    case "Vehicle":
 
                         fragment = new OthersFragment();
-                        Bundle mroArgs = new Bundle();
-                        mroArgs.putBoolean(OthersFragment.MRO, true);
-                        fragment.setArguments(mroArgs);
+                        Bundle vehicleArgs = new Bundle();
+                        vehicleArgs.putBoolean(OthersFragment.VEHICLE, true);
+                        fragment.setArguments(vehicleArgs);
                         replaceFragment(fragment, "OTHERS_FRAGMENT");
                         break;