diff options
Diffstat (limited to 'sample/src/main/java/example')
| -rw-r--r-- | sample/src/main/java/example/zxing/ContinuousCaptureActivity.java | 15 | ||||
| -rw-r--r-- | sample/src/main/java/example/zxing/ToolbarCaptureActivity.java | 6 |
2 files changed, 6 insertions, 15 deletions
diff --git a/sample/src/main/java/example/zxing/ContinuousCaptureActivity.java b/sample/src/main/java/example/zxing/ContinuousCaptureActivity.java index 4853b7de..59e1c9a9 100644 --- a/sample/src/main/java/example/zxing/ContinuousCaptureActivity.java +++ b/sample/src/main/java/example/zxing/ContinuousCaptureActivity.java @@ -8,13 +8,11 @@ import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.widget.ImageView; -import android.widget.TextView; import com.google.zxing.ResultPoint; import com.journeyapps.barcodescanner.BarcodeCallback; import com.journeyapps.barcodescanner.BarcodeResult; -import com.journeyapps.barcodescanner.DefaultBarcodeScannerView; -import com.journeyapps.barcodescanner.ViewfinderView; +import com.journeyapps.barcodescanner.CompoundBarcodeView; import java.util.List; @@ -23,7 +21,7 @@ import java.util.List; */ public class ContinuousCaptureActivity extends Activity { private static final String TAG = ContinuousCaptureActivity.class.getSimpleName(); - private DefaultBarcodeScannerView barcodeView; + private CompoundBarcodeView barcodeView; private BarcodeCallback callback = new BarcodeCallback() { @Override @@ -47,18 +45,11 @@ public class ContinuousCaptureActivity extends Activity { setContentView(R.layout.continuous_scan); - barcodeView = (DefaultBarcodeScannerView) findViewById(R.id.barcode_scanner); + barcodeView = (CompoundBarcodeView) findViewById(R.id.barcode_scanner); barcodeView.decodeContinuous(callback); } @Override - public void onConfigurationChanged(Configuration newConfig) { - super.onConfigurationChanged(newConfig); - - Log.d(TAG, "Configuration changed"); - } - - @Override protected void onResume() { super.onResume(); diff --git a/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java b/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java index 4b0ace78..eeea946b 100644 --- a/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java +++ b/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java @@ -6,14 +6,14 @@ import android.support.v7.widget.Toolbar; import android.view.KeyEvent; import com.journeyapps.barcodescanner.CaptureManager; -import com.journeyapps.barcodescanner.DefaultBarcodeScannerView; +import com.journeyapps.barcodescanner.CompoundBarcodeView; /** * */ public class ToolbarCaptureActivity extends ActionBarActivity { private CaptureManager capture; - private DefaultBarcodeScannerView barcodeScannerView; + private CompoundBarcodeView barcodeScannerView; @Override protected void onCreate(Bundle savedInstanceState) { @@ -26,7 +26,7 @@ public class ToolbarCaptureActivity extends ActionBarActivity { getSupportActionBar().setDisplayHomeAsUpEnabled(true); - barcodeScannerView = (DefaultBarcodeScannerView)findViewById(R.id.zxing_barcode_scanner); + barcodeScannerView = (CompoundBarcodeView)findViewById(R.id.zxing_barcode_scanner); capture = new CaptureManager(this, barcodeScannerView); capture.initializeFromIntent(getIntent(), savedInstanceState); |
