add support for changing actionbar titles in checkout

Author: ajungg

CHANGELOG.md

@@ -1,7 +1,7 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
-## [0.11.0-alpha1]
+## [0.11.0]
 
 ### Changes
 - SnabbleUICallback has now additional interface methods that needs to be implemented, 
@@ -26,6 +26,11 @@ the new class ProductResolver
 - Snabble.Payment.emptyState.add
 - Snabble.Payment.delete.message
 - Snabble.Payment.add
+- Snabble.Checkout.verifying
+- Snabble.Checkout.done
+- Snabble.Checkout.payAtCashRegister
+- Snabble.Checkout.error
+
 
 ## Fixed
 - Properly cleanup okhttp connections on error responses

build.gradle

@@ -24,20 +24,24 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.11.0-alpha1'
+        sdkVersion='0.11.0-alpha2'
         versionCode=1
 
         compileSdkVersion=28
         minSdkVersion=16
         targetSdkVersion=28
 
         buildToolsVersion='28.0.3'
-        okhttpVersion='3.11.0'
+        okhttpVersion='3.12.0'
 
         sdkVersion += project.getProperties().get("versionSuffix", "")
     }
 }
 
+task printVersion() {
+    println project.sdkVersion
+}
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }

local_release.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 
-./gradlew install -PversionSuffix=-SNAPSHOT
-
+d=`date +"%s"`
+./gradlew install -PversionSuffix=-${d}
+./gradlew printVersion -PversionSuffix=-${d}

ui/src/main/java/io/snabble/sdk/ui/SnabbleUI.java

@@ -1,12 +1,14 @@
 package io.snabble.sdk.ui;
 
 
