Fixed user weighed product display

ajungg · ajungg · commit 0801f7ab19a8 · 2018-06-26T10:16:06.000+02:00
diff --git a/ui/src/main/java/io/snabble/sdk/ui/cart/ShoppingCartView.java b/ui/src/main/java/io/snabble/sdk/ui/cart/ShoppingCartView.java
@@ -396,8 +396,10 @@ public void bindTo(final int position) {
                     priceTextView.setText(String.format(" * %s = %s", price, priceSum));
                 }
 
-                if (type == Product.Type.UserWeighed || embeddedWeight != null) {
+                if(embeddedWeight != null) {
                     quantityTextView.setText(String.format("%s g", String.valueOf(embeddedWeight)));
+                } else if (type == Product.Type.UserWeighed) {
+                    quantityTextView.setText(String.format("%s g", String.valueOf(quantity)));
                 } else {
                     quantityTextView.setText(String.valueOf(quantity));
                 }

Original file line number	Diff line number	Diff line change
`@@ -396,8 +396,10 @@ public void bindTo(final int position) {`
`396`	`396`	`priceTextView.setText(String.format(" * %s = %s", price, priceSum));`
`397`	`397`	`}`
`398`	`398`
`399`		`- if (type == Product.Type.UserWeighed \|\| embeddedWeight != null) {`
	`399`	`+ if(embeddedWeight != null) {`
`400`	`400`	`quantityTextView.setText(String.format("%s g", String.valueOf(embeddedWeight)));`
	`401`	`+ } else if (type == Product.Type.UserWeighed) {`
	`402`	`+ quantityTextView.setText(String.format("%s g", String.valueOf(quantity)));`
`401`	`403`	`} else {`
`402`	`404`	`quantityTextView.setText(String.valueOf(quantity));`
`403`	`405`	`}`