Merge branch 'feature/code_clean_up' into develop

Mateusz Maziec · Mateusz Maziec · commit 3ddcff21ae33 · 2018-03-26T18:54:24.000+02:00
diff --git a/app/src/main/java/com/bobekos/bobek/simplebarcodescanner/MainActivity.kt b/app/src/main/java/com/bobekos/bobek/simplebarcodescanner/MainActivity.kt
@@ -5,15 +5,22 @@ 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()
 
-        barcodeView
+        disposable = barcodeView
                 .setBarcodeFormats(Barcode.QR_CODE)
                 .drawOverlay()
                 .getObservable()
@@ -26,4 +33,10 @@ class MainActivity : AppCompatActivity() {
                             Toast.makeText(this@MainActivity, it.message, Toast.LENGTH_LONG).show()
                         })
     }
-}
+
+    override fun onStop() {
+        super.onStop()
+
+        disposable?.dispose()
+    }
+}
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/BarcodeRectOverlay.kt b/scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeRectOverlay.kt
@@ -24,7 +24,7 @@ class BarcodeRectOverlay : View, BarcodeOverlay {
 
     private val paint by lazy {
         Paint().apply {
-            color = Color.RED
+            color = Color.WHITE
             style = Paint.Style.STROKE
             strokeWidth = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 3f, context?.resources?.displayMetrics)
         }
diff --git a/scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeScanner.kt b/scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeScanner.kt
@@ -14,7 +14,7 @@ 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 org.reactivestreams.Subscriber
+import io.reactivex.ObservableEmitter
 
 
 internal class BarcodeScanner(
@@ -28,35 +28,46 @@ internal class BarcodeScanner(
                 .build()
     }
 
+    private val cameraSource by lazy {
+        getCameraSource(config.previewSize, config.isAutoFocus)
+    }
+
     @SuppressLint("MissingPermission")
     fun getObservable(): Observable<Barcode> {
-        return Observable.fromPublisher<Barcode> {
-            if (context == null) {
-                it.onError(NullPointerException("Context is null"))
+        return Observable.create { emitter ->
+            if (context == null && !emitter.isDisposed) {
+                emitter.onError(NullPointerException("Context is null"))
             } else {
                 if (checkPermission()) {
-                    getCameraSource(config.previewSize, config.isAutoFocus).start(holder)
+                    cameraSource.start(holder)
 
-                    val tracker = BarcodeTracker(it)
+                    val tracker = BarcodeTracker(emitter)
                     val processor = MultiProcessor.Builder(BarcodeTrackerFactory(tracker)).build()
-
                     barcodeDetector.setProcessor(processor)
                 } else {
-                    it.onError(SecurityException("Permission Denial: Camera"))
+                    if (!emitter.isDisposed) {
+                        emitter.onError(SecurityException("Permission Denial: Camera"))
+                    }
+                }
+
+                emitter.setCancellable {
+                    cameraSource.release()
                 }
             }
         }
     }
 
-    inner class BarcodeTracker(private val subscriber: Subscriber<in Barcode>) : Tracker<Barcode>() {
+    inner class BarcodeTracker(private val subscriber: ObservableEmitter<Barcode>) : Tracker<Barcode>() {
 
         override fun onNewItem(id: Int, barcode: Barcode?) {
             if (barcode != null) {
-                subscriber.onNext(barcode)
-
                 if (config.drawOverLay) {
                     BarcodeView.overlaySubject.onNext(barcode.boundingBox)
                 }
+
+                if (!subscriber.isDisposed) {
+                    subscriber.onNext(barcode)
+                }
             }
         }
 
diff --git a/scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeView.kt b/scanner/src/main/java/com/bobekos/bobek/scanner/BarcodeView.kt
@@ -9,6 +9,7 @@ import android.view.View
 import android.widget.FrameLayout
 import com.google.android.gms.vision.barcode.Barcode
 import io.reactivex.Observable
+import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
@@ -57,29 +58,11 @@ class BarcodeView : FrameLayout {
         addView(cameraView)
     }
 
+    //region public
     fun getObservable(): Observable<Barcode> {
-        return Observable.fromPublisher<SurfaceHolder> {
-            cameraView.holder.addCallback(object : SurfaceHolder.Callback {
-                override fun surfaceChanged(p0: SurfaceHolder?, p1: Int, p2: Int, p3: Int) {
-
-                }
-
-                override fun surfaceDestroyed(p0: SurfaceHolder?) {
-                    overlayDisposable?.dispose()
-                    it.onComplete()
-                }
-
-                override fun surfaceCreated(holder: SurfaceHolder?) {
-                    if (drawOverlay != null) {
-                        startOverlay()
-                    }
-
-                    it.onNext(holder)
-                }
-            })
-        }.flatMap {
-            BarcodeScanner(context, it, config).getObservable()
-        }.subscribeOn(Schedulers.io())
+        return getSurfaceObservable()
+                .flatMap { BarcodeScanner(context, it, config).getObservable() }
+                .subscribeOn(Schedulers.io())
     }
 
     fun setPreviewSize(width: Int, height: Int): BarcodeView {
@@ -106,17 +89,52 @@ class BarcodeView : FrameLayout {
 
         return this
     }
+    //endregion
+
+    //region private
+    private fun getSurfaceObservable(): Observable<SurfaceHolder> {
+        return Observable.create<SurfaceHolder> { emitter ->
+            cameraView.holder.addCallback(object : SurfaceHolder.Callback {
+                override fun surfaceChanged(p0: SurfaceHolder?, p1: Int, p2: Int, p3: Int) {
+
+                }
+
+                override fun surfaceDestroyed(p0: SurfaceHolder?) {
+                    overlayDisposable?.dispose()
+
+                    if (!emitter.isDisposed) {
+                        emitter.onComplete()
+                    }
+                }
+
+                override fun surfaceCreated(holder: SurfaceHolder?) {
+                    if (drawOverlay != null) {
+                        startOverlay()
+                    }
+
+                    if (holder != null && !emitter.isDisposed) {
+                        emitter.onNext(holder)
+                    }
+                }
+            })
+        }
+    }
+
 
     private fun startOverlay() {
+        removeView(drawOverlay as View)
         addView(drawOverlay as View, FrameLayout.LayoutParams(width, height))
 
         overlayDisposable = overlaySubject
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe {
-                    if (drawOverlay != null) {
-                        drawOverlay?.onUpdate(calculateOverlayView(it))
-                    }
-                }
+                .filter { drawOverlay != null }
+                .subscribe(
+                        {
+                            drawOverlay?.onUpdate(calculateOverlayView(it))
+                        },
+                        {
+                            drawOverlay?.onUpdate(Rect())
+                        })
     }
 
     private fun calculateOverlayView(barcodeRect: Rect): Rect {
@@ -137,4 +155,5 @@ class BarcodeView : FrameLayout {
     private fun translateY(y: Int): Int {
         return (y * yScaleFactor).toInt()
     }
+    //endregion
 }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class BarcodeRectOverlay : View, BarcodeOverlay {`
`24`	`24`
`25`	`25`	`private val paint by lazy {`
`26`	`26`	`Paint().apply {`
`27`		`- color = Color.RED`
	`27`	`+ color = Color.WHITE`
`28`	`28`	`style = Paint.Style.STROKE`
`29`	`29`	`strokeWidth = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 3f, context?.resources?.displayMetrics)`
`30`	`30`	`}`