Merge branch 'release/1.0.2'

Mateusz Maziec · Mateusz Maziec · commit ded76883090b · 2018-03-26T18:54:59.000+02:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,4 +30,6 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+
+    implementation project(path: ':scanner')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.bobekos.bobek.simplebarcodescanner">
 
+    <uses-permission android:name="android.permission.CAMERA"/>
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/bobekos/bobek/simplebarcodescanner/MainActivity.kt b/app/src/main/java/com/bobekos/bobek/simplebarcodescanner/MainActivity.kt
@@ -1,12 +1,42 @@
 package com.bobekos.bobek.simplebarcodescanner
 
-import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import android.widget.Toast
+import com.google.android.gms.vision.barcode.Barcode
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.Disposable
+import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
 
+    private var disposable: Disposable? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
     }
-}
+
+    override fun onStart() {
+        super.onStart()
+
+        disposable = barcodeView
+                .setBarcodeFormats(Barcode.QR_CODE)
+                .drawOverlay()
+                .getObservable()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                        {
+                            Toast.makeText(this@MainActivity, it.displayValue, Toast.LENGTH_SHORT).show()
+                        },
+                        {
+                            Toast.makeText(this@MainActivity, it.message, Toast.LENGTH_LONG).show()
+                        })
+    }
+
+    override fun onStop() {
+        super.onStop()
+
+        disposable?.dispose()
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -5,15 +5,17 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".MainActivity"
+    android:id="@+id/root">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+    <com.bobekos.bobek.scanner.BarcodeView
+        android:id="@+id/barcodeView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <FrameLayout
+        android:id="@+id/framelayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
 </android.support.constraint.ConstraintLayout>
diff --git a/build.gradle b/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.30'
+    ext.kotlin_version = '1.2.31'
     repositories {
         google()
         jcenter()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0-alpha06'
+        classpath 'com.android.tools.build:gradle:3.2.0-alpha07'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 
diff --git a/scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeOverlay.kt b/scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeOverlay.kt
@@ -0,0 +1,9 @@
+package com.bobekos.bobek.scanner
+
+import android.graphics.Rect
+
+
+interface BarcodeOverlay {
+
+    fun onUpdate(posRect: Rect)
+}
diff --git a/scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeRectOverlay.kt b/scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeRectOverlay.kt
@@ -0,0 +1,45 @@
+package com.bobekos.bobek.scanner
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.Rect
+import android.util.AttributeSet
+import android.util.TypedValue
+import android.view.View
+
+
+class BarcodeRectOverlay : View, BarcodeOverlay {
+
+    constructor(context: Context?) : super(context)
+    constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
+    constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
+
+    private var rect: Rect? = null
+
+    init {
+        setWillNotDraw(false)
+    }
+
+    private val paint by lazy {
+        Paint().apply {
+            color = Color.WHITE
+            style = Paint.Style.STROKE
+            strokeWidth = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 3f, context?.resources?.displayMetrics)
+        }
+    }
+
+    override fun onUpdate(posRect: Rect) {
+        rect = posRect
+        invalidate()
+    }
+
+    override fun onDraw(canvas: Canvas?) {
+        super.onDraw(canvas)
+
+        if (rect != null) {
+            canvas?.drawRect(rect, paint)
+        }
+    }
+}
diff --git a/scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeScanner.kt b/scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeScanner.kt
@@ -4,54 +4,96 @@ import android.Manifest
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.PackageManager
+import android.graphics.Rect
 import android.support.v4.app.ActivityCompat
 import android.view.SurfaceHolder
-import com.bobekos.bobek.scanner.BarcodeTrackerFactory
 import com.google.android.gms.vision.CameraSource
+import com.google.android.gms.vision.Detector
 import com.google.android.gms.vision.MultiProcessor
+import com.google.android.gms.vision.Tracker
 import com.google.android.gms.vision.barcode.Barcode
 import com.google.android.gms.vision.barcode.BarcodeDetector
 import io.reactivex.Observable
+import io.reactivex.ObservableEmitter
 
 
-class BarcodeScanner(private val context: Context?, private val holder: SurfaceHolder) {
+internal class BarcodeScanner(
+        private val context: Context?,
+        private val holder: SurfaceHolder,
+        private val config: BarcodeScannerConfig) {
 
     private val barcodeDetector by lazy {
-        BarcodeDetector.Builder(context).build()
+        BarcodeDetector.Builder(context)
+                .setBarcodeFormats(config.barcodeFormat)
+                .build()
+    }
+
+    private val cameraSource by lazy {
+        getCameraSource(config.previewSize, config.isAutoFocus)
     }
 
     @SuppressLint("MissingPermission")
     fun getObservable(): Observable<Barcode> {
-        return Observable.create<Barcode> { emitter ->
-
-            if (context == null) {
+        return Observable.create { emitter ->
+            if (context == null && !emitter.isDisposed) {
                 emitter.onError(NullPointerException("Context is null"))
             } else {
                 if (checkPermission()) {
-                    getCameraSource().start(holder)
+                    cameraSource.start(holder)
+
+                    val tracker = BarcodeTracker(emitter)
+                    val processor = MultiProcessor.Builder(BarcodeTrackerFactory(tracker)).build()
+                    barcodeDetector.setProcessor(processor)
                 } else {
-                    emitter.onError(SecurityException("Permission Denial: Camera"))
+                    if (!emitter.isDisposed) {
+                        emitter.onError(SecurityException("Permission Denial: Camera"))
+                    }
                 }
 
-                val processor = MultiProcessor.Builder(BarcodeTrackerFactory({
-                    if (holder.surface == null || !holder.surface.isValid) {
-                        emitter.onComplete()
-                    } else if (it != null) {
-                        emitter.onNext(it)
-                    }
-                })).build()
+                emitter.setCancellable {
+                    cameraSource.release()
+                }
+            }
+        }
+    }
+
+    inner class BarcodeTracker(private val subscriber: ObservableEmitter<Barcode>) : Tracker<Barcode>() {
+
+        override fun onNewItem(id: Int, barcode: Barcode?) {
+            if (barcode != null) {
+                if (config.drawOverLay) {
+                    BarcodeView.overlaySubject.onNext(barcode.boundingBox)
+                }
+
+                if (!subscriber.isDisposed) {
+                    subscriber.onNext(barcode)
+                }
+            }
+        }
+
+        override fun onUpdate(detection: Detector.Detections<Barcode>?, barcode: Barcode?) {
+            if (barcode != null && config.drawOverLay) {
+                BarcodeView.overlaySubject.onNext(barcode.boundingBox)
+            }
+        }
+
+        override fun onMissing(p0: Detector.Detections<Barcode>?) {
+
+        }
 
-                barcodeDetector.setProcessor(processor)
+        override fun onDone() {
+            if (config.drawOverLay) {
+                BarcodeView.overlaySubject.onNext(Rect())
             }
         }
     }
 
-    private fun getCameraSource(): CameraSource {
+    private fun getCameraSource(size: Size, isAutoFocus: Boolean): CameraSource {
         return CameraSource.Builder(context, barcodeDetector)
                 .setFacing(CameraSource.CAMERA_FACING_BACK)
-                .setRequestedPreviewSize(640, 480)
+                .setRequestedPreviewSize(size.width, size.height)
                 .setRequestedFps(15.0f)
-                .setAutoFocusEnabled(true)
+                .setAutoFocusEnabled(isAutoFocus)
                 .build()
     }
 
diff --git a/scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeScannerConfig.kt b/scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeScannerConfig.kt
@@ -0,0 +1,11 @@
+package com.bobekos.bobek.scanner
+
+import com.google.android.gms.vision.barcode.Barcode
+
+
+internal data class BarcodeScannerConfig(
+        var isAutoFocus: Boolean = true,
+        var drawOverLay: Boolean = false,
+        var previewSize: Size = Size(640, 480),
+        var barcodeFormat: Int = Barcode.ALL_FORMATS
+)
diff --git a/scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeTrackerFactory.kt b/scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeTrackerFactory.kt
@@ -1,31 +1,13 @@
 package com.bobekos.bobek.scanner
 
-import com.google.android.gms.vision.Detector
 import com.google.android.gms.vision.MultiProcessor
 import com.google.android.gms.vision.Tracker
 import com.google.android.gms.vision.barcode.Barcode
 
 
-class BarcodeTrackerFactory(private val callback: (barcode: Barcode?) -> Unit) : MultiProcessor.Factory<Barcode> {
+internal class BarcodeTrackerFactory(private val tracker: Tracker<Barcode>) : MultiProcessor.Factory<Barcode> {
 
     override fun create(p0: Barcode?): Tracker<Barcode> {
-        return BarcodeTracker(callback)
-    }
-
-    class BarcodeTracker(private val callback: (barcode: Barcode?) -> Unit) : Tracker<Barcode>() {
-
-        override fun onNewItem(id: Int, barcode: Barcode?) {
-            callback(barcode)
-        }
-
-        override fun onUpdate(p0: Detector.Detections<Barcode>?, p1: Barcode?) {
-        }
-
-        override fun onMissing(p0: Detector.Detections<Barcode>?) {
-        }
-
-        override fun onDone() {
-        }
-
+        return tracker
     }
 }
diff --git a/scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeView.kt b/scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeView.kt
diff --git a/scanner/src/main/java/com/bobekos/bobek/scanner/Size.kt b/scanner/src/main/java/com/bobekos/bobek/scanner/Size.kt

Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,6 @@ dependencies {`
`30`	`30`	`testImplementation 'junit:junit:4.12'`
`31`	`31`	`androidTestImplementation 'com.android.support.test:runner:1.0.1'`
`32`	`32`	`androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'`
	`33`	`+`
	`34`	`+ implementation project(path: ':scanner')`
`33`	`35`	`}`