Merge branch 'release/1.0.20'

Author: Mateusz Maziec

app/build.gradle

@@ -5,14 +5,14 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.bobekos.bobek.simplebarcodescanner"
         minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -25,7 +25,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
 
     testImplementation 'junit:junit:4.12'
 

app/src/main/java/com/bobekos/bobek/simplebarcodescanner/MainActivity.kt

@@ -1,7 +1,7 @@
 package com.bobekos.bobek.simplebarcodescanner
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.widget.Toast
 import com.google.android.gms.vision.CameraSource
 import io.reactivex.android.schedulers.AndroidSchedulers

build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.51'
+    ext.kotlin_version = '1.3.10'
     repositories {
         google()
         jcenter()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0-alpha03'
+        classpath 'com.android.tools.build:gradle:3.4.0-alpha02'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 

gradle.properties

@@ -6,6 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Aug 01 21:01:12 CEST 2018
+#Sat Oct 27 00:18:43 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

scanner/build.gradle

@@ -4,15 +4,15 @@ apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.bobekos'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 27
-        versionCode 18
-        versionName "1.0.18"
+        targetSdkVersion 28
+        versionCode 20
+        versionName "1.0.20"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -28,18 +28,18 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:support-media-compat:27.1.1'
-    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
+    implementation 'androidx.media:media:1.1.0-alpha01'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
     testImplementation 'junit:junit:4.12'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    api 'com.google.android.gms:play-services-gcm:15.0.1'
-    api 'com.google.android.gms:play-services-vision:15.0.2'
+    api 'com.google.android.gms:play-services-gcm:16.0.0'
+    api 'com.google.android.gms:play-services-vision:17.0.2'
 
-    api "io.reactivex.rxjava2:rxandroid:2.0.2"
-    api "io.reactivex.rxjava2:rxjava:2.1.15"
+    api "io.reactivex.rxjava2:rxandroid:2.1.0"
+    api "io.reactivex.rxjava2:rxjava:2.2.3"
 }
 repositories {
     mavenCentral()

scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeView.kt

@@ -6,11 +6,14 @@ import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.graphics.Color
 import android.graphics.Rect
-import android.support.v4.app.ActivityCompat
 import android.util.AttributeSet
 import android.util.DisplayMetrics
-import android.view.*
+import android.view.SurfaceHolder
+import android.view.SurfaceView
+import android.view.View
+import android.view.WindowManager
 import android.widget.FrameLayout
+import androidx.core.app.ActivityCompat
 import com.bobekos.bobek.scanner.overlay.BarcodeOverlay
 import com.bobekos.bobek.scanner.overlay.BarcodeRectOverlay
 import com.bobekos.bobek.scanner.overlay.Optional
@@ -23,7 +26,6 @@ import io.reactivex.Observable
 import io.reactivex.ObservableEmitter
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
-import io.reactivex.schedulers.Schedulers
 import io.reactivex.subjects.PublishSubject
 
 
@@ -63,15 +65,15 @@ class BarcodeView : FrameLayout {
         BarcodeScanner(context, cameraView.holder, config)
     }
 
-    constructor(context: Context?) : super(context) {
+    constructor(context: Context) : super(context) {
         init(null)
     }
 
-    constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) {
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
         init(attrs)
     }
 
-    constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
         init(attrs)
     }
 
@@ -165,6 +167,17 @@ class BarcodeView : FrameLayout {
     fun setVibration(duration: Long = 500) = apply {
         config.vibrateDuration = duration
     }
+
+    /**
+     * If this function is set, the DetectorNotReadyException will
+     * be thrown in onError if isOperational function of the detector return false.
+     * By default the subscription is resubscribed every 3 seconds until the detector is ready.
+     * Use only if you want to handle this exception by yourself.
+     * @see <a href="https://developers.google.com/android/reference/com/google/android/gms/vision/barcode/BarcodeDetector.html#isOperational()">BarcodeDetector.isOperational()</a>
+     */
+    fun setManualIsOperationalCheck() = apply {
+        config.isManualOperationalCheck = true
+    }
     //endregion
 
     //region private

scanner/src/main/java/com/bobekos/bobek/scanner/scanner/BarcodeScanner.kt

@@ -15,6 +15,7 @@ import io.reactivex.ObservableEmitter
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 import io.reactivex.subjects.PublishSubject
+import java.util.concurrent.TimeUnit
 
 
 internal class BarcodeScanner(
@@ -46,6 +47,8 @@ internal class BarcodeScanner(
             } else {
                 if (context == null && !emitter.isDisposed) {
                     emitter.onError(NullPointerException("Context is null"))
+                } else if (!barcodeDetector.isOperational) {
+                    emitter.onError(DetectorNotReadyException())
                 } else {
                     camera.init(barcodeDetector).getCameraSource()?.start(holder)
                     camera.setParametersFromConfig()
@@ -70,6 +73,15 @@ internal class BarcodeScanner(
             if (config.vibrateDuration > 0) {
                 DetectionHelper.vibrate(context, config.vibrateDuration)
             }
+        }.retryWhen { exc ->
+            exc.flatMap {
+                if (it is DetectorNotReadyException && !config.isManualOperationalCheck) {
+                    Observable.timer(3, TimeUnit.SECONDS)
+                } else {
+                    Observable.error(it)
+                }
+            }
+
         }.subscribeOn(Schedulers.io())
     }
 

scanner/src/main/java/com/bobekos/bobek/scanner/scanner/BarcodeScannerConfig.kt

@@ -12,5 +12,6 @@ internal data class BarcodeScannerConfig(
         var previewSize: Size,
         var barcodeFormat: Int = Barcode.ALL_FORMATS,
         var playBeep: Boolean = false,
-        var vibrateDuration: Long = 0
+        var vibrateDuration: Long = 0,
+        var isManualOperationalCheck: Boolean = false
 )

scanner/src/main/java/com/bobekos/bobek/scanner/scanner/DetectorNotReadyException.kt

@@ -0,0 +1,9 @@
+package com.bobekos.bobek.scanner.scanner
+
+/**
+ * When an app is first installed, it may be necessary to download required files.
+ * If this is throw, those files are not yet available.
+ * Usually this download is taken care of at application install time, but this is not guaranteed.
+ * In some cases the download may have been delayed.
+ */
+class DetectorNotReadyException : Exception()