implements idea from issue #2

kroegerama · Sep 13, 2019 · 8517c56 · 8517c56
1 parent 79bbc6e
commit 8517c56
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,6 +30,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
+    implementation 'com.google.android.material:material:1.0.0'
 
     implementation 'com.kroegerama:android-kaiteki:2.8.1'
 

diff --git a/app/src/main/java/com/kroegerama/bcode/FragDialogExamples.kt b/app/src/main/java/com/kroegerama/bcode/FragDialogExamples.kt
@@ -1,13 +1,15 @@
 package com.kroegerama.bcode
 
 import android.util.Log
+import com.google.android.material.snackbar.Snackbar
 import com.google.zxing.BarcodeFormat
 import com.google.zxing.Result
 import com.kroegerama.kaiteki.baseui.BaseFragment
 import com.kroegerama.kaiteki.bcode.BarcodeResultListener
 import com.kroegerama.kaiteki.bcode.ui.BarcodeBottomSheet
 import com.kroegerama.kaiteki.bcode.ui.BarcodeDialog
 import com.kroegerama.kaiteki.bcode.ui.showBarcodeAlertDialog
+import com.kroegerama.kaiteki.snackBar
 import kotlinx.android.synthetic.main.frag_dialog_examples.*
 
 class FragDialogExamples : BaseFragment(
@@ -39,11 +41,19 @@ class FragDialogExamples : BaseFragment(
         }
     }
 
+    override fun onBarcodeScanCancelled() {
+        snackBar("Scanning cancelled", Snackbar.LENGTH_LONG) {
+            setAction(android.R.string.ok) {
+                dismiss()
+            }
+        }
+    }
+
     override fun onBarcodeResult(result: Result): Boolean {
         Log.d(TAG, "Result: $result")
 
         //return false to not automatically close the dialog
-        return false
+        return true
     }
 
     companion object {

diff --git a/library/build.gradle b/library/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0.3"
+        versionName "1.1.0"
     }
     compileOptions {
         kotlinOptions.freeCompilerArgs += ['-module-name', "barcode.kaiteki"]

diff --git a/library/src/main/java/com/kroegerama/kaiteki/bcode/BarcodeResultListener.kt b/library/src/main/java/com/kroegerama/kaiteki/bcode/BarcodeResultListener.kt
@@ -11,4 +11,6 @@ interface BarcodeResultListener {
      */
     fun onBarcodeResult(result: Result): Boolean
 
+    fun onBarcodeScanCancelled()
+
 }
diff --git a/library/src/main/java/com/kroegerama/kaiteki/bcode/ui/BarcodeAlertDialog.kt b/library/src/main/java/com/kroegerama/kaiteki/bcode/ui/BarcodeAlertDialog.kt
@@ -35,7 +35,12 @@ fun Context.showBarcodeAlertDialog(
     val dlg = AlertDialog.Builder(this)
         .setOnDismissListener { bcode.unbind() }
         .setView(view)
-        .setNegativeButton(android.R.string.cancel, null)
+        .setOnCancelListener {
+            listener.onBarcodeScanCancelled()
+        }
+        .setNegativeButton(android.R.string.cancel) { _, _ ->
+            listener.onBarcodeScanCancelled()
+        }
         .show()
 
     bcode.setFormats(formats)
@@ -50,6 +55,10 @@ fun Context.showBarcodeAlertDialog(
             }
             return doDismiss
         }
+
+        override fun onBarcodeScanCancelled() {
+            //Ignore: BarcodeView will never emit this event
+        }
     })
 
     bcode.bindToLifecycle(owner)

diff --git a/library/src/main/java/com/kroegerama/kaiteki/bcode/ui/BarcodeBottomSheet.kt b/library/src/main/java/com/kroegerama/kaiteki/bcode/ui/BarcodeBottomSheet.kt
@@ -1,5 +1,6 @@
 package com.kroegerama.kaiteki.bcode.ui
 
+import android.content.DialogInterface
 import android.os.Bundle
 import android.os.Handler
 import android.view.LayoutInflater
@@ -74,6 +75,16 @@ class BarcodeBottomSheet : BottomSheetDialogFragment(), BarcodeResultListener {
         return false
     }
 
+    override fun onBarcodeScanCancelled() {
+        //Ignore: BarcodeView will never emit this event
+    }
+
+    override fun onCancel(dialog: DialogInterface) {
+        (parentFragment as? BarcodeResultListener)?.onBarcodeScanCancelled()
+        (activity as? BarcodeResultListener)?.onBarcodeScanCancelled()
+        super.onCancel(dialog)
+    }
+
     companion object {
 
         private const val KEY_FORMATS = "formats"

diff --git a/library/src/main/java/com/kroegerama/kaiteki/bcode/ui/BarcodeDialog.kt b/library/src/main/java/com/kroegerama/kaiteki/bcode/ui/BarcodeDialog.kt
@@ -1,5 +1,6 @@
 package com.kroegerama.kaiteki.bcode.ui
 
+import android.content.DialogInterface
 import android.os.Bundle
 import android.os.Handler
 import android.view.LayoutInflater
@@ -60,6 +61,10 @@ open class BarcodeDialog : DialogFragment(), BarcodeResultListener {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
     }
 
+    override fun onBarcodeScanCancelled() {
+        //Ignore: BarcodeView will never emit this event
+    }
+
     override fun onStop() {
         super.onStop()
         bcode.unbind()
@@ -85,6 +90,12 @@ open class BarcodeDialog : DialogFragment(), BarcodeResultListener {
         return false
     }
 
+    override fun onCancel(dialog: DialogInterface) {
+        (parentFragment as? BarcodeResultListener)?.onBarcodeScanCancelled()
+        (activity as? BarcodeResultListener)?.onBarcodeScanCancelled()
+        super.onCancel(dialog)
+    }
+
     companion object {
 
         private const val KEY_FORMATS = "formats"

diff --git a/library/src/main/java/com/kroegerama/kaiteki/bcode/ui/BarcodeFragment.kt b/library/src/main/java/com/kroegerama/kaiteki/bcode/ui/BarcodeFragment.kt
@@ -61,6 +61,10 @@ class BarcodeFragment : Fragment(), BarcodeResultListener {
         return false
     }
 
+    override fun onBarcodeScanCancelled() {
+        //Ignore: BarcodeView will never emit this event
+    }
+
     companion object {
         private const val KEY_FORMATS = "formats"
         private const val KEY_INVERTED = "inverted"