summaryrefslogtreecommitdiff
path: root/sample/src/main/java
diff options
context:
space:
mode:
authorRalf Kistner <ralf@embarkmobile.com>2014-05-17 14:58:44 +0400
committerRalf Kistner <ralf@embarkmobile.com>2014-05-17 14:58:44 +0400
commit74bb49be5556f454f4b1d2b04e44557282fa900e (patch)
tree735758c7c39ef40eacecf1215007ab66eed72038 /sample/src/main/java
parent10232f5f2dd07fac555a048e084b322eb82f35fc (diff)
downloadzxing-android-embedded-74bb49be5556f454f4b1d2b04e44557282fa900e.tar.xz
Adapt IntentIntegrator to match our needs.
Remove the previously bundled IntentIntegrator.
Diffstat (limited to 'sample/src/main/java')
-rw-r--r--sample/src/main/java/example/zxing/MainActivity.java22
1 files changed, 12 insertions, 10 deletions
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() {