Bugfixes for qr code checkout

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.12.3]
+
+### Fixed
+- Added missing Checkout-ID to QRCodePOS checkout types
+- Fixed hiding of explanation text on small displays (QVGA or smaller)
+- Checkout screen with QRCodePOS type now also sets the ActionBar title if an ActionBar is
+set with SnabbleUI.registerActionBar
+
 ## [0.12.2]
 
 ### Changed

build.gradle

@@ -23,7 +23,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.12.2'
+        sdkVersion='0.12.3'
         versionCode=1
 
         compileSdkVersion=28

ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutEncodedCodesView.java

@@ -1,11 +1,10 @@
 package io.snabble.sdk.ui.checkout;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.os.Handler;
 import android.os.Looper;
 import androidx.annotation.NonNull;
-import android.util.AttributeSet;
+import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -141,10 +140,9 @@ public void run() {
                                 ViewGroup.LayoutParams.WRAP_CONTENT));
                     }
 
-                    Resources resources = getResources();
-
-                    int h = Math.round(scrollContainer.getHeight() * resources.getDisplayMetrics().density);
-                    if (h < 160) {
+                    DisplayMetrics dm = getResources().getDisplayMetrics();
+                    int dpHeight = Math.round(scrollContainer.getHeight() / dm.density);
+                    if (dpHeight < 220) {
                         explanationText.setVisibility(View.GONE);
                         explanationText2.setVisibility(View.GONE);
                     }

ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutQRCodePOSView.java

@@ -1,8 +1,13 @@
 package io.snabble.sdk.ui.checkout;
 
 import android.content.Context;
+import android.content.res.Resources;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.AttributeSet;
+import android.util.DisplayMetrics;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
@@ -58,6 +63,32 @@ public void onClick(View v) {
             payAmount.setVisibility(View.GONE);
             findViewById(R.id.explanation2).setVisibility(View.GONE);
         }
+
+        if (SnabbleUI.getActionBar() != null) {
+            findViewById(R.id.explanation1).setVisibility(View.GONE);
+            SnabbleUI.getActionBar().setTitle(R.string.Snabble_QRCode_showThisCode);
+        }
+
+        TextView checkoutId = findViewById(R.id.checkout_id);
+        String id = project.getCheckout().getId();
+        if (id != null && id.length() >= 4) {
+            String text = getResources().getString(R.string.Snabble_Checkout_ID);
+            checkoutId.setText(String.format("%s: %s", text, id.substring(id.length() - 4)));
+        } else {
+            checkoutId.setVisibility(View.GONE);
+        }
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+
+        DisplayMetrics dm = getResources().getDisplayMetrics();
+        int dpHeight = Math.round(h / dm.density);
+        if (dpHeight < 400) {
+            findViewById(R.id.explanation1).setVisibility(View.GONE);
+            findViewById(R.id.explanation2).setVisibility(View.GONE);
+        }
     }
 
     public void setQRCodeText(String text) {

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

@@ -4,17 +4,31 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#ffffff">
+    <TextView
+        android:id="@+id/checkout_id"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentTop="true"
+        tools:text="Checkout-ID: a64b"
+        android:textColor="@color/snabble_textColorDark"
+        android:layout_marginTop="16dp"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp"
+        android:textStyle="bold"
+        android:textSize="17sp" />
 
     <TextView
         android:id="@+id/explanation1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:layout_centerHorizontal="true"
-        android:layout_alignParentTop="true"
+        android:layout_below="@+id/checkout_id"
         android:text="@string/Snabble.QRCode.showThisCode"
         android:textColor="@color/snabble_textColorDark"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="8dp"
         android:layout_marginLeft="24dp"
         android:layout_marginRight="24dp"
         android:textSize="17sp" />
@@ -24,7 +38,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:padding="12dp"
-        android:layout_above="@+id/explanation2"
+        android:layout_above="@+id/pay_amount"
         android:layout_below="@+id/explanation1"
         tools:format="QR_CODE"
         tools:text="357294723482348234283472834732748327493473274832749347327483274947327483274838;" />