Add ability to auto-accept scanned QR code (closes #10)

NovaCrypto · Jun 7, 2018 · c04cf7d · c04cf7d
1 parent f78ef73
commit c04cf7d
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 11 deletions.
diff --git a/.idea/dictionaries/ackoneb.xml b/.idea/dictionaries/ackoneb.xml
diff --git a/app/src/main/java/io/github/novacrypto/qrscanner/demo/DemoActivity.kt b/app/src/main/java/io/github/novacrypto/qrscanner/demo/DemoActivity.kt
@@ -44,11 +44,20 @@ class DemoActivity : AppCompatActivity() {
         launch.setOnClickListener {
             startActivityForResult(Intent(this, ScanQrActivity::class.java).apply {
                 putExtra(ScanQrActivity.OPTION_SHOW_BARCODE_BOX, BuildConfig.DEBUG)
+                putExtra(ScanQrActivity.AUTOACCEPT_RESULT, false)
+            }, REQUEST_SCAN)
+        }
+
+        // Auto-accept scanner
+        launch_autoaccept.setOnClickListener {
+            startActivityForResult(Intent(this, ScanQrActivity::class.java).apply {
+                putExtra(ScanQrActivity.OPTION_SHOW_BARCODE_BOX, BuildConfig.DEBUG)
+                putExtra(ScanQrActivity.AUTOACCEPT_RESULT, true)
             }, REQUEST_SCAN)
         }
 
         // Custom scanner
-        launch_xpub.setOnClickListener {
+        launch_xpub.setOnClickListener  {
             startActivityForResult(Intent(this, XPubScannerActivity::class.java).apply {
                 putExtra(ScanQrActivity.OPTION_SHOW_BARCODE_BOX, BuildConfig.DEBUG)
             }, REQUEST_SCAN)

diff --git a/app/src/main/res/layout/content_demo.xml b/app/src/main/res/layout/content_demo.xml
@@ -35,12 +35,24 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/launch_scanner"
-        app:layout_constraintBottom_toTopOf="@+id/launch_xpub"
+        app:layout_constraintBottom_toTopOf="@+id/launch_autoaccept"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
+
+    <Button
+        android:id="@+id/launch_autoaccept"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/launch_scanner_auto_accept"
+        app:layout_constraintBottom_toTopOf="@+id/launch_xpub"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/launch"/>
+
     <Button
         android:id="@+id/launch_xpub"
         android:layout_width="wrap_content"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -5,5 +5,6 @@
     <string name="title_activity_scan_xpub">Scan XPub</string>
 
     <string name="launch_scanner">Launch scanner</string>
+    <string name="launch_scanner_auto_accept">Launch scanner auto-accept</string>
     <string name="launch_xpub_scanner">Launch xpub scanner</string>
 </resources>
diff --git a/qrScanner/src/main/java/io/github/novacrypto/qrscanner/Options.kt b/qrScanner/src/main/java/io/github/novacrypto/qrscanner/Options.kt
@@ -21,4 +21,5 @@
 
 package io.github.novacrypto.qrscanner
 
-internal class Options(val showBarcodeBounds: Boolean)
+internal class Options(val showBarcodeBounds: Boolean,
+                       val autoAcceptResult: Boolean)
diff --git a/qrScanner/src/main/java/io/github/novacrypto/qrscanner/QrCamera.kt b/qrScanner/src/main/java/io/github/novacrypto/qrscanner/QrCamera.kt
@@ -68,15 +68,21 @@ internal class QrCamera(
             if (value == field) return
             field = value
             value?.let {
-                Snackbar.make(cameraSurfaceView, it, Snackbar.LENGTH_INDEFINITE)
-                        .setAction(android.R.string.ok, { _ ->
-                            Timber.d("Accepted barcode")
-                            onAccept(it)
-                        })
-                        .show()
+                if (options.autoAcceptResult) {
+                    Timber.d("Accepted barcode automatically")
+                    onAccept(it)
+                } else {
+                    Snackbar.make(cameraSurfaceView, it, Snackbar.LENGTH_INDEFINITE)
+                            .setAction(android.R.string.ok, { _ ->
+                                Timber.d("Accepted barcode")
+                                onAccept(it)
+                            })
+                            .show()
+                }
             }
         }
 
+
     fun start() {
         if (ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
             cameraSurfaceView.start(cameraSource, options)

diff --git a/qrScanner/src/main/java/io/github/novacrypto/qrscanner/ScanQrActivity.kt b/qrScanner/src/main/java/io/github/novacrypto/qrscanner/ScanQrActivity.kt
@@ -34,6 +34,7 @@ open class ScanQrActivity : AppCompatActivity() {
     companion object {
         const val OPTION_SHOW_BARCODE_BOX = "SHOW_BARCODE_BOX"
         const val BARCODE_DATA = "BARCODE_DATA"
+        const val AUTOACCEPT_RESULT = "AUTOACCEPT_RESULT"
         internal const val CAMERA_PERMISSION_RESPONSE = 23
     }
 
@@ -75,8 +76,10 @@ open class ScanQrActivity : AppCompatActivity() {
         super.onDestroy()
     }
 
-    private fun Intent?.toOptions() =
-            Options(this?.extras?.getBoolean(OPTION_SHOW_BARCODE_BOX) ?: false)
+    private fun Intent?.toOptions() = Options(
+            this?.extras?.getBoolean(OPTION_SHOW_BARCODE_BOX) ?: false,
+            this?.extras?.getBoolean(AUTOACCEPT_RESULT) ?: false)
+
 
     override fun onRequestPermissionsResult(
             requestCode: Int,