Merge branch 'release/1.0.11'

Author: Mateusz Maziec

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.40'
+    ext.kotlin_version = '1.2.41'
     repositories {
         google()
         jcenter()

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

@@ -72,40 +72,69 @@ class BarcodeView : FrameLayout {
     fun getObservable(): Observable<Barcode> {
         return getSurfaceObservable()
                 .flatMap { BarcodeScanner(context, cameraView.holder, config, it).getObservable() }
-                .subscribeOn(Schedulers.io())
     }
 
+    /**
+     * Set the preview size for the camera source.
+     * The given size is calculated to the closet value from camera available sizes.
+     * @param width default value is 640
+     * @param height default value is 480
+     */
     fun setPreviewSize(width: Int, height: Int): BarcodeView {
         config.previewSize = Size(width, height)
 
         return this
     }
 
+    /**
+     * Enable autofocus.
+     * @param enabled Default value is true
+     */
     fun setAutoFocus(enabled: Boolean): BarcodeView {
         config.isAutoFocus = enabled
 
         return this
     }
 
+    /**
+     * Set which barcode format should be detected.
+     * @param formats Default value is Barcode.ALL_FORMATS
+     * @see Barcode
+     */
     fun setBarcodeFormats(vararg formats: Int): BarcodeView {
         config.barcodeFormat = formats.sum()
 
         return this
     }
 
+    /**
+     * Set camera facing.
+     * @param facing Default value is CameraSource.CAMERA_FACING_BACK
+     * @see com.google.android.gms.vision.CameraSource
+     */
     fun setFacing(facing: Int): BarcodeView {
         config.facing = facing
 
         return this
     }
 
+    /**
+     * Draw a overlay view over the detected barcode.
+     * For custom view visit the github documentation.
+     * @param overlay Default overlay is a white rect
+     * @see <a href="https://github.com/bobekos/SimpleBarcodeScanner#custom-overlay">Custom overlay</a>
+     */
     fun drawOverlay(overlay: BarcodeOverlay? = BarcodeRectOverlay(context)): BarcodeView {
         drawOverlay = overlay
         config.drawOverLay = true
 
         return this
     }
 
+    /**
+     * Enable camera flash.
+     * @param enabled Default value is false
+     */
     fun setFlash(enabled: Boolean): BarcodeView {
         config.useFlash = enabled
 
@@ -139,7 +168,7 @@ class BarcodeView : FrameLayout {
             if (cameraView.holder.surface.isValid && !emitter.isDisposed) {
                 onSurfaceReady(emitter)
             }
-        }
+        }.subscribeOn(Schedulers.io())
     }
 
     private fun onSurfaceReady(emitter: ObservableEmitter<Boolean>) {

scanner/src/main/java/com/bobekos/bobek/scanner/overlay/BarcodeOverlay.kt

@@ -5,5 +5,11 @@ import android.graphics.Rect
 
 interface BarcodeOverlay {
 
+    /**
+     * Is called when barcode detection fired. Make sure to redraw you custom view
+     * on each time. When no barcode is found the method calls with empty parameters.
+     * @param posRect The position of the barcode on the screen
+     * @param barcodeValue The 'displayValue' parameter of the google barcode class
+     */
     fun onUpdate(posRect: Rect = Rect(), barcodeValue: String = "")
 }

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

@@ -12,6 +12,7 @@ import com.google.android.gms.vision.barcode.Barcode
 import com.google.android.gms.vision.barcode.BarcodeDetector
 import io.reactivex.Observable
 import io.reactivex.ObservableEmitter
+import io.reactivex.schedulers.Schedulers
 
 
 internal class BarcodeScanner(
@@ -51,7 +52,7 @@ internal class BarcodeScanner(
                     }
                 }
             }
-        }
+        }.subscribeOn(Schedulers.io())
     }
 
     inner class BarcodeTracker(private val subscriber: ObservableEmitter<Barcode>) : Tracker<Barcode>() {