From 74bb49be5556f454f4b1d2b04e44557282fa900e Mon Sep 17 00:00:00 2001
From: Ralf Kistner <ralf@embarkmobile.com>
Date: Sat, 17 May 2014 12:58:44 +0200
Subject: Adapt IntentIntegrator to match our needs.

Remove the previously bundled IntentIntegrator.
---
 .../src/main/java/example/zxing/MainActivity.java  | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'sample/src/main/java/example')

diff --git a/sample/src/main/java/example/zxing/MainActivity.java b/sample/src/main/java/example/zxing/MainActivity.java
index 4258175b..b41b619b 100644
--- a/sample/src/main/java/example/zxing/MainActivity.java
+++ b/sample/src/main/java/example/zxing/MainActivity.java
@@ -1,13 +1,10 @@
 package example.zxing;
 
-import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.ActionBarActivity;
-import android.os.Bundle;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -26,13 +23,19 @@ public class MainActivity extends ActionBarActivity {
     }
 
     public void scanBarcode(View view) {
-        IntentIntegrator.initiateScan(this);
+        new IntentIntegrator(this).initiateScan();
     }
 
     public void scanBarcodeCustomLayout(View view) {
-        Intent intent = IntentIntegrator.createScanIntent(this);
-        IntentIntegrator.setCaptureLayout(intent, R.layout.custom_capture_layout);
-        IntentIntegrator.startIntent(intent, this);
+        IntentIntegrator integrator = new IntentIntegrator(this);
+        integrator.setCaptureLayout(R.layout.custom_capture_layout);
+        integrator.setDesiredBarcodeFormats(IntentIntegrator.ONE_D_CODE_TYPES);
+        integrator.autoWide();
+        integrator.initiateScan();
+    }
+
+    public void encodeBarcode(View view) {
+        new IntentIntegrator(this).shareText("Test Barcode");
     }
 
     @Override
@@ -82,8 +85,7 @@ public class MainActivity extends ActionBarActivity {
         }
 
         public void scanFromFragment() {
-            Intent intent = IntentIntegrator.createScanIntent(getActivity());
-            IntentIntegrator.startIntent(intent, this);
+            new IntentIntegrator(this).initiateScan();
         }
 
         private void displayToast() {
-- 
cgit v1.2.3