Merge pull request #10 from blinkinput/release/v3.0.0

Release/v3.0.0

.travis.yml

@@ -6,9 +6,14 @@ android:
     components:
         - platform-tools
         - tools
-        - build-tools-24.0.2
+        - build-tools-25.0.0
         - android-24
         - extra-android-m2repository
 script:
-    - cd BlinkOCRDemo
-    - ./gradlew clean assembleDebug
+    - cd BlinkInputDemo
+    - ./gradlew clean :BlinkInputCombination:assembleRelease
+    - ./gradlew clean :BlinkInputDetectorDemo:assembleRelease
+    - ./gradlew clean :BlinkInputDirectAPI:assembleRelease
+    - ./gradlew clean :BlinkInputFullScreen:assembleRelease
+    - ./gradlew clean :BlinkInputRandomScanDemo:assembleRelease
+    - ./gradlew clean :BlinkInputSegmentDemo:assembleRelease

BlinkOCRDemo/BlinkOCRCombination/build.gradle → BlinkInputDemo/BlinkInputCombination/build.gradle

@@ -4,7 +4,7 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
-        applicationId 'com.microblink.ocr'
+        applicationId 'com.microblink.input'
         minSdkVersion 10
         targetSdkVersion rootProject.ext.targetSdkVersion
     }
@@ -21,7 +21,7 @@ android {
 }
 
 dependencies {
-    compile("com.microblink:blinkocr:${rootProject.ext.blinkOcrVersion}@aar") {
+    compile("com.microblink:blinkinput:${rootProject.ext.blinkInputVersion}@aar") {
         transitive = true
     }
 }

BlinkOCRDemo/BlinkOCRCombination/src/main/java/com/microblink/ocr/CombinationScanActivity.java → BlinkInputDemo/BlinkInputCombination/src/main/java/com/microblink/ocr/CombinationScanActivity.java

@@ -46,7 +46,7 @@ public class CombinationScanActivity extends Activity implements CameraEventsLis
 
     // obtain your licence key at http://microblink.com/login or
     // contact us at http://help.microblink.com
-    private static final String LICENSE_KEY = "H5SIMEWT-YGSAO47Z-LEJJI2C6-ZOIHQI4S-HAQIOSRB-MKYTEYZT-UGBW36CI-C2LAREQJ";
+    private static final String LICENSE_KEY = "OEWESRMK-OENGL3VK-IVWYB4DY-OTNT457T-5PGLUYNA-IVQ2ARLB-UBCWCAAC-IYXKU56C";
 
     /** RecognizerView is the built-in view that controls camera and recognition */
     private RecognizerView mRecognizerView;

BlinkInputDemo/BlinkInputCombination/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">BlinkInput API Combination Scan</string>
+</resources>

BlinkOCRDemo/BlinkOCRDetectorDemo/build.gradle → BlinkInputDemo/BlinkInputDetectorDemo/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        applicationId "com.microblink.ocr"
+        applicationId "com.microblink.input"
         minSdkVersion 10
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    compile("com.microblink:blinkocr:${rootProject.ext.blinkOcrVersion}@aar") {
+    compile("com.microblink:blinkinput:${rootProject.ext.blinkInputVersion}@aar") {
         transitive = true
     }
 }

BlinkOCRDemo/BlinkOCRDetectorDemo/src/main/java/com/microblink/ocr/DetectorActivity.java → BlinkInputDemo/BlinkInputDetectorDemo/src/main/java/com/microblink/ocr/DetectorActivity.java

@@ -67,7 +67,7 @@ public class DetectorActivity extends Activity implements CameraEventsListener,
     private View mResultView;
     /** Shows result image. */
     private ImageView mImageView;
-    /** This is BlinkOCR's built-in helper for built-in view that draws detection location */
+    /** This is BlinkInput's built-in helper for built-in view that draws detection location */
     private QuadViewManager mQuadViewManager;
     /** Last dewarped image. */
     private Image mLastDewarpedImg;

BlinkOCRDemo/BlinkOCRDetectorDemo/src/main/java/com/microblink/ocr/MenuActivity.java → BlinkInputDemo/BlinkInputDetectorDemo/src/main/java/com/microblink/ocr/MenuActivity.java

@@ -28,7 +28,7 @@ public class MenuActivity extends Activity {
 
     // obtain your licence key at http://microblink.com/login or
     // contact us at http://help.microblink.com
-    static final String LICENSE_KEY = "H5SIMEWT-YGSAO47Z-LEJJI2C6-ZOIHQI4S-HAQIOSRB-MKYTEYZT-UGBW36CI-C2LAREQJ";
+    static final String LICENSE_KEY = "OEWESRMK-OENGL3VK-IVWYB4DY-OTNT457T-5PGLUYNA-IVQ2ARLB-UBCWCAAC-IYXKU56C";
 
     /** List view elements. */
     private ListElement[] mElements;
@@ -38,10 +38,10 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_menu);
 
-        // check if BlinkOCR is supported on the device
+        // check if BlinkInput is supported on the device
         RecognizerCompatibilityStatus supportStatus = RecognizerCompatibility.getRecognizerCompatibilityStatus(this);
         if (supportStatus != RecognizerCompatibilityStatus.RECOGNIZER_SUPPORTED) {
-            Toast.makeText(this, "BlinkOCR is not supported! Reason: " + supportStatus.name(), Toast.LENGTH_LONG).show();
+            Toast.makeText(this, "BlinkInput is not supported! Reason: " + supportStatus.name(), Toast.LENGTH_LONG).show();
         }
 
         // build list elements

BlinkOCRDemo/BlinkOCRDetectorDemo/src/main/res/values/strings.xml → BlinkInputDemo/BlinkInputDetectorDemo/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">BlinkOCRDetectorDemo</string>
+    <string name="app_name">BlinkInput Detector Demo</string>
     <string name="autofocus_fail">Camera cannot autofocus. Please try scanning under better light</string>
     <string name="id_detector">ID card detector</string>
     <string name="cheque_detector">Cheque detector</string>
@@ -8,5 +8,5 @@
     <string name="a4_landscape_detector">A4 document (landscape) detector</string>
     <string name="templating_api_example">Templating API example (Croatian ID Front Side)</string>
     <string name="err_license">Invalid licence key</string>
-    <string name="title_activity_menu">Blink OCR Detector</string>
+    <string name="title_activity_menu">BlinkInput Detector</string>
 </resources>

BlinkOCRDemo/BlinkOCRDirectAPI/build.gradle → BlinkInputDemo/BlinkInputDirectAPI/build.gradle

@@ -4,7 +4,7 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
-        applicationId 'com.microblink.ocr'
+        applicationId 'com.microblink.input'
         minSdkVersion 10
         targetSdkVersion rootProject.ext.targetSdkVersion
     }
