Merge pull request #327 from alpbak/master

Added a mixed scan mode to scan inverted and normal barcodes at the same time.

1 files changed, 7 insertions, 1 deletions

diff --git a/sample/src/main/java/example/zxing/MainActivity.java b/sample/src/main/java/example/zxing/MainActivity.java
index f8af3a54..e4755263 100644
--- a/sample/src/main/java/example/zxing/MainActivity.java
+++ b/sample/src/main/java/example/zxing/MainActivity.java
@@ -39,7 +39,13 @@ public class MainActivity extends AppCompatActivity {
 
     public void scanBarcodeInverted(View view){
         IntentIntegrator integrator = new IntentIntegrator(this);
-        integrator.addExtra(Intents.Scan.INVERTED_SCAN, true);
+        integrator.addExtra(Intents.Scan.SCAN_TYPE, Intents.Scan.INVERTED_SCAN);
+        integrator.initiateScan();
+    }
+
+    public void scanMixedBarcodes(View view){
+        IntentIntegrator integrator = new IntentIntegrator(this);
+        integrator.addExtra(Intents.Scan.SCAN_TYPE, Intents.Scan.MIXED_SCAN);
         integrator.initiateScan();
     }