use reference unit for price formatting, layout adjustments

Author: ajungg

core/src/main/java/io/snabble/sdk/PriceFormatter.java

@@ -55,8 +55,13 @@ public String format(Product product, boolean discountedPrice) {
         String formattedString = format(price);
         Product.Type type = product.getType();
 
+        Unit referenceUnit = product.getReferenceUnit();
+        if (referenceUnit == null) {
+            referenceUnit = Unit.KILOGRAM;
+        }
+
         if (type == Product.Type.UserWeighed || type == Product.Type.PreWeighed) {
-            formattedString += " / kg";
+            formattedString += " / " + referenceUnit.getDisplayValue();
         }
 
         return formattedString;

core/src/main/java/io/snabble/sdk/ProductApi.java

@@ -487,8 +487,6 @@ private Product toProduct(ApiProduct apiProduct, Product depositProduct, Product
             } else {
                 if (referenceUnit == Unit.PIECE) {
                     builder.setType(Product.Type.Article);
-                } else {
-                    builder.setType(Product.Type.PreWeighed);
                 }
             }
         } else {

core/src/main/java/io/snabble/sdk/ProductDatabase.java

@@ -800,8 +800,6 @@ public Product productAtCursor(Cursor cursor) {
 
                 if (unit == Unit.PIECE) {
                     builder.setType(Product.Type.Article);
-                } else {
-                    builder.setType(Product.Type.PreWeighed);
                 }
             }
 

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

@@ -289,7 +289,7 @@ private void updatePrice() {
         }
 
         if (q > 0 && (scannedCode.hasWeighData() || product.getType() == Product.Type.UserWeighed)) {
-            price.setText(String.format("%s%s * %s = %s", String.valueOf(q), encodingDisplayValue, singlePrice, priceText));
+            price.setText(String.format("%s %s * %s = %s", String.valueOf(q), encodingDisplayValue, singlePrice, priceText));
         } else if (q > 1) {
             if (scannedCode.hasUnitData()) {
                 price.setText(String.format("%s * %s = %s",

ui/src/main/res/layout/item_shoppingcart_product.xml

@@ -136,13 +136,14 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/quantity_annotation"
-                android:layout_width="wrap_content"
+                android:layout_width="32dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginRight="16dp"
-                android:textSize="15dp"
+                android:layout_marginRight="4dp"
+                android:gravity="left"
+                android:text="g"
                 android:textColor="@color/snabble_textColorDark"
-                android:text="g" />
+                android:textSize="15dp" />
 
             <ImageView
                 android:id="@+id/quantity_edit_apply"