support restriction overshoots

Author: ajungg

CHANGELOG.md

@@ -1,10 +1,24 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.13.16]
+
+### Changed
+- The default scan area is now 20% bigger as the indicator indicates
+
+### Added
+- Added setRestrictionOvershoot to BarcodeScannerView to increase the detection area by a 
+multiplier based on the indicator
+
 ## [0.13.15]
 
 ### Added
 - Now warming up the image cache when adding items to the shopping cart
+- Added setRestrictionOvershoot to BarcodeScannerView to increase the detection area by a 
+multiplier based on the indicator
+
+### Changed
+- The default scan area is now 15% bigger as the indicator indicates
 
 ## [0.13.14]
 

ui/src/main/java/io/snabble/sdk/ui/scanner/BarcodeScannerView.java

@@ -81,6 +81,7 @@ public class BarcodeScannerView extends FrameLayout implements TextureView.Surfa
     private TextView cameraUnavailableView;
     private int displayOrientation;
     private boolean restrictScanningToIndicator = true;
+    private float restrictionOvershoot = 1.0f;
     private int bitsPerPixel;
     private boolean indicatorEnabled = true;
     private FrameLayout splashView;
@@ -725,6 +726,22 @@ public void setIndicatorOffset(int offsetX, int offsetY) {
      */
     public void setRestrictScanningToIndicator(boolean restrictScanningToIndicator) {
         this.restrictScanningToIndicator = restrictScanningToIndicator;
+        updateTransform();
+    }
+
+    /**
+     * Sets the multiplicaton value that is used to allow scanning outside of the indicator if
+     * {@link #setRestrictScanningToIndicator(boolean)} is set
+     *
+     * Default is 1.0
+     */
+    public void setRestrictionOvershoot(float val) {
+        if (val == 0.0f) {
+            val = 1.0f;
+        }
+
+        restrictionOvershoot = val;
+        updateTransform();
     }
 
     private void updateTransform() {
@@ -801,6 +818,14 @@ private void updateTransform() {
             rect = new Rect(0, 0, getWidth(), getHeight());
         }
 
+        rect.inset(Math.round(rect.width() * (1.0f - restrictionOvershoot)),
+                    Math.round(rect.height() * (1.0f - restrictionOvershoot)));
+
+        rect.left = Math.max(0, rect.left);
+        rect.top = Math.max(0, rect.top);
+        rect.right = Math.min(getWidth(), rect.right);
+        rect.bottom = Math.min(getHeight(), rect.bottom);
+
         float left = offsetX + surfaceWidth * ((float) rect.left / surfaceWidth);
         float top = offsetY + surfaceHeight * ((float) rect.top / surfaceHeight);
         float right = offsetX + surfaceWidth * ((float) rect.right / surfaceWidth);

ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningView.java

@@ -120,6 +120,7 @@ public void onClick(View v) {
         });
 
         barcodeScanner.setIndicatorOffset(0, Utils.dp2px(getContext(), -36));
+        barcodeScanner.setRestrictionOvershoot(1.15f);
 
         for (BarcodeFormat format : project.getSupportedBarcodeFormats()) {
             barcodeScanner.addBarcodeFormat(format);