conditional scan message for projects

Author: ajungg

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

@@ -408,14 +408,24 @@ public void onDismiss(DialogInterface dialog) {
     }
 
     private void showScanMessage(Product product) {
+        Project project = SnabbleUI.getProject();
         Resources res = getResources();
 
         String identifier = product.getScanMessage();
         if (identifier != null) {
-            identifier = identifier.replace("-", "_");
-            int id = res.getIdentifier(identifier, "string", getContext().getPackageName());
-            if (id != 0) {
-                String str = res.getString(id);
+            // replace occurences of "-" in scan message, as android resource identifiers are not
+            // supporting "-" in identifiers
+            String idWithoutProjectId = identifier.replace("-", ".");
+            String idWithProjectId = project.getId().replace("-", ".") + "." + idWithoutProjectId;
+
+            int resId = res.getIdentifier(idWithProjectId, "string", getContext().getPackageName());
+
+            if (resId == 0) {
+                resId = res.getIdentifier(idWithoutProjectId, "string", getContext().getPackageName());
+            }
+
+            if (resId != 0) {
+                String str = res.getString(resId);
                 showInfo(str);
             }
         }
@@ -516,7 +526,10 @@ public void onItemAdded(ShoppingCart list, ShoppingCart.Item item) {
             if (list.getAddCount() == 1) {
                 showHints();
             }
+        }
 
+        @Override
+        public void onQuantityChanged(ShoppingCart list, ShoppingCart.Item item) {
             showScanMessage(item.getProduct());
         }
 

ui/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 1.0.2 -->
+<!-- Generated by Twine 1.0.4 -->
 <!-- Language: en -->
 <resources>
 	<!-- SECTION: Snabble -->
@@ -50,8 +50,8 @@
 	<string name="Snabble.Scanner.start">Start scanner</string>
 	<string name="Snabble.Scanner.addCodeAsIs">Add %s as is</string>
 	<string name="Snabble.ShoppingCart.title">Shopping Cart</string>
-	<string name="Snabble.Shoppingcart.buyProducts.one">Buy %d product for %s</string>
-	<string name="Snabble.Shoppingcart.buyProducts">Buy %d products for %s</string>
+	<string name="Snabble.Shoppingcart.buyProducts.one">Buy %1$d product for %2$s</string>
+	<string name="Snabble.Shoppingcart.buyProducts">Buy %1$d products for %2$s</string>
 	<string name="Snabble.Shoppingcart.buyProducts.now">Pay now</string>
 	<string name="Snabble.Shoppingcart.emptyState.buttonTitle">Scan products</string>
 	<string name="Snabble.Shoppingcart.emptyState.description">Scan products to add them to your shopping cart.</string>