Merge pull request #36 from BlinkID/release/v3.7.0

Release/v3.7.0

.travis.yml

@@ -18,3 +18,4 @@ script:
     - ./gradlew clean :BlinkIDDirectApiDemo:assembleRelease
     - ./gradlew clean :BlinkIDRandomScanDemo:assembleRelease
     - ./gradlew clean :BlinkIDImageListenerDemo:assembleRelease
+    - ./gradlew clean :BlinkIDCustomCombinedDemo:assembleRelease

BlinkIDDemo/BlinkIDCustomCombinedDemo/.gitignore

@@ -0,0 +1 @@
+/build

BlinkIDDemo/BlinkIDCustomCombinedDemo/build.gradle

@@ -0,0 +1,30 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
+
+    defaultConfig {
+        applicationId "com.microblink.blinkid"
+        minSdkVersion 16
+        targetSdkVersion 25
+        versionCode 1
+        versionName "1.0"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile("com.microblink:blinkid:${rootProject.ext.blinkIdVersion}@aar") {
+        transitive = true
+    }
+    compile project(':LibResult')
+    compile "com.android.support:percent:${rootProject.ext.appCompatVersion}"
+
+}

BlinkIDDemo/BlinkIDCustomCombinedDemo/proguard-rules.pro

@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /usr/local/opt/android-sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

BlinkIDDemo/BlinkIDCustomCombinedDemo/src/main/AndroidManifest.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.microblink.blinkid">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme.NoActionBar">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <activity android:name=".CustomVerificationFlowActivity"
+                  android:screenOrientation="portrait"
+                  android:configChanges="orientation|screenSize"/>
+        <activity
+            android:name="com.microblink.libresult.ResultActivity"
+            android:screenOrientation="sensor" >
+        </activity>
+    </application>
+
+</manifest>