Merge pull request #4 from snabble/feature/minor_improvments

Minor improvements

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.35.3]
+
+### Changes
+- Migration ProductResolver to kotlin and make it possible to use it without a chooser
+- The show() method was deprecated and replaced by resolve() since it is possible now to use the
+  resolver without visible interaction
+- Empty product image urls will be converted to null
+- The priceHeight property of the CheckoutBar contains now its margin
+
 ## [0.35.2]
 
 ### Added

build.gradle

@@ -30,7 +30,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.35.2'
+        sdkVersion='0.35.3'
         versionCode=1
 
         compileSdkVersion=30

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

@@ -497,7 +497,7 @@ public Builder setCustomerCardPrice(int customerCardPrice) {
         }
 
         public Builder setImageUrl(String imageUrl) {
-            product.imageUrl = imageUrl;
+            product.imageUrl = imageUrl == null || imageUrl.trim().length() == 0 ? null : imageUrl;
             return this;
         }
 

sample/src/main/java/io/snabble/testapp/BaseActivity.java

@@ -78,7 +78,7 @@ public boolean dispatchKeyEvent(KeyEvent event) {
             new ProductResolver.Builder(this)
                     .setCodes(ScannedCode.parse(SnabbleUI.getProject(), code))
                     .create()
-                    .show();
+                    .resolve();
 
             return true;
         }

ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt

@@ -10,6 +10,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.*
 import androidx.appcompat.app.AlertDialog
+import androidx.core.view.marginTop
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
@@ -46,8 +47,7 @@ class CheckoutBar @JvmOverloads constructor(
     }
 
     val priceHeight: Int
-        get() = priceSum.height
-
+        get() = priceSum.height + priceSum.marginTop * 2
     init {
         LayoutInflater.from(context).inflate(R.layout.snabble_view_checkout_bar, this, true)
         orientation = VERTICAL