+import androidx.appcompat.app.ActionBar;
 import io.snabble.sdk.Project;
 import io.snabble.sdk.utils.Logger;
 
 public class SnabbleUI {
     private static Project project;
     private static SnabbleUICallback uiCallback;
+    private static ActionBar actionBar;
 
     /**
      * Registers a globally used project for use with views.
@@ -20,7 +22,7 @@ public static void useProject(Project project) {
      * Registers a callback that the application needs to implement and respond accordingly.
      * <p>
      * Remember to unregister the callback when not used anymore, for example if you implement
-     * this callback in an Activity onCreate, remember to call unregisterUiCallbacks in onDestroy()
+     * this callback in an Activity onStart, remember to call unregisterUiCallbacks in onStop()
      * <p>
      * Calling this multiple times overwrites the old callback
      */
@@ -45,6 +47,31 @@ public static SnabbleUICallback getUiCallback() {
         return uiCallback;
     }
 
+    /**
+     * Registers a ActionBar for suggested changes on the action bar.
+     * <p>
+     * Remember to unregister the ActionBar when not used anymore, for example if you set
+     * this ActionBar in an Activity onCreate, remember to call unregisterActionBarListener in onDestroy()
+     * <p>
+     * Calling this multiple times overwrites the old callback
+     */
+    public static void registerActionBar(ActionBar bar) {
+        actionBar = bar;
+    }
+
+    /**
+     * Unregisters a callback that was previously registered.
+     */
+    public static void unregisterActionBar(ActionBar bar) {
+        if (actionBar == bar) {
+            actionBar = null;
+        }
+    }
+
+    public static ActionBar getActionBar() {
+        return actionBar;
+    }
+
     public static Project getProject() {
         if (project == null) {
             throw new RuntimeException("No Project instance set." +

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

@@ -28,6 +28,10 @@ public CheckoutAbortedView(Context context, AttributeSet attrs, int defStyleAttr
     private void inflateView() {
         inflate(getContext(), R.layout.view_checkout_aborted, this);
 
+        if (SnabbleUI.getActionBar() != null) {
+            SnabbleUI.getActionBar().setTitle(R.string.Snabble_Checkout_error);
+        }
+
         findViewById(R.id.back).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {

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

@@ -28,6 +28,10 @@ public CheckoutDoneView(Context context, AttributeSet attrs, int defStyleAttr) {
     private void inflateView() {
         inflate(getContext(), R.layout.view_checkout_done, this);
 
+        if (SnabbleUI.getActionBar() != null) {
+            SnabbleUI.getActionBar().setTitle(R.string.Snabble_Checkout_done);
+        }
+
         findViewById(R.id.back).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {

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

@@ -79,17 +79,26 @@ public void onClick(View v) {
         String formattedAmount = priceFormatter.format(project.getCheckout().getPriceToPay());
 
         TextView textView = findViewById(R.id.pay_amount);
-        textView.setText(getContext().getString(R.string.Snabble_PaymentSelection_title) + " " + formattedAmount);
+        String text = getContext().getString(R.string.Snabble_QRCode_total) + " " + formattedAmount;
+        textView.setText(text);
 
         explanationText = findViewById(R.id.explanation1);
         explanationText2 = findViewById(R.id.explanation2);
     }
 
     private void updateExplanationText(int codeCount) {
+        int resId;
         if (codeCount > 1) {
-            explanationText.setText(R.string.Snabble_QRCode_showTheseCodes);
+            resId = R.string.Snabble_QRCode_showTheseCodes;
         } else {
-            explanationText.setText(R.string.Snabble_QRCode_showThisCode);
+            resId = R.string.Snabble_QRCode_showThisCode;
+        }
+
+        if (SnabbleUI.getActionBar() != null) {
+            explanationText.setVisibility(View.GONE);
+            SnabbleUI.getActionBar().setTitle(resId);
+        } else {
+            explanationText.setText(resId);
         }
     }
 

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

@@ -49,7 +49,14 @@ public void onClick(View v) {
         String formattedAmount = priceFormatter.format(project.getCheckout().getPriceToPay());
 
         TextView textView = findViewById(R.id.pay_amount);
-        textView.setText(getContext().getString(R.string.Snabble_PaymentSelection_title) + " " + formattedAmount);
+        String text = getContext().getString(R.string.Snabble_QRCode_total) + " " + formattedAmount;
+
+        if (SnabbleUI.getActionBar() != null) {
+            textView.setVisibility(View.GONE);
+            SnabbleUI.getActionBar().setTitle(text);
+        } else {
+            textView.setText(text);
+        }
     }
 
     public void setQRCodeText(String text) {

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

@@ -91,6 +91,10 @@ public void onClick(View v) {
             }
         }
 
+        if (SnabbleUI.getActionBar() != null) {
+            SnabbleUI.getActionBar().setTitle(R.string.Snabble_Checkout_verifying);
+        }
+
         checkout = SnabbleUI.getProject().getCheckout();
         onStateChanged(checkout.getState());
     }

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

@@ -35,7 +35,6 @@ public class CheckoutView extends FrameLayout implements Checkout.OnCheckoutStat
 
     private Checkout.State previousState;
     private DelayedProgressDialog progressDialog;
-    private boolean showPricetoPayInPaymentSelection = true;
 
     public CheckoutView(Context context) {
         super(context);
@@ -89,7 +88,6 @@ public void onStateChanged(Checkout.State state) {
         switch (state) {
             case REQUEST_PAYMENT_METHOD:
                 PaymentMethodView paymentMethodView = new PaymentMethodView(getContext());
-                paymentMethodView.setShowPriceToPay(showPricetoPayInPaymentSelection);
                 displayView(paymentMethodView);
                 break;
             case WAIT_FOR_APPROVAL:
@@ -205,10 +203,6 @@ public void onDetachedFromWindow() {
         unregisterListeners();
     }
 
-    public void setShowPriceToPayInPaymentSelection(boolean show) {
-        showPricetoPayInPaymentSelection = show;
-    }
-
     private Application.ActivityLifecycleCallbacks activityLifecycleCallbacks =
             new SimpleActivityLifecycleCallbacks() {
                 @Override