restore scanner product info banner

Author: ajungg

build.gradle

@@ -24,7 +24,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.11.0-alpha4'
+        sdkVersion='0.11.0-alpha5'
         versionCode=1
 
         compileSdkVersion=28

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

@@ -24,6 +24,8 @@ public class ProductResolver {
     private Context context;
     private OnShowListener onShowListener;
     private OnDismissListener onDismissListener;
+    private OnProductNotFoundListener onProductNotFoundListener;
+    private OnNetworkErrorListener onNetworkErrorListener;
     private BarcodeFormat barcodeFormat;
 
     public ProductResolver(Context context) {
@@ -167,16 +169,15 @@ public void onDismissed() {
 
     private void handleProductNotFound(ScannableCode scannedCode) {
         progressDialog.dismiss();
+        Telemetry.event(Telemetry.Event.ScannedUnknownCode, scannedCode.getCode());
 
         if(onDismissListener != null) {
             onDismissListener.onDismiss();
         }
 
-        Telemetry.event(Telemetry.Event.ScannedUnknownCode, scannedCode.getCode());
-        Toast.makeText(context,
-                R.string.Snabble_Scanner_unknownBarcode,
-                Toast.LENGTH_LONG)
-                .show();
+        if (onProductNotFoundListener != null) {
+            onProductNotFoundListener.onProductNotFound();
+        }
     }
 
     private void handleProductError() {
@@ -186,10 +187,9 @@ private void handleProductError() {
             onDismissListener.onDismiss();
         }
 
-        Toast.makeText(context,
-                R.string.Snabble_Scanner_networkError,
-                Toast.LENGTH_LONG)
-                .show();
+        if (onNetworkErrorListener != null) {
+            onNetworkErrorListener.onNetworkError();
+        }
     }
 
     private void showProduct(Product product, ScannableCode scannedCode) {
@@ -220,6 +220,14 @@ public interface OnDismissListener {
         void onDismiss();
     }
 
+    public interface OnProductNotFoundListener {
+        void onProductNotFound();
+    }
+
+    public interface OnNetworkErrorListener {
+        void onNetworkError();
+    }
+
     public static class Builder {
         private ProductResolver productResolver;
 
@@ -247,6 +255,16 @@ public Builder setOnDismissListener(OnDismissListener listener) {
             return this;
         }
 
+        public Builder setOnProductNotFoundListener(OnProductNotFoundListener listener) {
+            productResolver.onProductNotFoundListener = listener;
+            return this;
+        }
+
+        public Builder setOnNetworkErrorListener(OnNetworkErrorListener listener) {
+            productResolver.onNetworkErrorListener  = listener;
+            return this;
+        }
+
         public ProductResolver create() {
             return productResolver;
         }

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

@@ -163,8 +163,22 @@ public void onShow() {
                 .setOnDismissListener(new ProductResolver.OnDismissListener() {
                     @Override
                     public void onDismiss() {
-                        resumeBarcodeScanner();
-                        delayNextScan();
+                        if (!isShowingHint) {
+                            resumeBarcodeScanner();
+                            delayNextScan();
+                        }
+                    }
+                })
+                .setOnProductNotFoundListener(new ProductResolver.OnProductNotFoundListener() {
+                    @Override
+                    public void onProductNotFound() {
+                        showInfo(R.string.Snabble_Scanner_unknownBarcode);
+                    }
+                })
+                .setOnNetworkErrorListener(new ProductResolver.OnNetworkErrorListener() {
+                    @Override
+                    public void onNetworkError() {
+                        showInfo(R.string.Snabble_Scanner_networkError);
                     }
                 })
                 .create()
@@ -192,6 +206,20 @@ private void handleBarcodeDetected(final Barcode barcode) {
         }
     }
 
+    private void showInfo(@StringRes int resId) {
+        info.setVisibility(View.VISIBLE);
+        info.setText(resId);
+        info.animate().translationY(0).start();
+
+        infoHandler.removeCallbacksAndMessages(null);
+        infoHandler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                info.animate().translationY(-info.getHeight()).start();
+            }
+        }, UIUtils.SNACKBAR_LENGTH_VERY_LONG);
+    }
+
     private void onClickEnterBarcode() {
         SnabbleUICallback callback = SnabbleUI.getUiCallback();
         if (callback != null) {