tret2003/checker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into RG-3435

Browse Source
This commit is contained in:
Ivan Murashov
2017-09-08 13:03:49 +03:00
parent c652276066 bd33920077
commit 29f6019caf
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android/app/src/main/java/com/dinect/checker/zxing/ScannerActivity.java
View File

@@ -17,12 +17,16 @@ package com.dinect.checker.zxing;
import android.os.Bundle;
import android.os.Handler;
import android.util.Log;
import android.view.View;
import com.dinect.checker.AbstractScannerActivity;
import com.dinect.checker.R;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.Result;
import java.util.ArrayList;
import me.dm7.barcodescanner.zxing.ZXingScannerView;
/**
@@ -45,6 +49,9 @@ public class ScannerActivity extends AbstractScannerActivity
initToolbar(R.id.zxingToolbar, getString(R.string.scanner_title));
scannerView = (ZXingScannerView) initScanner();
ArrayList<BarcodeFormat> formats = new ArrayList<>();
formats.add(BarcodeFormat.UPC_EAN_EXTENSION);
scannerView.setFormats(formats);
addScanner(scannerView, R.id.zxingRoot);
}