Refactor ContinuousCaptureActivity to use the compound barcode view.

4 files changed, 20 insertions, 41 deletions

diff --git a/sample/src/main/java/example/zxing/CaptureActivityAnyOrientation.java b/sample/src/main/java/example/zxing/AnyOrientationCaptureActivity.java
index 6be3a3e9..fab32b0b 100644
--- a/sample/src/main/java/example/zxing/CaptureActivityAnyOrientation.java
+++ b/sample/src/main/java/example/zxing/AnyOrientationCaptureActivity.java
@@ -5,6 +5,6 @@ import com.journeyapps.barcodescanner.CaptureActivity;
 /**
  *
  */
-public class CaptureActivityAnyOrientation extends CaptureActivity {
+public class AnyOrientationCaptureActivity extends CaptureActivity {
 
 }
diff --git a/sample/src/main/java/example/zxing/CustomCaptureActivity.java b/sample/src/main/java/example/zxing/ContinuousCaptureActivity.java
index 37b69fed..4853b7de 100644
--- a/sample/src/main/java/example/zxing/CustomCaptureActivity.java
+++ b/sample/src/main/java/example/zxing/ContinuousCaptureActivity.java
@@ -13,7 +13,7 @@ import android.widget.TextView;
 import com.google.zxing.ResultPoint;
 import com.journeyapps.barcodescanner.BarcodeCallback;
 import com.journeyapps.barcodescanner.BarcodeResult;
-import com.journeyapps.barcodescanner.BarcodeView;
+import com.journeyapps.barcodescanner.DefaultBarcodeScannerView;
 import com.journeyapps.barcodescanner.ViewfinderView;
 
 import java.util.List;
@@ -21,17 +21,15 @@ import java.util.List;
 /**
  *
  */
-public class CustomCaptureActivity extends Activity {
-    private static final String TAG = CustomCaptureActivity.class.getSimpleName();
-    private BarcodeView barcodeView;
-    private ViewfinderView viewFinder;
+public class ContinuousCaptureActivity extends Activity {
+    private static final String TAG = ContinuousCaptureActivity.class.getSimpleName();
+    private DefaultBarcodeScannerView barcodeView;
 
     private BarcodeCallback callback = new BarcodeCallback() {
         @Override
         public void barcodeResult(BarcodeResult result) {
-            TextView text = (TextView) findViewById(R.id.zxing_barcode_status);
             if (result.getText() != null) {
-                text.setText(result.getText());
+                barcodeView.setStatusText(result.getText());
             }
             //Added preview of scanned barcode
             ImageView imageView = (ImageView) findViewById(R.id.barcodePreview);
@@ -40,9 +38,6 @@ public class CustomCaptureActivity extends Activity {
 
         @Override
         public void possibleResultPoints(List<ResultPoint> resultPoints) {
-            for (ResultPoint point : resultPoints) {
-                viewFinder.addPossibleResultPoint(point);
-            }
         }
     };
 
@@ -50,13 +45,10 @@ public class CustomCaptureActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.new_custom_layout);
+        setContentView(R.layout.continuous_scan);
 
-        barcodeView = (BarcodeView) findViewById(R.id.zxing_barcode_surface);
+        barcodeView = (DefaultBarcodeScannerView) findViewById(R.id.barcode_scanner);
         barcodeView.decodeContinuous(callback);
-
-        viewFinder = (ViewfinderView) findViewById(R.id.zxing_viewfinder_view);
-        viewFinder.setCameraPreview(barcodeView);
     }
 
     @Override
@@ -64,12 +56,6 @@ public class CustomCaptureActivity extends Activity {
         super.onConfigurationChanged(newConfig);
 
         Log.d(TAG, "Configuration changed");
-
-    }
-
-    private void orientationChanged() {
-        barcodeView.pause();
-        barcodeView.resume();
     }
 
     @Override
@@ -98,22 +84,8 @@ public class CustomCaptureActivity extends Activity {
         barcodeView.decodeSingle(callback);
     }
 
-
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_FOCUS:
-            case KeyEvent.KEYCODE_CAMERA:
-                // Handle these events so they don't launch the Camera app
-                return true;
-            // Use volume up/down to turn on light
-            case KeyEvent.KEYCODE_VOLUME_DOWN:
-                barcodeView.setTorch(false);
-                return true;
-            case KeyEvent.KEYCODE_VOLUME_UP:
-                barcodeView.setTorch(true);
-                return true;
-        }
-        return super.onKeyDown(keyCode, event);
+        return barcodeView.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event);
     }
 }
diff --git a/sample/src/main/java/example/zxing/MainActivity.java b/sample/src/main/java/example/zxing/MainActivity.java
index 39cfb5e9..f8c9622c 100644
--- a/sample/src/main/java/example/zxing/MainActivity.java
+++ b/sample/src/main/java/example/zxing/MainActivity.java
@@ -30,7 +30,7 @@ public class MainActivity extends ActionBarActivity {
 
     public void scanBarcodeCustomLayout(View view) {
         IntentIntegrator integrator = new IntentIntegrator(this);
-        integrator.setCaptureActivity(CaptureActivityAnyOrientation.class);
+        integrator.setCaptureActivity(AnyOrientationCaptureActivity.class);
         integrator.setDesiredBarcodeFormats(IntentIntegrator.ONE_D_CODE_TYPES);
         integrator.setPrompt("Scan something");
         integrator.setOrientationLocked(false);
@@ -44,7 +44,7 @@ public class MainActivity extends ActionBarActivity {
     }
 
     public void scanContinuous(View view) {
-        Intent intent = new Intent(this, CustomCaptureActivity.class);
+        Intent intent = new Intent(this, ContinuousCaptureActivity.class);
         startActivity(intent);
     }
 
diff --git a/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java b/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java
index f4dee3ee..4b0ace78 100644
--- a/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java
+++ b/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java
@@ -3,6 +3,7 @@ package example.zxing;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v7.widget.Toolbar;
+import android.view.KeyEvent;
 
 import com.journeyapps.barcodescanner.CaptureManager;
 import com.journeyapps.barcodescanner.DefaultBarcodeScannerView;
@@ -12,6 +13,7 @@ import com.journeyapps.barcodescanner.DefaultBarcodeScannerView;
  */
 public class ToolbarCaptureActivity extends ActionBarActivity {
     private CaptureManager capture;
+    private DefaultBarcodeScannerView barcodeScannerView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -24,9 +26,9 @@ public class ToolbarCaptureActivity extends ActionBarActivity {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
 
-        DefaultBarcodeScannerView view = (DefaultBarcodeScannerView)findViewById(R.id.zxing_barcode_scanner);
+        barcodeScannerView = (DefaultBarcodeScannerView)findViewById(R.id.zxing_barcode_scanner);
 
-        capture = new CaptureManager(this, view);
+        capture = new CaptureManager(this, barcodeScannerView);
         capture.initializeFromIntent(getIntent(), savedInstanceState);
         capture.decode();
     }
@@ -54,4 +56,9 @@ public class ToolbarCaptureActivity extends ActionBarActivity {
         super.onSaveInstanceState(outState);
         capture.onSaveInstanceState(outState);
     }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return barcodeScannerView.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event);
+    }
 }