From 0aebd7b7955187b46c9cad775cae65ac890fda91 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Tue, 29 Mar 2016 12:04:00 +0200 Subject: Rename CompoundBarcodeView -> DecoratedBarcodeView. --- sample/src/main/java/example/zxing/ContinuousCaptureActivity.java | 8 +++----- sample/src/main/java/example/zxing/CustomScannerActivity.java | 8 ++++---- sample/src/main/java/example/zxing/SmallCaptureActivity.java | 6 +++--- sample/src/main/java/example/zxing/ToolbarCaptureActivity.java | 6 +++--- 4 files changed, 13 insertions(+), 15 deletions(-) (limited to 'sample/src/main/java/example') diff --git a/sample/src/main/java/example/zxing/ContinuousCaptureActivity.java b/sample/src/main/java/example/zxing/ContinuousCaptureActivity.java index 783eb892..872020f1 100644 --- a/sample/src/main/java/example/zxing/ContinuousCaptureActivity.java +++ b/sample/src/main/java/example/zxing/ContinuousCaptureActivity.java @@ -1,10 +1,8 @@ package example.zxing; import android.app.Activity; -import android.content.res.Configuration; import android.graphics.Color; import android.os.Bundle; -import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.widget.ImageView; @@ -12,7 +10,7 @@ import android.widget.ImageView; import com.google.zxing.ResultPoint; import com.journeyapps.barcodescanner.BarcodeCallback; import com.journeyapps.barcodescanner.BarcodeResult; -import com.journeyapps.barcodescanner.CompoundBarcodeView; +import com.journeyapps.barcodescanner.DecoratedBarcodeView; import java.util.List; @@ -22,7 +20,7 @@ import java.util.List; */ public class ContinuousCaptureActivity extends Activity { private static final String TAG = ContinuousCaptureActivity.class.getSimpleName(); - private CompoundBarcodeView barcodeView; + private DecoratedBarcodeView barcodeView; private BarcodeCallback callback = new BarcodeCallback() { @Override @@ -46,7 +44,7 @@ public class ContinuousCaptureActivity extends Activity { setContentView(R.layout.continuous_scan); - barcodeView = (CompoundBarcodeView) findViewById(R.id.barcode_scanner); + barcodeView = (DecoratedBarcodeView) findViewById(R.id.barcode_scanner); barcodeView.decodeContinuous(callback); } diff --git a/sample/src/main/java/example/zxing/CustomScannerActivity.java b/sample/src/main/java/example/zxing/CustomScannerActivity.java index bc5c4dc1..867c2de3 100644 --- a/sample/src/main/java/example/zxing/CustomScannerActivity.java +++ b/sample/src/main/java/example/zxing/CustomScannerActivity.java @@ -8,16 +8,16 @@ import android.view.View; import android.widget.Button; import com.journeyapps.barcodescanner.CaptureManager; -import com.journeyapps.barcodescanner.CompoundBarcodeView; +import com.journeyapps.barcodescanner.DecoratedBarcodeView; /** * Custom Scannner Activity extending from Activity to display a custom layout form scanner view. */ public class CustomScannerActivity extends Activity implements - CompoundBarcodeView.TorchListener { + DecoratedBarcodeView.TorchListener { private CaptureManager capture; - private CompoundBarcodeView barcodeScannerView; + private DecoratedBarcodeView barcodeScannerView; private Button switchFlashlightButton; @Override @@ -25,7 +25,7 @@ public class CustomScannerActivity extends Activity implements super.onCreate(savedInstanceState); setContentView(R.layout.activity_custom_scanner); - barcodeScannerView = (CompoundBarcodeView)findViewById(R.id.zxing_barcode_scanner); + barcodeScannerView = (DecoratedBarcodeView)findViewById(R.id.zxing_barcode_scanner); barcodeScannerView.setTorchListener(this); switchFlashlightButton = (Button)findViewById(R.id.switch_flashlight); diff --git a/sample/src/main/java/example/zxing/SmallCaptureActivity.java b/sample/src/main/java/example/zxing/SmallCaptureActivity.java index 87b6b0ce..c4baa8ed 100644 --- a/sample/src/main/java/example/zxing/SmallCaptureActivity.java +++ b/sample/src/main/java/example/zxing/SmallCaptureActivity.java @@ -1,15 +1,15 @@ package example.zxing; import com.journeyapps.barcodescanner.CaptureActivity; -import com.journeyapps.barcodescanner.CompoundBarcodeView; +import com.journeyapps.barcodescanner.DecoratedBarcodeView; /** * This activity has a margin. */ public class SmallCaptureActivity extends CaptureActivity { @Override - protected CompoundBarcodeView initializeContent() { + protected DecoratedBarcodeView initializeContent() { setContentView(R.layout.capture_small); - return (CompoundBarcodeView)findViewById(R.id.zxing_barcode_scanner); + return (DecoratedBarcodeView)findViewById(R.id.zxing_barcode_scanner); } } diff --git a/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java b/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java index f497d117..d11fe530 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.CompoundBarcodeView; +import com.journeyapps.barcodescanner.DecoratedBarcodeView; /** * Sample Activity extending from ActionBarActivity to display a Toolbar. */ public class ToolbarCaptureActivity extends ActionBarActivity { private CaptureManager capture; - private CompoundBarcodeView barcodeScannerView; + private DecoratedBarcodeView barcodeScannerView; @Override protected void onCreate(Bundle savedInstanceState) { @@ -25,7 +25,7 @@ public class ToolbarCaptureActivity extends ActionBarActivity { setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - barcodeScannerView = (CompoundBarcodeView)findViewById(R.id.zxing_barcode_scanner); + barcodeScannerView = (DecoratedBarcodeView)findViewById(R.id.zxing_barcode_scanner); capture = new CaptureManager(this, barcodeScannerView); capture.initializeFromIntent(getIntent(), savedInstanceState); -- cgit v1.2.3