@@ -21,7 +21,7 @@ android {
 }
 
 dependencies {
-    compile("com.microblink:blinkocr:${rootProject.ext.blinkOcrVersion}@aar") {
+    compile("com.microblink:blinkinput:${rootProject.ext.blinkInputVersion}@aar") {
         transitive = true
     }
 }

BlinkOCRDemo/BlinkOCRDirectAPI/src/main/java/com/microblink/ocr/MenuActivity.java → BlinkInputDemo/BlinkInputDirectAPI/src/main/java/com/microblink/ocr/MenuActivity.java

@@ -52,7 +52,7 @@ public class MenuActivity extends Activity {
 
     // obtain your licence key at http://microblink.com/login or
     // contact us at http://help.microblink.com
-    private static final String LICENSE_KEY = "H5SIMEWT-YGSAO47Z-LEJJI2C6-ZOIHQI4S-HAQIOSRB-MKYTEYZT-UGBW36CI-C2LAREQJ";
+    private static final String LICENSE_KEY = "OEWESRMK-OENGL3VK-IVWYB4DY-OTNT457T-5PGLUYNA-IVQ2ARLB-UBCWCAAC-IYXKU56C";
 
     private static final int MY_REQUEST_CODE = 1337;
     private static final String TAG = "DirectApiDemo";

BlinkOCRDemo/BlinkOCRDirectAPI/src/main/res/values/strings.xml → BlinkInputDemo/BlinkInputDirectAPI/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">BlinkOCR Direct API</string>
+    <string name="app_name">BlinkInput Direct API Demo</string>
 
     <string name="scan">Scan</string>
     <string name="takePhoto">Take Photo</string>

BlinkOCRDemo/BlinkOCRSegmentDemo/build.gradle → BlinkInputDemo/BlinkInputFullScreen/build.gradle

@@ -4,7 +4,7 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
-        applicationId 'com.microblink.ocr'
+        applicationId 'com.microblink.input'
         minSdkVersion 10
         targetSdkVersion rootProject.ext.targetSdkVersion
     }
@@ -21,7 +21,7 @@ android {
 }
 
 dependencies {
-    compile("com.microblink:blinkocr:${rootProject.ext.blinkOcrVersion}@aar") {
+    compile("com.microblink:blinkinput:${rootProject.ext.blinkInputVersion}@aar") {
         transitive = true
     }
 }

BlinkOCRDemo/BlinkOCRFullScreen/src/main/java/com/microblink/ocr/FullScreenOCR.java → BlinkInputDemo/BlinkInputFullScreen/src/main/java/com/microblink/ocr/FullScreenOCR.java

@@ -43,7 +43,7 @@ public class FullScreenOCR extends Activity implements MetadataListener, CameraE
 
     // obtain your licence key at http://microblink.com/login or
     // contact us at http://help.microblink.com
-    private static final String LICENSE_KEY = "H5SIMEWT-YGSAO47Z-LEJJI2C6-ZOIHQI4S-HAQIOSRB-MKYTEYZT-UGBW36CI-C2LAREQJ";
+    private static final String LICENSE_KEY = "OEWESRMK-OENGL3VK-IVWYB4DY-OTNT457T-5PGLUYNA-IVQ2ARLB-UBCWCAAC-IYXKU56C";
 
     /** RecognizerView is the built-in view that controls camera and recognition */
     private RecognizerView mRecognizerView;

BlinkOCRDemo/BlinkOCRFullScreen/src/main/res/values/strings.xml → BlinkInputDemo/BlinkInputFullScreen/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Blink OCR Full Screen</string>
+    <string name="app_name">BlinkInput Full Screen Demo</string>
 
 </resources>

BlinkOCRDemo/BlinkOCRRandomScanDemo/build.gradle → BlinkInputDemo/BlinkInputRandomScanDemo/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        applicationId "com.microblink.ocr"
+        applicationId "com.microblink.input"
         minSdkVersion 10
         targetSdkVersion rootProject.ext.targetSdkVersion
     }
@@ -24,7 +24,7 @@ android {
 }
 
 dependencies {
-    compile("com.microblink:blinkocr:${rootProject.ext.blinkOcrVersion}@aar") {
+    compile("com.microblink:blinkinput:${rootProject.ext.blinkInputVersion}@aar") {
         transitive = true
     }
 }

BlinkOCRDemo/BlinkOCRRandomScanDemo/src/main/java/com/microblink/ocr/MainActivity.java → BlinkInputDemo/BlinkInputRandomScanDemo/src/main/java/com/microblink/ocr/MainActivity.java

@@ -16,7 +16,7 @@ public class MainActivity extends Activity {
 
     // obtain your licence key at http://microblink.com/login or
     // contact us at http://help.microblink.com
-    private static final String LICENSE_KEY = "TZMOTPX3-T2PISTLU-SNNFECKO-2ZRLCMTD-GOQYG3PY-JHFBSHOZ-ELLGEMIQ-JJOWNBAP";
+    private static final String LICENSE_KEY = "OEWESRMK-OENGL3VK-IVWYB4DY-OTNT457T-5PGLUYNA-IVQ2ARLB-UBCWCAAC-IYXKU56C";
 
     private static final int SINGLE_GROUP_REQ_CODE = 123;
     private static final int MULTIPLE_GROUPS_REQ_CODE = 234;
@@ -42,7 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
      */
     public void onScanSingleGroup(View view) {
         /**
-         * In this simple example we will use BlinkOCR SDK to create a simple app
+         * In this simple example we will use BlinkInput SDK to create a simple app
          * that scans an amount, IBAN and date from invoice. We will use provided RandomScanActivity
          * to perform scan. In this case all parsers can be placed in the same parser group, so we will use
          * default settings (if parser groups are not defined, all parsers will be placed in the same

BlinkOCRDemo/BlinkOCRRandomScanDemo/src/main/res/values/strings.xml → BlinkInputDemo/BlinkInputRandomScanDemo/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">BlinkOCRRandomScanDemo</string>
+    <string name="app_name">BlinkInput Random Scan Demo</string>
 
     <string name="iban_title">IBAN</string>
     <string name="amount_title">Amount</string>

BlinkOCRDemo/BlinkOCRFullScreen/build.gradle → BlinkInputDemo/BlinkInputSegmentDemo/build.gradle

@@ -4,7 +4,7 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
-        applicationId 'com.microblink.ocr'
+        applicationId 'com.microblink.input'
         minSdkVersion 10
         targetSdkVersion rootProject.ext.targetSdkVersion
     }
@@ -21,7 +21,7 @@ android {
 }
 
 dependencies {
-    compile("com.microblink:blinkocr:${rootProject.ext.blinkOcrVersion}@aar") {
+    compile("com.microblink:blinkinput:${rootProject.ext.blinkInputVersion}@aar") {
         transitive = true
     }
 }

BlinkOCRDemo/BlinkOCRSegmentDemo/src/main/java/com/microblink/ocr/MainActivity.java → BlinkInputDemo/BlinkInputSegmentDemo/src/main/java/com/microblink/ocr/MainActivity.java

@@ -21,7 +21,7 @@ public class MainActivity extends Activity {
     private static final int BLINK_OCR_REQUEST_CODE = 100;
     // obtain your licence key at http://microblink.com/login or
     // contact us at http://help.microblink.com
-    private static final String LICENSE_KEY = "OE3CJCUH-JIRME5GT-YGVQ4IWW-MKYTEYZT-UGBW36CJ-ZIMR3WJC-2ZRLCEW4-INKK4C4M";
+    private static final String LICENSE_KEY = "OEWESRMK-OENGL3VK-IVWYB4DY-OTNT457T-5PGLUYNA-IVQ2ARLB-UBCWCAAC-IYXKU56C";
     private static final String NAME_TOTAL_AMOUNT = "TotalAmount";
     private static final String NAME_TAX = "Tax";
     private static final String NAME_IBAN = "IBAN";
@@ -52,7 +52,7 @@ public void advancedIntegration(View v) {
      */
     public void simpleIntegration(View v) {
         /*
-         * In this simple example we will use BlinkOCR SDK to create a simple app
+         * In this simple example we will use BlinkInput SDK to create a simple app
          * that scans an amount from invoice, tax amount from invoice and IBAN
          * to which amount has to be paid.
          */
@@ -139,7 +139,7 @@ public void regexExample(View v) {
      */
     public void mobileCouponsExample(View view) {
         /*
-         * In this simple example we will use BlinkOCR SDK to create a simple app
+         * In this simple example we will use BlinkInput SDK to create a simple app
          * that scans prepaid mobile coupon codes.
          */
 

BlinkOCRDemo/BlinkOCRSegmentDemo/src/main/java/com/microblink/ocr/ScanActivity.java → BlinkInputDemo/BlinkInputSegmentDemo/src/main/java/com/microblink/ocr/ScanActivity.java

@@ -42,7 +42,7 @@ public class ScanActivity extends Activity implements CameraEventsListener, Scan
 
     // obtain your licence key at http://microblink.com/login or
     // contact us at http://help.microblink.com
-    private static final String LICENSE_KEY = "H5SIMEWT-YGSAO47Z-LEJJI2C6-ZOIHQI4S-HAQIOSRB-MKYTEYZT-UGBW36CI-C2LAREQJ";
+    private static final String LICENSE_KEY = "OEWESRMK-OENGL3VK-IVWYB4DY-OTNT457T-5PGLUYNA-IVQ2ARLB-UBCWCAAC-IYXKU56C";
     /** CameraPermissionManager is provided helper class that can be used to obtain the permission to use camera.
      * It is used on Android 6.0 (API level 23) or newer.
      */

BlinkOCRDemo/BlinkOCRSegmentDemo/src/main/res/values/strings.xml → BlinkInputDemo/BlinkInputSegmentDemo/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Blink OCR Segment Demo</string>
-    <string name="title_activity_scan">Blink OCR</string>
+    <string name="app_name">BlinkInput Segment Demo</string>
+    <string name="title_activity_scan">BlinkInput</string>
 
     <string name="amount_title">Total Amount</string>
     <string name="large_amount_title">Large Amount</string>

BlinkOCRDemo/build.gradle → BlinkInputDemo/build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.2'
     }
 }
 
@@ -19,8 +19,8 @@ allprojects {
 // versions of libraries that all modules require
 
 project.ext {
-    blinkOcrVersion = '2.8.0'
+    blinkInputVersion = '3.0.0'
     compileSdkVersion = 24
     targetSdkVersion = 23
-    buildToolsVersion = '24.0.2'
+    buildToolsVersion = '25.0.0'
 }

BlinkInputDemo/settings.gradle

@@ -0,0 +1 @@
+include ':BlinkInputSegmentDemo', ':BlinkInputFullScreen', ':BlinkInputDirectAPI', ':BlinkInputCombination', ':BlinkInputDetectorDemo', 'BlinkInputRandomScanDemo'