Added shop hints after adding the first item

ajungg · ajungg · commit c7cd9d859680 · 2018-08-23T14:58:29.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.9.0-beta1'
+        sdkVersion='0.9.0-beta2'
         versionCode=1
 
         compileSdkVersion=28
diff --git a/core/src/main/java/io/snabble/sdk/ShoppingCart.java b/core/src/main/java/io/snabble/sdk/ShoppingCart.java
@@ -44,6 +44,8 @@ private Entry(Product product, int quantity) {
     private String id;
     private long lastModificationTime;
     private List<Entry> items = new ArrayList<>();
+    private int modCount = 0;
+    private int addCount = 0;
     private transient List<ShoppingCartListener> listeners = new CopyOnWriteArrayList<>();
     private transient Handler handler = new Handler(Looper.getMainLooper());
     private transient Project project;
@@ -249,6 +251,7 @@ public int getQuantity(int index) {
     private void removeAll(Entry e) {
         if (e != null) {
             items.remove(e);
+            modCount++;
             notifyItemRemoved(this, e.product);
         }
     }
@@ -259,6 +262,8 @@ public int size() {
 
     public void clear() {
         items.clear();
+        modCount = 0;
+        addCount = 0;
         notifyCleared(this);
     }
 
@@ -280,6 +285,7 @@ private void setEntryQuantity(Entry e, int newQuantity) {
             if (newQuantity > 0) {
                 if (newQuantity != e.quantity) {
                     e.quantity = Math.max(0, Math.min(MAX_QUANTITY, newQuantity));
+                    modCount++;
                     notifyQuantityChanged(this, e.product);
                 }
             } else {
@@ -293,6 +299,8 @@ private void addEntry(Entry e, int index) {
             setEntryQuantity(e, e.quantity + 1);
         } else {
             items.add(index, e);
+            modCount++;
+            addCount++;
             notifyItemAdded(this, e.product);
         }
     }
@@ -335,6 +343,7 @@ private void setScannedCodeForEntry(Entry entry, ScannableCode scannedCode){
             entry.amount = scannedCode.getEmbeddedData();
         }
 
+        modCount++;
         notifyQuantityChanged(this, entry.product);
     }
 
@@ -365,6 +374,14 @@ private boolean contains(Entry e) {
         return items.contains(e);
     }
 
+    public int getAddCount() {
+        return addCount;
+    }
+
+    public int getModCount() {
+        return modCount;
+    }
+
     /**
      * Swaps the position of two entries based on their index.
      * <p>
@@ -373,6 +390,7 @@ private boolean contains(Entry e) {
     public void swap(int fromIndex, int toIndex) {
         if (fromIndex >= 0 && fromIndex < items.size() && toIndex >= 0 && toIndex < items.size() && fromIndex != toIndex) {
             Collections.swap(items, fromIndex, toIndex);
+            modCount++;
             notifyItemMoved(this, fromIndex, toIndex);
         }
     }
diff --git a/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningView.java b/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningView.java
@@ -18,6 +18,7 @@
 import android.text.InputType;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.LinearLayout;
@@ -28,12 +29,15 @@
 import io.snabble.sdk.Product;
 import io.snabble.sdk.ProductDatabase;
 import io.snabble.sdk.Project;
+import io.snabble.sdk.Shop;
+import io.snabble.sdk.ShoppingCart;
 import io.snabble.sdk.codes.ScannableCode;
 import io.snabble.sdk.ui.R;
 import io.snabble.sdk.ui.SnabbleUI;
 import io.snabble.sdk.ui.SnabbleUICallback;
 import io.snabble.sdk.ui.telemetry.Telemetry;
 import io.snabble.sdk.ui.utils.DelayedProgressDialog;
+import io.snabble.sdk.ui.utils.OneShotClickListener;
 import io.snabble.sdk.ui.utils.UIUtils;
 import io.snabble.sdk.utils.SimpleActivityLifecycleCallbacks;
 import io.snabble.sdk.utils.Utils;
@@ -51,6 +55,7 @@ public class SelfScanningView extends CoordinatorLayout implements Checkout.OnCh
     private DelayedProgressDialog progressDialog;
     private long detectAfterTimeMs;
     private boolean ignoreNextDialog;
+    private ShoppingCart shoppingCart;
 
     public SelfScanningView(Context context) {
         super(context);
@@ -72,6 +77,8 @@ private void inflateView() {
 
         Project project = SnabbleUI.getProject();
 
+        shoppingCart = project.getShoppingCart();
+
         barcodeScanner = findViewById(R.id.barcode_scanner_view);
         noPermission = findViewById(R.id.no_permission);
 
@@ -305,6 +312,43 @@ public void onClick(DialogInterface dialog, int which) {
         }
     }
 
+    public void showHints() {
+        Project project = SnabbleUI.getProject();
+        Shop currentShop = project.getCheckout().getShop();
+
+        if(currentShop != null) {
+            Context context = getContext();
+
+            LayoutInflater inflater = LayoutInflater.from(context);
+            View view = inflater.inflate(R.layout.dialog_hints, null, false);
+
+            TextView textView = view.findViewById(R.id.title);
+            textView.setText(context.getString(R.string.Snabble_Hints_title, currentShop.getName()));
+
+            final AlertDialog alertDialog = new AlertDialog.Builder(context)
+                    .setView(view)
+                    .setPositiveButton(R.string.Snabble_OK, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            dialog.dismiss();
+                        }
+                    })
+                    .setCancelable(true)
+                    .create();
+
+            alertDialog.setCanceledOnTouchOutside(true);
+
+            view.findViewById(R.id.close).setOnClickListener(new OneShotClickListener() {
+                @Override
+                public void click() {
+                    alertDialog.dismiss();
+                }
+            });
+
+            alertDialog.show();
+        }
+    }
+
     public void resume() {
         resumeBarcodeScanner();
     }
@@ -395,6 +439,7 @@ public void registerListeners() {
         isRunning = true;
 
         startBarcodeScanner();
+        shoppingCart.addListener(shoppingCartListener);
     }
 
     public void unregisterListeners() {
@@ -404,6 +449,7 @@ public void unregisterListeners() {
 
         progressDialog.dismiss();
         productDialog.dismiss();
+        shoppingCart.removeListener(shoppingCartListener);
     }
 
     @Override
@@ -426,6 +472,35 @@ public void onDetachedFromWindow() {
         unregisterListeners();
     }
 
+    private ShoppingCart.ShoppingCartListener shoppingCartListener = new ShoppingCart.ShoppingCartListener() {
+        @Override
+        public void onItemAdded(ShoppingCart list, Product product) {
+            if(list.getAddCount() == 1) {
+                showHints();
+            }
+        }
+
+        @Override
+        public void onQuantityChanged(ShoppingCart list, Product product) {
+
+        }
+
+        @Override
+        public void onCleared(ShoppingCart list) {
+
+        }
+
+        @Override
+        public void onItemMoved(ShoppingCart list, int fromIndex, int toIndex) {
+
+        }
+
+        @Override
+        public void onItemRemoved(ShoppingCart list, Product product) {
+
+        }
+    };
+
     private Application.ActivityLifecycleCallbacks activityLifecycleCallbacks =
             new SimpleActivityLifecycleCallbacks() {
                 @Override
diff --git a/ui/src/main/res/layout/dialog_hints.xml b/ui/src/main/res/layout/dialog_hints.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.AppCompatImageView
+        android:id="@+id/close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:padding="12dp"
+        android:background="?android:attr/selectableItemBackground"
+        app:srcCompat="@drawable/ic_close" />
+
+    <android.support.v7.widget.AppCompatTextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center"
+        android:textSize="17sp"
+        android:textStyle="bold"
+        tools:text="Hinweis von snabble GmbH" />
+
+    <android.support.v7.widget.AppCompatTextView
+        android:id="@+id/message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:gravity="center"
+        android:textSize="17sp"
+        android:text="@string/Snabble.Hints.closedBags" />
+</LinearLayout>
diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
@@ -11,6 +11,7 @@
 	<string name="Snabble.Edit">Edit</string>
 	<string name="Snabble.Yes">Yes</string>
 	<string name="Snabble.No">No</string>
+	<string name="Snabble.OK">OK</string>
 	<string name="Snabble.Settings">Settings</string>
 	<string name="Snabble.Delete">Delete</string>
 	<string name="Snabble.remove">Remove</string>
@@ -55,6 +56,8 @@
 	<string name="Snabble.Shoppingcart.deposit">Deposit</string>
 	<string name="Snabble.PaymentMethod.encodedCodes">Checkstand</string>
 	<string name="Snabble.PaymentMethod.qrCodePOS">Checkstand</string>
+	<string name="Snabble.Hints.title">Hint from %s</string>
+	<string name="Snabble.Hints.closedBags">Please make it easy for the cashier and do not put your items directly in closed pockets. Thank you!</string>
 
 	<!-- SECTION: Android -->
 	<string name="Snabble.askForPermission">Ask for permission</string>

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ allprojects {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`project.ext {`
`27`		`- sdkVersion='0.9.0-beta1'`
	`27`	`+ sdkVersion='0.9.0-beta2'`
`28`	`28`	`versionCode=1`
`29`	`29`
`30`	`30`	`compileSdkVersion=28`