From fbed3a8c12741724ac3b9867612536bdbb65a434 Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Thu, 4 Feb 2021 16:57:11 +0100
Subject: [PATCH 01/21] [wip] add new payment options view

---
 sample/src/main/AndroidManifest.xml           |   1 +
 .../java/io/snabble/testapp/BaseActivity.java |   9 +
 .../java/io/snabble/testapp/HomeFragment.java |   7 +
 .../testapp/PaymentOptionsActivity.java       |  14 ++
 sample/src/main/res/layout/fragment_home.xml  |   6 +
 .../integration/PaymentOptionsFragment.java   |  21 ++
 .../snabble_fragment_payment_options.xml      |   7 +
 ui/build.gradle                               |  10 +-
 .../java/io/snabble/sdk/ui/SnabbleUI.java     |   2 +
 .../sdk/ui/payment/PaymentOptionsView.kt      | 189 ++++++++++++++++++
 .../payment/SelectPaymentMethodFragment.java  |  11 -
 .../java/io/snabble/sdk/ui/utils/ViewExt.kt   |  23 +++
 ...nabble_item_payment_credentials_select.xml |  27 +--
 .../snabble_item_payment_options_entry.xml    |  26 +++
 .../snabble_item_payment_options_header.xml   |  10 +
 .../res/layout/snabble_payment_options.xml    |   8 +
 ui/src/main/res/values/ids.xml                |   4 +
 17 files changed, 338 insertions(+), 37 deletions(-)
 create mode 100644 sample/src/main/java/io/snabble/testapp/PaymentOptionsActivity.java
 create mode 100644 ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentOptionsFragment.java
 create mode 100644 ui-integration/src/main/res/layout/snabble_fragment_payment_options.xml
 create mode 100644 ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
 create mode 100644 ui/src/main/java/io/snabble/sdk/ui/utils/ViewExt.kt
 create mode 100644 ui/src/main/res/layout/snabble_item_payment_options_entry.xml
 create mode 100644 ui/src/main/res/layout/snabble_item_payment_options_header.xml
 create mode 100644 ui/src/main/res/layout/snabble_payment_options.xml
 create mode 100644 ui/src/main/res/values/ids.xml

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index b9e2eca039..453bcc266a 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -31,6 +31,7 @@
         <activity android:name=".CreditCardInputActivity" />
         <activity android:name=".PaydirektInputActivity" />
         <activity android:name=".PaymentCredentialsListActivity" />
+        <activity android:name=".PaymentOptionsActivity" />
         <activity android:name=".CheckoutCustomerCardActivity" />
         <activity android:name=".CheckoutOfflineActivity" />
         <activity android:name=".CheckoutGatekeeperActivity" />
diff --git a/sample/src/main/java/io/snabble/testapp/BaseActivity.java b/sample/src/main/java/io/snabble/testapp/BaseActivity.java
index 151f841c15..f3b20d3df6 100644
--- a/sample/src/main/java/io/snabble/testapp/BaseActivity.java
+++ b/sample/src/main/java/io/snabble/testapp/BaseActivity.java
@@ -15,6 +15,7 @@
 import io.snabble.sdk.ui.integration.SelfScanningFragment;
 import io.snabble.sdk.ui.integration.ZebraSupport;
 import io.snabble.sdk.ui.payment.PaydirektInputView;
+import io.snabble.sdk.ui.payment.PaymentOptionsView;
 import io.snabble.sdk.ui.scanner.ProductResolver;
 
 public abstract class BaseActivity extends AppCompatActivity implements SnabbleUI.Callback {
@@ -146,6 +147,9 @@ public void execute(SnabbleUI.Action action, Object data) {
             case SHOW_PAYMENT_CREDENTIALS_LIST:
                 showPaymentCredentialsList();
                 break;
+            case SHOW_PAYMENT_OPTIONS:
+                showPaymentOptions();
+                break;
             case SHOW_AGE_VERIFICATION:
                 showAgeVerification();
                 break;
@@ -238,6 +242,11 @@ public void showPaymentCredentialsList() {
         startActivity(intent);
     }
 
+    public void showPaymentOptions() {
+        Intent intent = new Intent(this, PaymentOptionsActivity.class);
+        startActivity(intent);
+    }
+
     public void showAgeVerification() {
         Intent intent = new Intent(this, AgeVerificationActivity.class);
         startActivity(intent);
diff --git a/sample/src/main/java/io/snabble/testapp/HomeFragment.java b/sample/src/main/java/io/snabble/testapp/HomeFragment.java
index 62ebcc957e..d2aad56661 100644
--- a/sample/src/main/java/io/snabble/testapp/HomeFragment.java
+++ b/sample/src/main/java/io/snabble/testapp/HomeFragment.java
@@ -69,6 +69,13 @@ public void onClick(View v) {
             }
         });
 
+        v.findViewById(R.id.show_po).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ((BaseActivity)getActivity()).showPaymentOptions();
+            }
+        });
+
         v.findViewById(R.id.age_verification).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/sample/src/main/java/io/snabble/testapp/PaymentOptionsActivity.java b/sample/src/main/java/io/snabble/testapp/PaymentOptionsActivity.java
new file mode 100644
index 0000000000..90786e27c5
--- /dev/null
+++ b/sample/src/main/java/io/snabble/testapp/PaymentOptionsActivity.java
@@ -0,0 +1,14 @@
+package io.snabble.testapp;
+
+import androidx.fragment.app.Fragment;
+
+import io.snabble.sdk.ui.integration.PaymentCredentialsListFragment;
+import io.snabble.sdk.ui.integration.PaymentOptionsFragment;
+
+public class PaymentOptionsActivity extends BaseActivity{
+    @Override
+    public Fragment onCreateFragment() {
+        return new PaymentOptionsFragment();
+    }
+}
+
diff --git a/sample/src/main/res/layout/fragment_home.xml b/sample/src/main/res/layout/fragment_home.xml
index 14f9511105..714a68df2a 100644
--- a/sample/src/main/res/layout/fragment_home.xml
+++ b/sample/src/main/res/layout/fragment_home.xml
@@ -65,6 +65,12 @@
             android:id="@+id/show_pm"
             android:text="Show Payment Methods" />
 
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:id="@+id/show_po"
+            android:text="Show Payment Options" />
 
         <Button
             android:layout_width="wrap_content"
diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentOptionsFragment.java b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentOptionsFragment.java
new file mode 100644
index 0000000000..22de177a37
--- /dev/null
+++ b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentOptionsFragment.java
@@ -0,0 +1,21 @@
+package io.snabble.sdk.ui.integration;
+
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.fragment.app.Fragment;
+
+public class PaymentOptionsFragment extends Fragment {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.snabble_fragment_payment_options, container, false);
+    }
+}
diff --git a/ui-integration/src/main/res/layout/snabble_fragment_payment_options.xml b/ui-integration/src/main/res/layout/snabble_fragment_payment_options.xml
new file mode 100644
index 0000000000..b46b7873c6
--- /dev/null
+++ b/ui-integration/src/main/res/layout/snabble_fragment_payment_options.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<io.snabble.sdk.ui.payment.PaymentOptionsView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/user_payment_method_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</io.snabble.sdk.ui.payment.PaymentOptionsView>
\ No newline at end of file
diff --git a/ui/build.gradle b/ui/build.gradle
index ed3a4a1b4f..408a1d316a 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -51,21 +51,21 @@ dependencies {
 
     implementation 'androidx.core:core:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0-beta01'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'androidx.webkit:webkit:1.3.0'
+    implementation 'androidx.webkit:webkit:1.4.0'
     implementation "androidx.viewpager2:viewpager2:1.0.0"
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'com.google.android:flexbox:2.0.1'
     implementation 'me.relex:circleindicator:2.1.4'
 
-    def camerax_version = "1.0.0-rc01"
+    def camerax_version = "1.0.0-rc02"
     implementation "androidx.camera:camera-core:${camerax_version}"
     implementation "androidx.camera:camera-camera2:${camerax_version}"
     implementation "androidx.camera:camera-lifecycle:${camerax_version}"
-    implementation "androidx.camera:camera-view:1.0.0-alpha20"
-    implementation "androidx.camera:camera-extensions:1.0.0-alpha20"
+    implementation "androidx.camera:camera-view:1.0.0-alpha21"
+    implementation "androidx.camera:camera-extensions:1.0.0-alpha21"
 
     //noinspection GradleDependency
     implementation 'commons-io:commons-io:2.5'
diff --git a/ui/src/main/java/io/snabble/sdk/ui/SnabbleUI.java b/ui/src/main/java/io/snabble/sdk/ui/SnabbleUI.java
index eb5762370d..6e2b6f6e70 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/SnabbleUI.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/SnabbleUI.java
@@ -29,6 +29,8 @@ public enum Action {
         SHOW_PAYDIREKT_INPUT,
         SHOW_SHOPPING_CART,
         SHOW_PAYMENT_CREDENTIALS_LIST,
+        SHOW_PAYMENT_OPTIONS,
+        SHOW_PROJECT_PAYMENT_OPTIONS,
         SHOW_AGE_VERIFICATION,
         GO_BACK,
         EVENT_PRODUCT_CONFIRMATION_SHOW,
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
new file mode 100644
index 0000000000..2dd83d0ce4
--- /dev/null
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
@@ -0,0 +1,189 @@
+package io.snabble.sdk.ui.payment
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.view.LayoutInflaterCompat
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import io.snabble.sdk.PaymentMethod
+import io.snabble.sdk.Project
+import io.snabble.sdk.Snabble
+import io.snabble.sdk.ui.R
+import io.snabble.sdk.ui.SnabbleUI
+import io.snabble.sdk.ui.utils.executeUiAction
+import io.snabble.sdk.ui.utils.loadAsset
+import java.util.*
+import kotlin.collections.ArrayList
+
+class PaymentOptionsView @JvmOverloads constructor(
+        context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : FrameLayout(context, attrs, defStyleAttr) {
+
+    init {
+        inflate(context, R.layout.snabble_payment_options, this)
+        val recyclerView = findViewById<RecyclerView>(R.id.recycler_view)
+
+        val adapter = EntryAdapter()
+        recyclerView.adapter = adapter
+        recyclerView.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+        adapter.submitList(getEntries())
+    }
+
+    private fun getEntries(): List<Entry> {
+        val paymentMethods = paymentMethods()
+        val projectsWithCreditCards = projectsWithCreditCards()
+        val globalList = ArrayList<Entry>()
+        val projectList = ArrayList<Entry>()
+
+        globalList.add(
+            Entry(
+                isSectionHeader = true,
+                text = "Händlerübergreifend",
+            )
+        )
+
+        if (paymentMethods.contains(PaymentMethod.DE_DIRECT_DEBIT)) {
+            globalList.add(
+                Entry(
+                    text = "SEPA",
+                    icon = R.drawable.snabble_ic_payment_select_sepa,
+                    click = {
+                        executeUiAction(SnabbleUI.Action.SHOW_SEPA_CARD_INPUT)
+                    }
+                )
+            )
+        }
+
+        if (paymentMethods.contains(PaymentMethod.PAYDIREKT)) {
+            globalList.add(
+                Entry(
+                    text = "Paydirekt",
+                    icon = R.drawable.snabble_ic_payment_select_paydirekt,
+                    click = {
+                        executeUiAction(SnabbleUI.Action.SHOW_PAYDIREKT_INPUT)
+                    }
+                )
+            )
+        }
+
+        projectList.add(
+            Entry(
+                isSectionHeader = true,
+                text = "Für einzelnen Händler",
+            )
+        )
+
+        projectsWithCreditCards.forEach { project ->
+            projectList.add(
+                Entry(
+                    text = project.name,
+                    project = project,
+                    click = {
+                        executeUiAction(SnabbleUI.Action.SHOW_PROJECT_PAYMENT_OPTIONS, project)
+                    }
+                )
+            )
+        }
+
+        val adapterList = ArrayList<Entry>()
+
+        if (globalList.size > 1) {
+            adapterList.addAll(globalList)
+        }
+
+        if (projectList.size > 1) {
+            adapterList.addAll(projectList)
+        }
+
+        return adapterList
+    }
+
+    private fun paymentMethods(): Set<PaymentMethod> {
+        val availablePaymentMethods = HashSet<PaymentMethod>()
+        Snabble.getInstance().projects.forEach {
+            availablePaymentMethods.addAll(it.availablePaymentMethods)
+        }
+        return availablePaymentMethods
+    }
+
+    private fun projectsWithCreditCards(): List<Project> {
+        return Snabble.getInstance().projects.filter { project ->
+            project.availablePaymentMethods.any {
+                    it == PaymentMethod.VISA
+                 || it == PaymentMethod.MASTERCARD
+                 || it == PaymentMethod.AMEX }
+        }
+    }
+
+    data class Entry(
+        val isSectionHeader: Boolean = false,
+        val text: String,
+        val icon: Int? = null,
+        val project: Project? = null,
+        val click: OnClickListener? = null,
+    )
+
+    class HeaderViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val text: TextView = itemView.findViewById(R.id.text)
+    }
+
+    class EntryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val text: TextView = itemView.findViewById(R.id.text)
+        val image: ImageView = itemView.findViewById(R.id.helper_image)
+    }
+
+    class EntryAdapter : ListAdapter<Entry, RecyclerView.ViewHolder>(EntryItemDiffer()) {
+        companion object {
+            const val SECTION_HEADER = 0
+            const val ENTRY = 1
+        }
+        override fun getItemViewType(position: Int): Int {
+            return if (getItem(position).isSectionHeader) SECTION_HEADER else ENTRY
+        }
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+            val inflater = LayoutInflater.from(parent.context)
+            return when(viewType) {
+                SECTION_HEADER -> HeaderViewHolder(inflater.inflate(R.layout.snabble_item_payment_options_header, parent, false))
+                else -> EntryViewHolder(inflater.inflate(R.layout.snabble_item_payment_options_entry, parent, false))
+            }
+        }
+
+        override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+            val entry = getItem(position)
+            if (holder is HeaderViewHolder) {
+                holder.text.text = entry.text
+            } else if (holder is EntryViewHolder){
+                holder.text.text = entry.text
+
+                if (entry.icon != null) {
+                    holder.image.setImageResource(entry.icon)
+                }
+
+                if (entry.project != null) {
+                    holder.image.loadAsset(entry.project.assets, "icon")
+                }
+
+                holder.itemView.setOnClickListener(entry.click)
+            }
+        }
+    }
+
+    class EntryItemDiffer : DiffUtil.ItemCallback<Entry>() {
+        override fun areItemsTheSame(oldItem: Entry, newItem: Entry): Boolean {
+            return oldItem === newItem
+        }
+
+        override fun areContentsTheSame(oldItem: Entry, newItem: Entry): Boolean {
+            return oldItem == newItem
+        }
+    }
+}
\ No newline at end of file
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java
index 4d0000a793..0ffee9d958 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java
@@ -1,7 +1,5 @@
 package io.snabble.sdk.ui.payment;
 
-import android.content.res.ColorStateList;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -9,7 +7,6 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.core.widget.ImageViewCompat;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -28,7 +25,6 @@
 import io.snabble.sdk.ui.R;
 import io.snabble.sdk.ui.SnabbleUI;
 import io.snabble.sdk.ui.utils.OneShotClickListener;
-import io.snabble.sdk.ui.utils.UIUtils;
 
 public class SelectPaymentMethodFragment extends BottomSheetDialogFragment {
     private List<Entry> entries;
@@ -185,7 +181,6 @@ private static class Entry {
     }
 
     private class ViewHolder extends RecyclerView.ViewHolder {
-        TextView usableAt;
         TextView text;
         ImageView image;
 
@@ -193,7 +188,6 @@ private class ViewHolder extends RecyclerView.ViewHolder {
             super(itemView);
 
             text = itemView.findViewById(R.id.text);
-            usableAt = itemView.findViewById(R.id.usable_at);
             image = itemView.findViewById(R.id.helper_image);
         }
     }
@@ -214,11 +208,6 @@ public void onBindViewHolder(final SelectPaymentMethodFragment.ViewHolder holder
             }
 
             holder.text.setText(e.text);
-            if (e.usableAt == null) {
-                holder.usableAt.setVisibility(View.GONE);
-            } else {
-                holder.usableAt.setText(e.usableAt);
-            }
             holder.itemView.setOnClickListener(e.onClickListener);
         }
 
diff --git a/ui/src/main/java/io/snabble/sdk/ui/utils/ViewExt.kt b/ui/src/main/java/io/snabble/sdk/ui/utils/ViewExt.kt
new file mode 100644
index 0000000000..58e578c1f5
--- /dev/null
+++ b/ui/src/main/java/io/snabble/sdk/ui/utils/ViewExt.kt
@@ -0,0 +1,23 @@
+package io.snabble.sdk.ui.utils
+
+import android.graphics.Bitmap
+import android.view.View
+import android.widget.ImageView
+import io.snabble.sdk.Assets
+import io.snabble.sdk.ui.R
+import io.snabble.sdk.ui.SnabbleUI
+import java.util.*
+
+fun View.executeUiAction(action: SnabbleUI.Action, data: Any? = null) {
+    SnabbleUI.getUiCallback()?.execute(action, data)
+}
+
+fun ImageView.loadAsset(assets: Assets, name: String) {
+    val randomUUID = UUID.randomUUID().toString()
+    setTag(R.id.snabble_asset_load_id, randomUUID)
+    assets.get(name, Assets.Callback { bitmap: Bitmap? ->
+        if (getTag(R.id.snabble_asset_load_id) === randomUUID) {
+            setImageBitmap(bitmap)
+        }
+    })
+}
\ No newline at end of file
diff --git a/ui/src/main/res/layout/snabble_item_payment_credentials_select.xml b/ui/src/main/res/layout/snabble_item_payment_credentials_select.xml
index 7e42f1c72e..bee1359283 100644
--- a/ui/src/main/res/layout/snabble_item_payment_credentials_select.xml
+++ b/ui/src/main/res/layout/snabble_item_payment_credentials_select.xml
@@ -13,30 +13,15 @@
         android:id="@+id/helper_image"
         tools:src="@drawable/snabble_ic_sepa_small" />
 
-    <LinearLayout
-        android:orientation="vertical"
+    <TextView
+        android:id="@+id/text"
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
+        tools:text="SEPA"
+        android:textStyle="bold"
+        android:textSize="16sp"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <TextView
-            android:id="@+id/text"
-            android:gravity="center_vertical"
-            tools:text="SEPA"
-            android:textStyle="bold"
-            android:textSize="16sp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <TextView
-            android:id="@+id/usable_at"
-            android:gravity="center_vertical"
-            android:textSize="12sp"
-            tools:text="Verfügbar bei: snabble GmbH, snabble GmbH, snabble GmbH, snabble GmbH"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-    </LinearLayout>
+        android:layout_height="wrap_content" />
 </LinearLayout>
\ No newline at end of file
diff --git a/ui/src/main/res/layout/snabble_item_payment_options_entry.xml b/ui/src/main/res/layout/snabble_item_payment_options_entry.xml
new file mode 100644
index 0000000000..847acd93b2
--- /dev/null
+++ b/ui/src/main/res/layout/snabble_item_payment_options_entry.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:background="?attr/selectableItemBackground"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_margin="16dp"
+        android:id="@+id/helper_image"
+        tools:src="@drawable/snabble_ic_sepa_small" />
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        tools:text="SEPA"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</LinearLayout>
\ No newline at end of file
diff --git a/ui/src/main/res/layout/snabble_item_payment_options_header.xml b/ui/src/main/res/layout/snabble_item_payment_options_header.xml
new file mode 100644
index 0000000000..a68b9890da
--- /dev/null
+++ b/ui/src/main/res/layout/snabble_item_payment_options_header.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/text"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+    android:padding="16dp"
+    tools:text="Zahlungsmethoden" />
\ No newline at end of file
diff --git a/ui/src/main/res/layout/snabble_payment_options.xml b/ui/src/main/res/layout/snabble_payment_options.xml
new file mode 100644
index 0000000000..4e2d1c2c16
--- /dev/null
+++ b/ui/src/main/res/layout/snabble_payment_options.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent" android:layout_height="match_parent">
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</FrameLayout>
\ No newline at end of file
diff --git a/ui/src/main/res/values/ids.xml b/ui/src/main/res/values/ids.xml
new file mode 100644
index 0000000000..b753e1edf5
--- /dev/null
+++ b/ui/src/main/res/values/ids.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item type="id" name="snabble_asset_load_id" />
+</resources>
\ No newline at end of file

From d13512f4a2b6c20216d616571f33c1c2aba36327 Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Mon, 8 Feb 2021 17:17:34 +0100
Subject: [PATCH 02/21] [wip] new payment drilldown

---
 build.gradle                                  |  2 +-
 .../java/io/snabble/testapp/BaseActivity.java | 12 +++
 .../ProjectPaymentOptionsActivity.java        | 17 ++++
 .../ProjectPaymentOptionsFragment.kt          | 39 ++++++++
 ...nabble_fragment_select_payment_project.xml |  7 ++
 .../sdk/ui/payment/PaymentOptionsView.kt      | 27 +++++-
 .../payment/SelectPaymentMethodFragment.java  | 22 +++++
 .../ui/payment/SelectProjectPaymentView.kt    | 88 +++++++++++++++++++
 .../snabble_item_payment_options_header.xml   |  2 +-
 .../snabble_item_select_payment_project.xml   | 26 ++++++
 .../layout/snabble_select_payment_project.xml |  8 ++
 11 files changed, 246 insertions(+), 4 deletions(-)
 create mode 100644 sample/src/main/java/io/snabble/testapp/ProjectPaymentOptionsActivity.java
 create mode 100644 ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
 create mode 100644 ui-integration/src/main/res/layout/snabble_fragment_select_payment_project.xml
 create mode 100644 ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt
 create mode 100644 ui/src/main/res/layout/snabble_item_select_payment_project.xml
 create mode 100644 ui/src/main/res/layout/snabble_select_payment_project.xml

diff --git a/build.gradle b/build.gradle
index ca028c6cc6..063273ca2b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath 'gradle.plugin.com.github.jlouns:gradle-cross-platform-exec-plugin:0.5.0'
         classpath "gradle.plugin.gmazzo:sqlite-plugin:0.2"
     }
diff --git a/sample/src/main/java/io/snabble/testapp/BaseActivity.java b/sample/src/main/java/io/snabble/testapp/BaseActivity.java
index f3b20d3df6..3a9b1e78d0 100644
--- a/sample/src/main/java/io/snabble/testapp/BaseActivity.java
+++ b/sample/src/main/java/io/snabble/testapp/BaseActivity.java
@@ -10,8 +10,11 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 
+import java.io.Serializable;
+
 import io.snabble.sdk.codes.ScannedCode;
 import io.snabble.sdk.ui.SnabbleUI;
+import io.snabble.sdk.ui.integration.ProjectPaymentOptionsFragment;
 import io.snabble.sdk.ui.integration.SelfScanningFragment;
 import io.snabble.sdk.ui.integration.ZebraSupport;
 import io.snabble.sdk.ui.payment.PaydirektInputView;
@@ -150,6 +153,9 @@ public void execute(SnabbleUI.Action action, Object data) {
             case SHOW_PAYMENT_OPTIONS:
                 showPaymentOptions();
                 break;
+            case SHOW_PROJECT_PAYMENT_OPTIONS:
+                showProjectPaymentOptions((Serializable)data);
+                break;
             case SHOW_AGE_VERIFICATION:
                 showAgeVerification();
                 break;
@@ -247,6 +253,12 @@ public void showPaymentOptions() {
         startActivity(intent);
     }
 
+    public void showProjectPaymentOptions(Serializable data) {
+        Intent intent = new Intent(this, PaymentOptionsActivity.class);
+        intent.putExtra(ProjectPaymentOptionsFragment.ARG_BRAND, data);
+        startActivity(intent);
+    }
+
     public void showAgeVerification() {
         Intent intent = new Intent(this, AgeVerificationActivity.class);
         startActivity(intent);
diff --git a/sample/src/main/java/io/snabble/testapp/ProjectPaymentOptionsActivity.java b/sample/src/main/java/io/snabble/testapp/ProjectPaymentOptionsActivity.java
new file mode 100644
index 0000000000..4afd64bb26
--- /dev/null
+++ b/sample/src/main/java/io/snabble/testapp/ProjectPaymentOptionsActivity.java
@@ -0,0 +1,17 @@
+package io.snabble.testapp;
+
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+import io.snabble.sdk.ui.integration.ProjectPaymentOptionsFragment;
+
+public class ProjectPaymentOptionsActivity extends BaseActivity {
+    @Override
+    public Fragment onCreateFragment() {
+        ProjectPaymentOptionsFragment fragment = new ProjectPaymentOptionsFragment();
+        Bundle args = new Bundle();
+        args.putSerializable(ProjectPaymentOptionsFragment.ARG_BRAND, getIntent().getSerializableExtra(ProjectPaymentOptionsFragment.ARG_BRAND));
+        return fragment;
+    }
+}
+
diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
new file mode 100644
index 0000000000..523ad47e34
--- /dev/null
+++ b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
@@ -0,0 +1,39 @@
+package io.snabble.sdk.ui.integration
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import io.snabble.sdk.Project
+import io.snabble.sdk.Snabble
+import io.snabble.sdk.ui.payment.SelectProjectPaymentView
+
+class ProjectPaymentOptionsFragment : Fragment() {
+    companion object {
+        const val ARG_BRAND = "brand"
+    }
+
+    var brand: String? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        brand = arguments?.getString(ARG_BRAND, null)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val v =  inflater.inflate(R.layout.snabble_fragment_select_payment_project, container, false) as SelectProjectPaymentView
+
+        brand?.let { brand ->
+            val projects = ArrayList<Project>()
+            Snabble.getInstance().projects.forEach { project ->
+                if (project.brand.name == brand) {
+                    projects.add(project)
+                }
+            }
+            v.projects = projects
+        }
+
+        return v
+    }
+}
\ No newline at end of file
diff --git a/ui-integration/src/main/res/layout/snabble_fragment_select_payment_project.xml b/ui-integration/src/main/res/layout/snabble_fragment_select_payment_project.xml
new file mode 100644
index 0000000000..19e0e47a7f
--- /dev/null
+++ b/ui-integration/src/main/res/layout/snabble_fragment_select_payment_project.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<io.snabble.sdk.ui.payment.SelectProjectPaymentView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/select_payment_project_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</io.snabble.sdk.ui.payment.SelectProjectPaymentView>
\ No newline at end of file
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
index 2dd83d0ce4..4bb6af9cbf 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
@@ -1,6 +1,7 @@
 package io.snabble.sdk.ui.payment
 
 import android.content.Context
+import android.os.Bundle
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
@@ -8,7 +9,7 @@ import android.view.ViewGroup
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.core.view.LayoutInflaterCompat
+import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.ListAdapter
@@ -18,6 +19,7 @@ import io.snabble.sdk.Project
 import io.snabble.sdk.Snabble
 import io.snabble.sdk.ui.R
 import io.snabble.sdk.ui.SnabbleUI
+import io.snabble.sdk.ui.utils.UIUtils
 import io.snabble.sdk.ui.utils.executeUiAction
 import io.snabble.sdk.ui.utils.loadAsset
 import java.util.*
@@ -82,12 +84,33 @@ class PaymentOptionsView @JvmOverloads constructor(
         )
 
         projectsWithCreditCards.forEach { project ->
+            val projectsWithSameBrand = Snabble.getInstance().projects.filter {
+                it.brand?.name == project.brand?.name
+            }
+
             projectList.add(
                 Entry(
                     text = project.name,
                     project = project,
                     click = {
-                        executeUiAction(SnabbleUI.Action.SHOW_PROJECT_PAYMENT_OPTIONS, project)
+                        if (projectsWithSameBrand.isEmpty()) {
+                            val activity = UIUtils.getHostActivity(context)
+                            if (activity is FragmentActivity) {
+                                val dialogFragment = SelectPaymentMethodFragment()
+                                val args = Bundle()
+                                args.putSerializable(SelectPaymentMethodFragment.ARG_PAYMENT_METHOD_LIST, java.util.ArrayList(listOf(
+                                    PaymentMethod.VISA,
+                                    PaymentMethod.MASTERCARD,
+                                    PaymentMethod.AMEX))
+                                )
+                                dialogFragment.arguments = args
+                                dialogFragment.show(activity.supportFragmentManager, null)
+                            } else {
+                                throw RuntimeException("Host activity needs to be a FragmentActivity")
+                            }
+                        } else {
+                            executeUiAction(SnabbleUI.Action.SHOW_PROJECT_PAYMENT_OPTIONS, projectsWithSameBrand)
+                        }
                     }
                 )
             )
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java
index 0ffee9d958..1eeaf20a17 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java
@@ -7,6 +7,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -15,6 +16,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -27,7 +29,21 @@
 import io.snabble.sdk.ui.utils.OneShotClickListener;
 
 public class SelectPaymentMethodFragment extends BottomSheetDialogFragment {
+    public static final String ARG_PAYMENT_METHOD_LIST = "paymentMethods";
     private List<Entry> entries;
+    private Set<PaymentMethod> paymentMethods;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Bundle args = getArguments();
+        if (args != null) {
+            Collection<PaymentMethod> list = (Collection<PaymentMethod>) args.getSerializable(ARG_PAYMENT_METHOD_LIST);
+            paymentMethods = new HashSet<>();
+            paymentMethods.addAll(list);
+        }
+    }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -40,6 +56,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
             availablePaymentMethods.addAll(Arrays.asList(project.getAvailablePaymentMethods()));
         }
 
+        if (paymentMethods == null) {
+            paymentMethods = availablePaymentMethods;
+        }
+
+        availablePaymentMethods.retainAll(paymentMethods);
+
         if (availablePaymentMethods.contains(PaymentMethod.DE_DIRECT_DEBIT)) {
             entries.add(new SelectPaymentMethodFragment.Entry(R.drawable.snabble_ic_payment_select_sepa,
                     "SEPA", getUsableAtText(PaymentMethod.DE_DIRECT_DEBIT), new OneShotClickListener() {
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt
new file mode 100644
index 0000000000..09a9eef618
--- /dev/null
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt
@@ -0,0 +1,88 @@
+package io.snabble.sdk.ui.payment
+
+import android.content.Context
+import android.os.Bundle
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.fragment.app.FragmentActivity
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import io.snabble.sdk.PaymentMethod
+import io.snabble.sdk.Project
+import io.snabble.sdk.ui.R
+import io.snabble.sdk.ui.utils.UIUtils
+import io.snabble.sdk.ui.utils.loadAsset
+import java.util.*
+
+class SelectProjectPaymentView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : FrameLayout(context, attrs, defStyleAttr) {
+
+    private var adapter: EntryAdapter
+
+    var projects: List<Project>? = null
+        set(value) {
+            field = value
+            adapter.submitList(value)
+        }
+
+    init {
+        inflate(context, R.layout.snabble_select_payment_project, this)
+        val recyclerView = findViewById<RecyclerView>(R.id.recycler_view)
+
+        adapter = EntryAdapter()
+        recyclerView.adapter = adapter
+        recyclerView.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+    }
+
+    class EntryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val text: TextView = itemView.findViewById(R.id.text)
+        val image: ImageView = itemView.findViewById(R.id.helper_image)
+    }
+
+    inner class EntryAdapter : ListAdapter<Project, EntryViewHolder>(EntryItemDiffer()) {
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EntryViewHolder {
+            val inflater = LayoutInflater.from(parent.context)
+            return EntryViewHolder(inflater.inflate(R.layout.snabble_item_select_payment_project, parent, false))
+        }
+
+        override fun onBindViewHolder(holder: EntryViewHolder, position: Int) {
+            val entry = getItem(position)
+            holder.text.text = entry.name
+            holder.image.loadAsset(entry.assets, "icon")
+            holder.itemView.setOnClickListener {
+                val activity = UIUtils.getHostActivity(context)
+                if (activity is FragmentActivity) {
+                    val dialogFragment = SelectPaymentMethodFragment()
+                    val args = Bundle()
+                    args.putSerializable(SelectPaymentMethodFragment.ARG_PAYMENT_METHOD_LIST, ArrayList(listOf(
+                        PaymentMethod.VISA,
+                        PaymentMethod.MASTERCARD,
+                        PaymentMethod.AMEX))
+                    )
+                    dialogFragment.arguments = args
+                    dialogFragment.show(activity.supportFragmentManager, null)
+                } else {
+                    throw RuntimeException("Host activity needs to be a FragmentActivity")
+                }
+            }
+        }
+    }
+
+    class EntryItemDiffer : DiffUtil.ItemCallback<Project>() {
+        override fun areItemsTheSame(oldItem: Project, newItem: Project): Boolean {
+            return oldItem === newItem
+        }
+
+        override fun areContentsTheSame(oldItem: Project, newItem: Project): Boolean {
+            return oldItem.id == newItem.id
+        }
+    }
+}
\ No newline at end of file
diff --git a/ui/src/main/res/layout/snabble_item_payment_options_header.xml b/ui/src/main/res/layout/snabble_item_payment_options_header.xml
index a68b9890da..b7c269da06 100644
--- a/ui/src/main/res/layout/snabble_item_payment_options_header.xml
+++ b/ui/src/main/res/layout/snabble_item_payment_options_header.xml
@@ -5,6 +5,6 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+    android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2"
     android:padding="16dp"
     tools:text="Zahlungsmethoden" />
\ No newline at end of file
diff --git a/ui/src/main/res/layout/snabble_item_select_payment_project.xml b/ui/src/main/res/layout/snabble_item_select_payment_project.xml
new file mode 100644
index 0000000000..847acd93b2
--- /dev/null
+++ b/ui/src/main/res/layout/snabble_item_select_payment_project.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:background="?attr/selectableItemBackground"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_margin="16dp"
+        android:id="@+id/helper_image"
+        tools:src="@drawable/snabble_ic_sepa_small" />
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        tools:text="SEPA"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</LinearLayout>
\ No newline at end of file
diff --git a/ui/src/main/res/layout/snabble_select_payment_project.xml b/ui/src/main/res/layout/snabble_select_payment_project.xml
new file mode 100644
index 0000000000..4e2d1c2c16
--- /dev/null
+++ b/ui/src/main/res/layout/snabble_select_payment_project.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent" android:layout_height="match_parent">
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</FrameLayout>
\ No newline at end of file

From 2e02ade6ec1d0594079a500174dc16a908167781 Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Tue, 9 Feb 2021 16:35:11 +0100
Subject: [PATCH 03/21] Rename .java to .kt

---
 .../{CreditCardInputFragment.java => CreditCardInputFragment.kt}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename ui-integration/src/main/java/io/snabble/sdk/ui/integration/{CreditCardInputFragment.java => CreditCardInputFragment.kt} (100%)

diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.java b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt
similarity index 100%
rename from ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.java
rename to ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt

From 86edc8a28d8706a4b35b7eaf9d51bdfe602b609b Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Tue, 9 Feb 2021 16:35:11 +0100
Subject: [PATCH 04/21] fragment arg refactoring and psd2 support

---
 core/src/main/java/io/snabble/sdk/Brand.kt    |  6 +-
 .../src/main/java/io/snabble/sdk/Project.java |  4 +
 .../sdk/payment/PaymentCredentials.java       | 23 +++--
 sample/src/main/AndroidManifest.xml           |  1 +
 .../java/io/snabble/testapp/BaseActivity.java | 21 +++--
 .../testapp/CreditCardInputActivity.java      |  4 +-
 .../ProjectPaymentOptionsActivity.java        |  5 +-
 .../snabble/testapp/SelfScanningActivity.java | 11 +--
 .../ui/integration/CreditCardInputFragment.kt | 41 ++++++---
 .../ProjectPaymentOptionsFragment.kt          |  4 +-
 .../java/io/snabble/sdk/ui/SnabbleUI.java     |  7 +-
 .../snabble/sdk/ui/cart/ShoppingCartView.java |  2 +-
 .../sdk/ui/payment/CreditCardInputView.java   | 92 +++++++++++++------
 .../ui/payment/PaymentInputViewHelper.java    | 21 +++--
 .../sdk/ui/payment/PaymentOptionsView.kt      | 46 +++++++---
 .../payment/SelectPaymentMethodFragment.java  | 23 +++--
 .../ui/payment/SelectProjectPaymentView.kt    |  2 +-
 .../ui/scanner/ProductConfirmationDialog.java |  6 +-
 .../sdk/ui/search/ProductSearchView.java      |  5 +-
 .../java/io/snabble/sdk/ui/utils/ViewExt.kt   |  5 +-
 .../main/res/raw/snabble_creditcardform.html  | 12 ++-
 .../io/snabble/sdk/utils/JsonCallback.java    |  7 ++
 22 files changed, 231 insertions(+), 117 deletions(-)

diff --git a/core/src/main/java/io/snabble/sdk/Brand.kt b/core/src/main/java/io/snabble/sdk/Brand.kt
index bbadd6bef6..5ca629d6cf 100644
--- a/core/src/main/java/io/snabble/sdk/Brand.kt
+++ b/core/src/main/java/io/snabble/sdk/Brand.kt
@@ -3,4 +3,8 @@ package io.snabble.sdk
 data class Brand(
     val id: String,
     val name: String,
-)
\ No newline at end of file
+) : Comparable<Brand> {
+    override fun compareTo(other: Brand) = compareValuesBy(this, other,
+        { it.id },
+    )
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/snabble/sdk/Project.java b/core/src/main/java/io/snabble/sdk/Project.java
index ace83ace55..2e72886ef5 100644
--- a/core/src/main/java/io/snabble/sdk/Project.java
+++ b/core/src/main/java/io/snabble/sdk/Project.java
@@ -354,6 +354,10 @@ public String getProductByCodeUrl() {
         return urls.get("resolvedProductLookUp");
     }
 
+    public String getTelecashVaultItemsUrl() {
+        return urls.get("telecashVaultItems");
+    }
+
     public BarcodeFormat[] getSupportedBarcodeFormats() {
         return supportedBarcodeFormats;
     }
diff --git a/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java b/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java
index cc7e273cea..bb5901c69f 100644
--- a/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java
+++ b/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java
@@ -13,7 +13,6 @@
 import java.security.cert.X509Certificate;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.MGF1ParameterSpec;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -22,6 +21,7 @@
 import javax.crypto.spec.PSource;
 
 import io.snabble.sdk.PaymentMethod;
+import io.snabble.sdk.Project;
 import io.snabble.sdk.R;
 import io.snabble.sdk.Snabble;
 import io.snabble.sdk.utils.GsonHolder;
@@ -31,7 +31,8 @@
 public class PaymentCredentials {
     public enum Type {
         SEPA(null),
-        CREDIT_CARD(null),
+        CREDIT_CARD(null), // legacy credit card type, not used anmore.
+        CREDIT_CARD_PSD2(null),
         PAYDIREKT(null),
         TEGUT_EMPLOYEE_CARD("tegutEmployeeID");
 
@@ -60,6 +61,8 @@ private static class SepaData {
 
     private static class CreditCardData {
         private String hostedDataID;
+        private String schemeTransactionID;
+        private String projectID;
         private String hostedDataStoreID;
         private String cardType;
     }
@@ -139,12 +142,18 @@ public static PaymentCredentials fromSEPA(String name, String iban) {
         return pc;
     }
 
-    public static PaymentCredentials fromCreditCardData(String name, Brand brand, String obfuscatedId,
-                                                        String expirationMonth, String expirationYear,
-                                                        String hostedDataId, String storeId) {
+    public static PaymentCredentials fromCreditCardData(String name,
+                                                        Brand brand,
+                                                        String projectId,
+                                                        String obfuscatedId,
+                                                        String expirationMonth,
+                                                        String expirationYear,
+                                                        String hostedDataId,
+                                                        String schemeTransactionId,
+                                                        String storeId) {
         PaymentCredentials pc = new PaymentCredentials();
         pc.generateId();
-        pc.type = Type.CREDIT_CARD;
+        pc.type = Type.CREDIT_CARD_PSD2;
 
         List<X509Certificate> certificates = Snabble.getInstance().getPaymentSigningCertificates();
         if (certificates.size() == 0) {
@@ -159,6 +168,8 @@ public static PaymentCredentials fromCreditCardData(String name, Brand brand, St
 
         CreditCardData creditCardData = new CreditCardData();
         creditCardData.hostedDataID = hostedDataId;
+        creditCardData.projectID = projectId;
+        creditCardData.schemeTransactionID = schemeTransactionId;
         creditCardData.hostedDataStoreID = storeId;
 
         switch (brand) {
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 453bcc266a..a006646738 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -32,6 +32,7 @@
         <activity android:name=".PaydirektInputActivity" />
         <activity android:name=".PaymentCredentialsListActivity" />
         <activity android:name=".PaymentOptionsActivity" />
+        <activity android:name=".ProjectPaymentOptionsActivity" />
         <activity android:name=".CheckoutCustomerCardActivity" />
         <activity android:name=".CheckoutOfflineActivity" />
         <activity android:name=".CheckoutGatekeeperActivity" />
diff --git a/sample/src/main/java/io/snabble/testapp/BaseActivity.java b/sample/src/main/java/io/snabble/testapp/BaseActivity.java
index 3a9b1e78d0..29df2c61c9 100644
--- a/sample/src/main/java/io/snabble/testapp/BaseActivity.java
+++ b/sample/src/main/java/io/snabble/testapp/BaseActivity.java
@@ -103,13 +103,13 @@ protected void onStop() {
     public abstract Fragment onCreateFragment();
 
     @Override
-    public void execute(SnabbleUI.Action action, Object data) {
+    public void execute(SnabbleUI.Action action, Bundle args) {
         switch(action) {
             case GO_BACK:
                 onBackPressed();
                 break;
             case SHOW_SCANNER:
-                showScannerWithCode((String)data);
+                showScannerWithCode(args);
                 break;
             case SHOW_SHOPPING_CART:
                 showShoppingCart();
@@ -142,7 +142,7 @@ public void execute(SnabbleUI.Action action, Object data) {
                 showSEPACardInput();
                 break;
             case SHOW_CREDIT_CARD_INPUT:
-                showCreditCardInput();
+                showCreditCardInput(args);
                 break;
             case SHOW_PAYDIREKT_INPUT:
                 showPaydirektInput();
@@ -154,7 +154,7 @@ public void execute(SnabbleUI.Action action, Object data) {
                 showPaymentOptions();
                 break;
             case SHOW_PROJECT_PAYMENT_OPTIONS:
-                showProjectPaymentOptions((Serializable)data);
+                showProjectPaymentOptions(args);
                 break;
             case SHOW_AGE_VERIFICATION:
                 showAgeVerification();
@@ -215,10 +215,10 @@ public void showPaymentFailure() {
         startActivity(intent);
     }
 
-    public void showScannerWithCode(String scannableCode) {
+    public void showScannerWithCode(Bundle args) {
         Intent intent = new Intent(this, SelfScanningActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intent.putExtra(SelfScanningFragment.ARG_SHOW_PRODUCT_CODE, scannableCode);
+        intent.putExtra("args", args);
         startActivity(intent);
     }
 
@@ -233,8 +233,9 @@ public void showSEPACardInput() {
         startActivity(intent);
     }
 
-    public void showCreditCardInput() {
+    public void showCreditCardInput(Bundle args) {
         Intent intent = new Intent(this, CreditCardInputActivity.class);
+        intent.putExtra("args", args);
         startActivity(intent);
     }
 
@@ -253,9 +254,9 @@ public void showPaymentOptions() {
         startActivity(intent);
     }
 
-    public void showProjectPaymentOptions(Serializable data) {
-        Intent intent = new Intent(this, PaymentOptionsActivity.class);
-        intent.putExtra(ProjectPaymentOptionsFragment.ARG_BRAND, data);
+    public void showProjectPaymentOptions(Bundle args) {
+        Intent intent = new Intent(this, ProjectPaymentOptionsActivity.class);
+        intent.putExtra("args", args);
         startActivity(intent);
     }
 
diff --git a/sample/src/main/java/io/snabble/testapp/CreditCardInputActivity.java b/sample/src/main/java/io/snabble/testapp/CreditCardInputActivity.java
index 8dbea9dff0..be7a6e0488 100644
--- a/sample/src/main/java/io/snabble/testapp/CreditCardInputActivity.java
+++ b/sample/src/main/java/io/snabble/testapp/CreditCardInputActivity.java
@@ -7,7 +7,9 @@
 public class CreditCardInputActivity extends BaseActivity {
     @Override
     public Fragment onCreateFragment() {
-        return new CreditCardInputFragment();
+        CreditCardInputFragment fragment =  new CreditCardInputFragment();
+        fragment.setArguments(getIntent().getBundleExtra("args"));
+        return fragment;
     }
 }
 
diff --git a/sample/src/main/java/io/snabble/testapp/ProjectPaymentOptionsActivity.java b/sample/src/main/java/io/snabble/testapp/ProjectPaymentOptionsActivity.java
index 4afd64bb26..bb5d0840e8 100644
--- a/sample/src/main/java/io/snabble/testapp/ProjectPaymentOptionsActivity.java
+++ b/sample/src/main/java/io/snabble/testapp/ProjectPaymentOptionsActivity.java
@@ -1,7 +1,5 @@
 package io.snabble.testapp;
 
-import android.os.Bundle;
-
 import androidx.fragment.app.Fragment;
 import io.snabble.sdk.ui.integration.ProjectPaymentOptionsFragment;
 
@@ -9,8 +7,7 @@ public class ProjectPaymentOptionsActivity extends BaseActivity {
     @Override
     public Fragment onCreateFragment() {
         ProjectPaymentOptionsFragment fragment = new ProjectPaymentOptionsFragment();
-        Bundle args = new Bundle();
-        args.putSerializable(ProjectPaymentOptionsFragment.ARG_BRAND, getIntent().getSerializableExtra(ProjectPaymentOptionsFragment.ARG_BRAND));
+        fragment.setArguments(getIntent().getBundleExtra("args"));
         return fragment;
     }
 }
diff --git a/sample/src/main/java/io/snabble/testapp/SelfScanningActivity.java b/sample/src/main/java/io/snabble/testapp/SelfScanningActivity.java
index ffbaa20de6..6091940bca 100644
--- a/sample/src/main/java/io/snabble/testapp/SelfScanningActivity.java
+++ b/sample/src/main/java/io/snabble/testapp/SelfScanningActivity.java
@@ -1,8 +1,5 @@
 package io.snabble.testapp;
 
-import android.content.Intent;
-import android.os.Bundle;
-
 import androidx.fragment.app.Fragment;
 
 import io.snabble.sdk.ui.integration.SelfScanningFragment;
@@ -10,14 +7,8 @@
 public class SelfScanningActivity extends BaseActivity {
     @Override
     public Fragment onCreateFragment() {
-        Intent intent = getIntent();
-        String scannableCode = intent.getStringExtra(SelfScanningFragment.ARG_SHOW_PRODUCT_CODE);
-
         SelfScanningFragment selfScanningFragment = new SelfScanningFragment();
-        Bundle args = new Bundle();
-        args.putString(SelfScanningFragment.ARG_SHOW_PRODUCT_CODE, scannableCode);
-        selfScanningFragment.setArguments(args);
-
+        selfScanningFragment.setArguments(getIntent().getBundleExtra("args"));
         return selfScanningFragment;
     }
 }
diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt
index 693ffc9f45..25150c0185 100644
--- a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt
+++ b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt
@@ -1,22 +1,33 @@
-package io.snabble.sdk.ui.integration;
+package io.snabble.sdk.ui.integration
 
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import io.snabble.sdk.PaymentMethod
+import io.snabble.sdk.ui.payment.CreditCardInputView
 
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
+class CreditCardInputFragment : Fragment() {
+    companion object {
+        const val ARG_PROJECT_ID = "projectId"
+        const val ARG_PAYMENT_METHOD = "paymentType"
+    }
+
+    var projectId: String? = null
+    var paymentMethod: PaymentMethod? = null
 
-import androidx.fragment.app.Fragment;
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
 
-public class CreditCardInputFragment extends Fragment {
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
+        projectId = arguments?.getString(ARG_PROJECT_ID, null)
+        paymentMethod = arguments?.getSerializable(ARG_PAYMENT_METHOD) as PaymentMethod?
     }
 
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.snabble_fragment_cardinput_creditcard, container, false);
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val v = inflater.inflate(R.layout.snabble_fragment_cardinput_creditcard, container, false) as CreditCardInputView
+        v.load(projectId, paymentMethod)
+        return v
     }
-}
+}
\ No newline at end of file
diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
index 523ad47e34..7debc1e800 100644
--- a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
+++ b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
@@ -11,7 +11,7 @@ import io.snabble.sdk.ui.payment.SelectProjectPaymentView
 
 class ProjectPaymentOptionsFragment : Fragment() {
     companion object {
-        const val ARG_BRAND = "brand"
+        const val ARG_BRAND = "brandId"
     }
 
     var brand: String? = null
@@ -27,7 +27,7 @@ class ProjectPaymentOptionsFragment : Fragment() {
         brand?.let { brand ->
             val projects = ArrayList<Project>()
             Snabble.getInstance().projects.forEach { project ->
-                if (project.brand.name == brand) {
+                if (project.brand.id == brand) {
                     projects.add(project)
                 }
             }
diff --git a/ui/src/main/java/io/snabble/sdk/ui/SnabbleUI.java b/ui/src/main/java/io/snabble/sdk/ui/SnabbleUI.java
index 6e2b6f6e70..f3845278ea 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/SnabbleUI.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/SnabbleUI.java
@@ -2,6 +2,7 @@
 
 
 import android.app.Activity;
+import android.os.Bundle;
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
@@ -38,7 +39,7 @@ public enum Action {
     }
 
     public interface Callback {
-        void execute(Action action, Object data);
+        void execute(Action action, Bundle args);
     }
 
     private static Project currentProject;
@@ -118,9 +119,9 @@ public static void executeAction(Action action) {
         executeAction(action, null);
     }
 
-    public static void executeAction(Action action, Object data) {
+    public static void executeAction(Action action, Bundle args) {
         if (uiCallback != null) {
-            uiCallback.execute(action, data);
+            uiCallback.execute(action, args);
         }
     }
 
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
index 3f2da5de4f..c9084ab06e 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/cart/ShoppingCartView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/cart/ShoppingCartView.java
@@ -310,7 +310,7 @@ private void pay() {
             PaymentSelectionHelper.Entry entry = paymentSelectionHelper.getSelectedEntry().getValue();
             if (entry != null) {
                 if (entry.paymentMethod.isRequiringCredentials() && entry.paymentCredentials == null) {
-                    PaymentInputViewHelper.openPaymentInputView(entry.paymentMethod);
+                    PaymentInputViewHelper.openPaymentInputView(entry.paymentMethod, project);
                 } else {
                     Telemetry.event(Telemetry.Event.ClickCheckout);
                     SEPALegalInfoHelper.showSEPALegalInfoIfNeeded(getContext(),
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/CreditCardInputView.java b/ui/src/main/java/io/snabble/sdk/ui/payment/CreditCardInputView.java
index 9e05d8831f..df1758cf4e 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/CreditCardInputView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/CreditCardInputView.java
@@ -5,7 +5,6 @@
 import android.app.Application;
 import android.content.Context;
 import android.content.res.Resources;
-import android.os.Build;
 import android.util.AttributeSet;
 import android.util.Base64;
 import android.view.View;
@@ -19,19 +18,18 @@
 import android.widget.Toast;
 
 import androidx.annotation.Keep;
-import androidx.annotation.NonNull;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleEventObserver;
-import androidx.lifecycle.LifecycleOwner;
 
 import org.apache.commons.io.IOUtils;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.util.UUID;
 
 import io.snabble.sdk.PaymentMethod;
+import io.snabble.sdk.Project;
 import io.snabble.sdk.Snabble;
 import io.snabble.sdk.payment.PaymentCredentials;
 import io.snabble.sdk.ui.Keyguard;
@@ -47,34 +45,33 @@
 import okhttp3.Callback;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.RequestBody;
 import okhttp3.Response;
 
 public class CreditCardInputView extends FrameLayout {
-    public static PaymentMethod type;
-
     private boolean acceptedKeyguard;
     private WebView webView;
     private OkHttpClient okHttpClient;
     private Resources resources;
     private HashResponse lastHashResponse;
+    private String cancelPreAuthUrl;
     private ProgressBar progressBar;
-    private boolean isAttachedToWindow;
     private boolean isActivityResumed;
     private CreditCardInfo pendingCreditCardInfo;
 
+    private PaymentMethod paymentType;
+    private String projectId;
+
     public CreditCardInputView(Context context) {
         super(context);
-        inflateView();
     }
 
     public CreditCardInputView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        inflateView();
     }
 
     public CreditCardInputView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        inflateView();
     }
 
     @SuppressLint({"InlinedApi", "SetJavaScriptEnabled", "AddJavascriptInterface"})
@@ -124,6 +121,13 @@ public void onProgressChanged(WebView view, final int newProgress) {
         requestHash();
     }
 
+    public void load(String projectId, PaymentMethod paymentType) {
+        this.projectId = projectId;
+        this.paymentType = paymentType;
+
+        inflateView();
+    }
+
     private void checkActivityResumed() {
         FragmentActivity fragmentActivity = UIUtils.getHostFragmentActivity(getContext());
         if (fragmentActivity != null) {
@@ -134,21 +138,34 @@ private void checkActivityResumed() {
     }
 
     private void requestHash() {
-        String url = Snabble.getInstance().getTelecashSecretUrl();
+        Project project = null;
+        for (Project p : Snabble.getInstance().getProjects()) {
+            if (p.getId().equals(projectId)) {
+                project = p;
+            }
+        }
+
+        if (project == null) {
+            finishWithError();
+            return;
+        }
+
+        String url = project.getTelecashVaultItemsUrl();
         if (url == null) {
             finishWithError();
             return;
         }
 
         Request request = new Request.Builder()
-                .url(Snabble.getInstance().getTelecashSecretUrl())
-                .get()
+                .url(url)
+                .post(RequestBody.create(null, new byte[0]))
                 .build();
 
         okHttpClient.newCall(request).enqueue(new SimpleJsonCallback<HashResponse>(HashResponse.class) {
             @Override
             public void success(final HashResponse hashResponse) {
                 lastHashResponse = hashResponse;
+                cancelPreAuthUrl = headers().get("Location");
                 Dispatch.mainThread(() -> loadForm(hashResponse));
             }
 
@@ -163,14 +180,16 @@ private void loadForm(HashResponse hashResponse) {
         try {
             String data = IOUtils.toString(resources.openRawResource(R.raw.snabble_creditcardform), Charset.forName("UTF-8"));
             data = data.replace("{{url}}", hashResponse.url);
+            data = data.replace("{{hostedDataId}}", UUID.randomUUID().toString());
             data = data.replace("{{storeId}}", hashResponse.storeId);
+            data = data.replace("{{orderId}}", hashResponse.orderId);
             data = data.replace("{{date}}", hashResponse.date);
             data = data.replace("{{currency}}", hashResponse.currency);
             data = data.replace("{{chargeTotal}}", hashResponse.chargeTotal);
             data = data.replace("{{hash}}", hashResponse.hash);
 
             // hides credit card selection, V = VISA, but in reality we can enter any credit card that is supported
-            switch(type) {
+            switch(paymentType) {
                 case MASTERCARD:
                     data = data.replace("{{paymentMethod}}", "M");
                     break;
@@ -231,9 +250,15 @@ private void save(CreditCardInfo info) {
                 break;
         }
 
-        final PaymentCredentials pc = PaymentCredentials.fromCreditCardData(info.cardHolder, ccBrand,
-                info.obfuscatedCardNumber, info.expirationYear,
-                info.expirationMonth, info.hostedDataId, lastHashResponse.storeId);
+        final PaymentCredentials pc = PaymentCredentials.fromCreditCardData(info.cardHolder,
+                ccBrand,
+                projectId,
+                info.obfuscatedCardNumber,
+                info.expirationYear,
+                info.expirationMonth,
+                info.hostedDataId,
+                info.schemeTransactionId,
+                lastHashResponse.storeId);
 
         if (pc == null) {
             Toast.makeText(getContext(), "Could not verify payment credentials", Toast.LENGTH_LONG)
@@ -251,7 +276,7 @@ private void save(CreditCardInfo info) {
     }
 
     private void cancelPreAuth(CreditCardInfo creditCardInfo) {
-        String url = Snabble.getInstance().getTelecashPreAuthUrl();
+        String url = cancelPreAuthUrl;
         if (url == null) {
             Logger.e("Could not abort pre authorization, no url provided");
             return;
@@ -260,7 +285,7 @@ private void cancelPreAuth(CreditCardInfo creditCardInfo) {
         url = url.replace("{orderID}", creditCardInfo.transactionId);
 
         Request request = new Request.Builder()
-                .url(url)
+                .url(Snabble.getInstance().absoluteUrl(url))
                 .delete()
                 .build();
 
@@ -302,8 +327,6 @@ public void onAttachedToWindow() {
 
         Application application = (Application) getContext().getApplicationContext();
         application.registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
-
-        isAttachedToWindow = true;
     }
 
     @Override
@@ -312,8 +335,6 @@ public void onDetachedFromWindow() {
 
         Application application = (Application) getContext().getApplicationContext();
         application.unregisterActivityLifecycleCallbacks(activityLifecycleCallbacks);
-
-        isAttachedToWindow = false;
     }
 
     private Application.ActivityLifecycleCallbacks activityLifecycleCallbacks =
@@ -353,11 +374,16 @@ private class CreditCardInfo {
         String expirationYear;
         String expirationMonth;
         String hostedDataId;
+        String schemeTransactionId;
         String transactionId;
 
-        public CreditCardInfo(String cardHolder, String obfuscatedCardNumber,
-                              String brand, String expirationYear,
-                              String expirationMonth, String hostedDataId,
+        public CreditCardInfo(String cardHolder,
+                              String obfuscatedCardNumber,
+                              String brand,
+                              String expirationYear,
+                              String expirationMonth,
+                              String hostedDataId,
+                              String schemeTransactionId,
                               String transactionId) {
             this.cardHolder = cardHolder;
             this.obfuscatedCardNumber = obfuscatedCardNumber;
@@ -365,6 +391,7 @@ public CreditCardInfo(String cardHolder, String obfuscatedCardNumber,
             this.expirationYear = expirationYear;
             this.expirationMonth = expirationMonth;
             this.hostedDataId = hostedDataId;
+            this.schemeTransactionId = schemeTransactionId;
             this.transactionId = transactionId;
         }
     }
@@ -373,6 +400,7 @@ public CreditCardInfo(String cardHolder, String obfuscatedCardNumber,
     private class HashResponse {
         String hash;
         String storeId;
+        String orderId;
         String date;
         String chargeTotal;
         String url;
@@ -382,13 +410,17 @@ private class HashResponse {
     @Keep
     private class JsInterface {
         @JavascriptInterface
-        public void saveCard(final String cardHolder, final String obfuscatedCardNumber,
-                             final String brand, final String expirationYear,
-                             final String expirationMonth, final String hostedDataId,
+        public void saveCard(final String cardHolder,
+                             final String obfuscatedCardNumber,
+                             final String brand,
+                             final String expirationYear,
+                             final String expirationMonth,
+                             final String hostedDataId,
+                             final String schemeTransactionId,
                              final String transactionId) {
             CreditCardInfo creditCardInfo = new CreditCardInfo(cardHolder, obfuscatedCardNumber,
                     brand, expirationYear,
-                    expirationMonth, hostedDataId, transactionId);
+                    expirationMonth, hostedDataId, schemeTransactionId, transactionId);
 
             if (isActivityResumed) {
                 Dispatch.mainThread(() -> authenticateAndSave(creditCardInfo));
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentInputViewHelper.java b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentInputViewHelper.java
index ea56a9786c..a4707972e8 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentInputViewHelper.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentInputViewHelper.java
@@ -1,24 +1,31 @@
 package io.snabble.sdk.ui.payment;
 
+import android.os.Bundle;
+
 import io.snabble.sdk.PaymentMethod;
+import io.snabble.sdk.Project;
 import io.snabble.sdk.ui.SnabbleUI;
 
 public class PaymentInputViewHelper {
-    public static void openPaymentInputView(PaymentMethod paymentMethod) {
+    public static void openPaymentInputView(PaymentMethod paymentMethod, Project project) {
         SnabbleUI.Callback callback = SnabbleUI.getUiCallback();
         if (callback != null) {
+            Bundle args = new Bundle();
             switch (paymentMethod) {
                 case VISA:
-                    CreditCardInputView.type = PaymentMethod.VISA;
-                    callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, null);
+                    args.putString("projectId", project.getId());
+                    args.putSerializable("paymentType", PaymentMethod.VISA);
+                    callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
                     break;
                 case AMEX:
-                    CreditCardInputView.type = PaymentMethod.AMEX;
-                    callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, null);
+                    args.putString("projectId", project.getId());
+                    args.putSerializable("paymentType", PaymentMethod.AMEX);
+                    callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
                     break;
                 case MASTERCARD:
-                    CreditCardInputView.type = PaymentMethod.MASTERCARD;
-                    callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, null);
+                    args.putString("projectId", project.getId());
+                    args.putSerializable("paymentType", PaymentMethod.MASTERCARD);
+                    callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
                     break;
                 case PAYDIREKT:
                     callback.execute(SnabbleUI.Action.SHOW_PAYDIREKT_INPUT, null);
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
index 4bb6af9cbf..b61f0840c3 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import io.snabble.sdk.Brand
 import io.snabble.sdk.PaymentMethod
 import io.snabble.sdk.Project
 import io.snabble.sdk.Snabble
@@ -83,17 +84,14 @@ class PaymentOptionsView @JvmOverloads constructor(
             )
         )
 
-        projectsWithCreditCards.forEach { project ->
-            val projectsWithSameBrand = Snabble.getInstance().projects.filter {
-                it.brand?.name == project.brand?.name
-            }
-
-            projectList.add(
-                Entry(
-                    text = project.name,
-                    project = project,
-                    click = {
-                        if (projectsWithSameBrand.isEmpty()) {
+        projectsWithCreditCards
+            .filter { it.brand == null }
+            .forEach { project ->
+                projectList.add(
+                    Entry(
+                        text = project.name,
+                        project = project,
+                        click = {
                             val activity = UIUtils.getHostActivity(context)
                             if (activity is FragmentActivity) {
                                 val dialogFragment = SelectPaymentMethodFragment()
@@ -103,14 +101,36 @@ class PaymentOptionsView @JvmOverloads constructor(
                                     PaymentMethod.MASTERCARD,
                                     PaymentMethod.AMEX))
                                 )
+                                args.putString(SelectPaymentMethodFragment.ARG_PROJECT_ID, project.id)
                                 dialogFragment.arguments = args
                                 dialogFragment.show(activity.supportFragmentManager, null)
                             } else {
                                 throw RuntimeException("Host activity needs to be a FragmentActivity")
                             }
-                        } else {
-                            executeUiAction(SnabbleUI.Action.SHOW_PROJECT_PAYMENT_OPTIONS, projectsWithSameBrand)
                         }
+                    )
+                )
+        }
+
+        val brands = TreeSet<Brand>()
+
+        projectsWithCreditCards
+            .filter { it.brand != null }
+            .forEach {
+                if (!brands.contains(it.brand)) {
+                    brands.add(it.brand)
+                }
+        }
+
+        brands.forEach { brand ->
+            projectList.add(
+                Entry(
+                    text = brand.name,
+                    project = projectsWithCreditCards.firstOrNull { it.brand.id == brand.id},
+                    click = {
+                        val args = Bundle()
+                        args.putString("brandId", brand.id)
+                        executeUiAction(SnabbleUI.Action.SHOW_PROJECT_PAYMENT_OPTIONS, args)
                     }
                 )
             )
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java
index 1eeaf20a17..68339fe4a8 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java
@@ -27,11 +27,15 @@
 import io.snabble.sdk.ui.R;
 import io.snabble.sdk.ui.SnabbleUI;
 import io.snabble.sdk.ui.utils.OneShotClickListener;
+import io.snabble.sdk.ui.utils.ViewExtKt;
 
 public class SelectPaymentMethodFragment extends BottomSheetDialogFragment {
     public static final String ARG_PAYMENT_METHOD_LIST = "paymentMethods";
+    public static final String ARG_PROJECT_ID = "projectId";
+
     private List<Entry> entries;
     private Set<PaymentMethod> paymentMethods;
+    private String projectId;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -42,6 +46,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
             Collection<PaymentMethod> list = (Collection<PaymentMethod>) args.getSerializable(ARG_PAYMENT_METHOD_LIST);
             paymentMethods = new HashSet<>();
             paymentMethods.addAll(list);
+            projectId = args.getString(ARG_PROJECT_ID, null);
         }
     }
 
@@ -83,10 +88,12 @@ public void click() {
                     getUsableAtText(PaymentMethod.VISA), new OneShotClickListener() {
                 @Override
                 public void click() {
-                    CreditCardInputView.type = PaymentMethod.VISA;
                     SnabbleUI.Callback callback = SnabbleUI.getUiCallback();
                     if (callback != null) {
-                        callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, null);
+                        Bundle args = new Bundle();
+                        args.putString("projectId", projectId);
+                        args.putSerializable("paymentType", PaymentMethod.VISA);
+                        callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
                     }
 
                     dismissAllowingStateLoss();
@@ -100,10 +107,12 @@ public void click() {
                     getUsableAtText(PaymentMethod.MASTERCARD), new OneShotClickListener() {
                 @Override
                 public void click() {
-                    CreditCardInputView.type = PaymentMethod.MASTERCARD;
                     SnabbleUI.Callback callback = SnabbleUI.getUiCallback();
                     if (callback != null) {
-                        callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, null);
+                        Bundle args = new Bundle();
+                        args.putString("projectId", projectId);
+                        args.putSerializable("paymentType", PaymentMethod.MASTERCARD);
+                        callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
                     }
 
                     dismissAllowingStateLoss();
@@ -117,10 +126,12 @@ public void click() {
                     getUsableAtText(PaymentMethod.AMEX), new OneShotClickListener() {
                 @Override
                 public void click() {
-                    CreditCardInputView.type = PaymentMethod.AMEX;
                     SnabbleUI.Callback callback = SnabbleUI.getUiCallback();
                     if (callback != null) {
-                        callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, null);
+                        Bundle args = new Bundle();
+                        args.putString("projectId", projectId);
+                        args.putSerializable("paymentType", PaymentMethod.AMEX);
+                        callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
                     }
 
                     dismissAllowingStateLoss();
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt
index 09a9eef618..fbd4ae6bdc 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt
@@ -24,7 +24,6 @@ import java.util.*
 class SelectProjectPaymentView @JvmOverloads constructor(
     context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : FrameLayout(context, attrs, defStyleAttr) {
-
     private var adapter: EntryAdapter
 
     var projects: List<Project>? = null
@@ -67,6 +66,7 @@ class SelectProjectPaymentView @JvmOverloads constructor(
                         PaymentMethod.MASTERCARD,
                         PaymentMethod.AMEX))
                     )
+                    args.putString(SelectPaymentMethodFragment.ARG_PROJECT_ID, entry.id)
                     dialogFragment.arguments = args
                     dialogFragment.show(activity.supportFragmentManager, null)
                 } else {
diff --git a/ui/src/main/java/io/snabble/sdk/ui/scanner/ProductConfirmationDialog.java b/ui/src/main/java/io/snabble/sdk/ui/scanner/ProductConfirmationDialog.java
index 7f1b307e6e..2d563cc939 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/scanner/ProductConfirmationDialog.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/scanner/ProductConfirmationDialog.java
@@ -4,6 +4,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
+import android.os.Bundle;
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.Spannable;
@@ -40,6 +41,7 @@
 import io.snabble.sdk.ui.telemetry.Telemetry;
 import io.snabble.sdk.ui.utils.InputFilterMinMax;
 import io.snabble.sdk.utils.Dispatch;
+import io.snabble.sdk.utils.GsonHolder;
 
 class ProductConfirmationDialog {
     private Context context;
@@ -323,7 +325,9 @@ public void addToCart() {
 
         SnabbleUI.Callback callback = SnabbleUI.getUiCallback();
         if (callback != null) {
-            callback.execute(SnabbleUI.Action.EVENT_PRODUCT_CONFIRMATION_HIDE, cartItem);
+            Bundle args = new Bundle();
+            args.putString("cartItem", GsonHolder.get().toJson(cartItem));
+            callback.execute(SnabbleUI.Action.EVENT_PRODUCT_CONFIRMATION_HIDE, args);
         }
         dismiss(true);
     }
diff --git a/ui/src/main/java/io/snabble/sdk/ui/search/ProductSearchView.java b/ui/src/main/java/io/snabble/sdk/ui/search/ProductSearchView.java
index 9d9012dd31..889cbee9f6 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/search/ProductSearchView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/search/ProductSearchView.java
@@ -1,6 +1,7 @@
 package io.snabble.sdk.ui.search;
 
 import android.content.Context;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.text.Editable;
@@ -141,7 +142,9 @@ private void showScannerWithCode(String scannableCode) {
 
             SnabbleUI.Callback callback = SnabbleUI.getUiCallback();
             if (callback != null) {
-                callback.execute(SnabbleUI.Action.SHOW_SCANNER, scannableCode);
+                Bundle args = new Bundle();
+                args.putString("showProductCode", scannableCode);
+                callback.execute(SnabbleUI.Action.SHOW_SCANNER, args);
             }
         }
     }
diff --git a/ui/src/main/java/io/snabble/sdk/ui/utils/ViewExt.kt b/ui/src/main/java/io/snabble/sdk/ui/utils/ViewExt.kt
index 58e578c1f5..b44e0fd3be 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/utils/ViewExt.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/utils/ViewExt.kt
@@ -1,6 +1,7 @@
 package io.snabble.sdk.ui.utils
 
 import android.graphics.Bitmap
+import android.os.Bundle
 import android.view.View
 import android.widget.ImageView
 import io.snabble.sdk.Assets
@@ -8,8 +9,8 @@ import io.snabble.sdk.ui.R
 import io.snabble.sdk.ui.SnabbleUI
 import java.util.*
 
-fun View.executeUiAction(action: SnabbleUI.Action, data: Any? = null) {
-    SnabbleUI.getUiCallback()?.execute(action, data)
+fun View.executeUiAction(action: SnabbleUI.Action, args: Bundle? = null) {
+    SnabbleUI.getUiCallback()?.execute(action, args)
 }
 
 fun ImageView.loadAsset(assets: Assets, name: String) {
diff --git a/ui/src/main/res/raw/snabble_creditcardform.html b/ui/src/main/res/raw/snabble_creditcardform.html
index f3d4a64f13..2c21981943 100644
--- a/ui/src/main/res/raw/snabble_creditcardform.html
+++ b/ui/src/main/res/raw/snabble_creditcardform.html
@@ -17,6 +17,7 @@
                 var arr = event.data.elementArr;
 
                 var hostedDataId;
+                var schemeTransactionId;
                 var cardNumber;
                 var cardHolder;
                 var ccBrand;
@@ -32,6 +33,7 @@
 
                     switch (item.name) {
                         case "hosteddataid": hostedDataId = item.value; break;
+                        case "schemeTransactionId": schemeTransactionId = item.value; break;
                         case "cardnumber": cardNumber = item.value; break;
                         case "bname": cardHolder = item.value; break;
                         case "ccbrand": ccBrand = item.value; break;
@@ -44,9 +46,9 @@
                 }
 
                 if (responseCode == "00") {
-                    if (hostedDataId != null && cardNumber != null && cardHolder != null
+                    if (hostedDataId != null && schemeTransactionId != null && cardNumber != null && cardHolder != null
                     && ccBrand != null && expMonth != null && expYear != null && transactionId != null) {
-                        snabble.saveCard(cardHolder, cardNumber, ccBrand, expMonth, expYear, hostedDataId, transactionId);
+                        snabble.saveCard(cardHolder, cardNumber, ccBrand, expMonth, expYear, hostedDataId, schemeTransactionId, transactionId);
                     } else {
                         snabble.fail();
                     }
@@ -78,8 +80,12 @@
             <input type="hidden" name="responseFailURL" value="about:blank"/>
             <input type="hidden" name="responseSuccessURL" value="about:blank"/>
             <input type="hidden" name="checkoutoption" value="simpleform"/>
-            <input type="hidden" name="assignToken" value="true"/>
+            <input type="hidden" name="assignToken" value="false"/>
             <input type="hidden" name="hostURI" value="*"/>
+            <input type="hidden" name="oid" value="{{orderId}}"/>
+            <input type="hidden" name="hosteddataid" value="{{hostedDataId}}"/>
+            <input type="hidden" name="authenticateTransaction" value="true"/>
+            <input type="hidden" name="threeDSRequestorChallengeIndicator" value="04"/>
         </form>
     </body>
 </html>
\ No newline at end of file
diff --git a/utils/src/main/java/io/snabble/sdk/utils/JsonCallback.java b/utils/src/main/java/io/snabble/sdk/utils/JsonCallback.java
index 2b6504f1a0..b94c43cb12 100644
--- a/utils/src/main/java/io/snabble/sdk/utils/JsonCallback.java
+++ b/utils/src/main/java/io/snabble/sdk/utils/JsonCallback.java
@@ -4,6 +4,7 @@
 
 import okhttp3.Call;
 import okhttp3.Callback;
+import okhttp3.Headers;
 import okhttp3.Response;
 
 public abstract class JsonCallback<T, T2> implements Callback {
@@ -12,6 +13,7 @@ public abstract class JsonCallback<T, T2> implements Callback {
 
     private int responseCode;
     private String rawResponse;
+    private Headers headers;
 
     public JsonCallback(Class<T> successClass, Class<T2> failureClass) {
         this.successClass = successClass;
@@ -29,6 +31,7 @@ public void onResponse(Call call, Response response) {
 
             responseCode = response.code();
             rawResponse = body;
+            headers = response.headers();
 
             if(response.isSuccessful()) {
                 T obj = GsonHolder.get().fromJson(body, successClass);
@@ -47,6 +50,10 @@ public void onFailure(Call call, IOException e) {
         error(e);
     }
 
+    public Headers headers() {
+        return headers;
+    }
+
     public int responseCode() {
         return responseCode;
     }

From 771e95452dffd8a8ad69f2ac65f79b09137ba80c Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Tue, 9 Feb 2021 17:26:19 +0100
Subject: [PATCH 05/21] Rename .java to .kt

---
 ...entialsListFragment.java => PaymentCredentialsListFragment.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename ui-integration/src/main/java/io/snabble/sdk/ui/integration/{PaymentCredentialsListFragment.java => PaymentCredentialsListFragment.kt} (100%)

diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.java b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt
similarity index 100%
rename from ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.java
rename to ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt

From 7971349086951400bbe2e3f827d9e14bd0735551 Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Tue, 9 Feb 2021 17:26:20 +0100
Subject: [PATCH 06/21] [wip] restrict payment credential list per type

---
 .../java/io/snabble/testapp/BaseActivity.java |  5 ++-
 .../java/io/snabble/testapp/HomeFragment.java |  2 +-
 .../ui/integration/CreditCardInputFragment.kt |  2 +-
 .../PaymentCredentialsListFragment.kt         | 37 ++++++++++++-------
 .../ProjectPaymentOptionsFragment.kt          |  2 +-
 .../sdk/ui/payment/CreditCardInputView.java   |  2 +-
 .../payment/PaymentCredentialsListView.java   | 11 ++++--
 7 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/sample/src/main/java/io/snabble/testapp/BaseActivity.java b/sample/src/main/java/io/snabble/testapp/BaseActivity.java
index 29df2c61c9..8480da4896 100644
--- a/sample/src/main/java/io/snabble/testapp/BaseActivity.java
+++ b/sample/src/main/java/io/snabble/testapp/BaseActivity.java
@@ -148,7 +148,7 @@ public void execute(SnabbleUI.Action action, Bundle args) {
                 showPaydirektInput();
                 break;
             case SHOW_PAYMENT_CREDENTIALS_LIST:
-                showPaymentCredentialsList();
+                showPaymentCredentialsList(args);
                 break;
             case SHOW_PAYMENT_OPTIONS:
                 showPaymentOptions();
@@ -244,8 +244,9 @@ public void showPaydirektInput() {
         startActivity(intent);
     }
 
-    public void showPaymentCredentialsList() {
+    public void showPaymentCredentialsList(Bundle args) {
         Intent intent = new Intent(this, PaymentCredentialsListActivity.class);
+        intent.putExtra("args", args);
         startActivity(intent);
     }
 
diff --git a/sample/src/main/java/io/snabble/testapp/HomeFragment.java b/sample/src/main/java/io/snabble/testapp/HomeFragment.java
index d2aad56661..6ff65818be 100644
--- a/sample/src/main/java/io/snabble/testapp/HomeFragment.java
+++ b/sample/src/main/java/io/snabble/testapp/HomeFragment.java
@@ -65,7 +65,7 @@ public void onClick(View v) {
         v.findViewById(R.id.show_pm).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ((BaseActivity)getActivity()).showPaymentCredentialsList();
+                ((BaseActivity)getActivity()).showPaymentCredentialsList(null);
             }
         });
 
diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt
index 25150c0185..b0ac9afb8b 100644
--- a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt
+++ b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt
@@ -25,7 +25,7 @@ class CreditCardInputFragment : Fragment() {
         paymentMethod = arguments?.getSerializable(ARG_PAYMENT_METHOD) as PaymentMethod?
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         val v = inflater.inflate(R.layout.snabble_fragment_cardinput_creditcard, container, false) as CreditCardInputView
         v.load(projectId, paymentMethod)
         return v
diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt
index 6981cceda6..54e523179c 100644
--- a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt
+++ b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt
@@ -1,21 +1,30 @@
-package io.snabble.sdk.ui.integration;
+package io.snabble.sdk.ui.integration
 
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import io.snabble.sdk.PaymentMethod
+import io.snabble.sdk.payment.PaymentCredentials
+import io.snabble.sdk.ui.payment.CreditCardInputView
+import io.snabble.sdk.ui.payment.PaymentCredentialsListView
 
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
+class PaymentCredentialsListFragment : Fragment() {
+    companion object {
+        const val ARG_PAYMENT_TYPES = "paymentTypes"
+    }
 
-import androidx.fragment.app.Fragment;
+    var type: PaymentCredentials.Type? = null
 
-public class PaymentCredentialsListFragment extends Fragment {
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        type = arguments?.getSerializable(ARG_PAYMENT_TYPES) as PaymentCredentials.Type?
     }
 
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.snabble_fragment_payment_credentials_list, container, false);
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        val v = inflater.inflate(R.layout.snabble_fragment_payment_credentials_list, container, false) as PaymentCredentialsListView
+        type?.let { v.show(it) }
+        return v
     }
-}
+}
\ No newline at end of file
diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
index 7debc1e800..d92f8d3541 100644
--- a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
+++ b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
@@ -21,7 +21,7 @@ class ProjectPaymentOptionsFragment : Fragment() {
         brand = arguments?.getString(ARG_BRAND, null)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         val v =  inflater.inflate(R.layout.snabble_fragment_select_payment_project, container, false) as SelectProjectPaymentView
 
         brand?.let { brand ->
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/CreditCardInputView.java b/ui/src/main/java/io/snabble/sdk/ui/payment/CreditCardInputView.java
index df1758cf4e..182286e2ca 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/CreditCardInputView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/CreditCardInputView.java
@@ -158,7 +158,7 @@ private void requestHash() {
 
         Request request = new Request.Builder()
                 .url(url)
-                .post(RequestBody.create(null, new byte[0]))
+                .post(RequestBody.create("", null))
                 .build();
 
         okHttpClient.newCall(request).enqueue(new SimpleJsonCallback<HashResponse>(HashResponse.class) {
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java
index 3079079f8a..b42bd6528b 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java
@@ -3,7 +3,6 @@
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -20,6 +19,7 @@
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import io.snabble.sdk.Snabble;
@@ -36,6 +36,7 @@ public class PaymentCredentialsListView extends FrameLayout implements PaymentCr
     private List<Entry> entries = new ArrayList<>();
     private PaymentCredentialsStore paymentCredentialsStore;
     private RecyclerView recyclerView;
+    private PaymentCredentials.Type type;
 
     public PaymentCredentialsListView(Context context) {
         super(context);
@@ -54,6 +55,7 @@ public PaymentCredentialsListView(Context context, AttributeSet attrs, int defSt
 
     private void inflateView() {
         inflate(getContext(), R.layout.snabble_view_payment_credentials_list, this);
+        paymentCredentialsStore = Snabble.getInstance().getPaymentCredentialsStore();
 
         recyclerView = findViewById(R.id.recycler_view);
         recyclerView.setAdapter(new PaymentCredentialsListView.Adapter());
@@ -86,10 +88,11 @@ public void click() {
                 }
             }
         });
+    }
 
+    public void show(PaymentCredentials.Type type) {
+        this.type = type;
         entries.clear();
-
-        paymentCredentialsStore = Snabble.getInstance().getPaymentCredentialsStore();
         onChanged();
     }
 
@@ -137,7 +140,7 @@ public void onChanged() {
         List<PaymentCredentials> paymentCredentials = paymentCredentialsStore.getAll();
 
         for (PaymentCredentials pm : paymentCredentials) {
-            if (pm.isAvailableInCurrentApp()) {
+            if (pm.isAvailableInCurrentApp() && pm.getType().equals(type)) {
                 switch (pm.getType()) {
                     case SEPA:
                         entries.add(new Entry(pm, R.drawable.snabble_ic_payment_select_sepa, pm.getObfuscatedId()));

From d625bec5dcb2635cadec763ba7ccd055339b5f50 Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Wed, 10 Feb 2021 17:06:44 +0100
Subject: [PATCH 07/21] display count / bugfixes / cart adjustments / provide
 bundle args

---
 .../main/java/io/snabble/sdk/CheckoutApi.java |   2 +-
 .../sdk/payment/PaymentCredentials.java       |  17 ++-
 .../sdk/payment/PaymentCredentialsStore.java  |  10 ++
 .../src/main/java/io/snabble/testapp/App.java |   1 -
 .../PaymentCredentialsListActivity.java       |   4 +-
 .../PaymentCredentialsListFragment.kt         |  12 +-
 .../sdk/ui/cart/PaymentSelectionHelper.java   |   4 +
 .../payment/PaymentCredentialsListView.java   |  22 ++-
 .../sdk/ui/payment/PaymentOptionsView.kt      | 133 ++++++++++++++----
 .../ui/payment/SelectProjectPaymentView.kt    |  83 ++++++++---
 .../java/io/snabble/sdk/ui/utils/ViewExt.kt   |   5 +
 .../snabble_item_payment_options_entry.xml    |  20 ++-
 .../snabble_item_select_payment_project.xml   |  20 ++-
 ui/src/main/res/values-de/strings.xml         |   8 +-
 ui/src/main/res/values-en/strings.xml         |   4 +
 ui/src/main/res/values-hu/strings.xml         |   6 +-
 ui/src/main/res/values-sk/strings.xml         |   6 +-
 ui/src/main/res/values/strings.xml            |   4 +
 18 files changed, 297 insertions(+), 64 deletions(-)

diff --git a/core/src/main/java/io/snabble/sdk/CheckoutApi.java b/core/src/main/java/io/snabble/sdk/CheckoutApi.java
index 279c3c8039..bd4543647a 100644
--- a/core/src/main/java/io/snabble/sdk/CheckoutApi.java
+++ b/core/src/main/java/io/snabble/sdk/CheckoutApi.java
@@ -491,7 +491,7 @@ public void createPaymentProcess(final String id,
             checkoutProcessRequest.paymentInformation.originType = paymentCredentials.getType().getOriginType();
             checkoutProcessRequest.paymentInformation.encryptedOrigin = data;
 
-            if (paymentCredentials.getType() == PaymentCredentials.Type.CREDIT_CARD) {
+            if (paymentCredentials.getType() == PaymentCredentials.Type.CREDIT_CARD_PSD2) {
                 Date date = new Date(paymentCredentials.getValidTo());
                 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd");
                 checkoutProcessRequest.paymentInformation.validUntil = simpleDateFormat.format(date);
diff --git a/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java b/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java
index bb5901c69f..592537f6cf 100644
--- a/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java
+++ b/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java
@@ -2,6 +2,8 @@
 
 import android.util.Base64;
 
+import androidx.annotation.Nullable;
+
 import java.io.InputStream;
 import java.security.cert.CertPath;
 import java.security.cert.CertPathValidator;
@@ -97,6 +99,7 @@ private static class TegutEmployeeCard {
     private Brand brand;
     private String appId;
     private String id;
+    private String projectId;
     private Map<String, String> additionalData;
 
     private PaymentCredentials() {
@@ -194,6 +197,7 @@ public static PaymentCredentials fromCreditCardData(String name,
         pc.signature = pc.sha256Signature(certificate);
         pc.brand = brand;
         pc.appId = Snabble.getInstance().getConfig().appId;
+        pc.projectId = projectId;
 
         try {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM/yyyy");
@@ -310,6 +314,11 @@ public Brand getBrand() {
         return brand;
     }
 
+    @Nullable
+    public String getProjectId() {
+        return projectId;
+    }
+
     public String getAppId() {
         return appId;
     }
@@ -458,13 +467,17 @@ private String sha256Signature(X509Certificate certificate) {
     }
 
     public boolean validate() {
-        if (type == Type.CREDIT_CARD) {
+        if (type == Type.CREDIT_CARD_PSD2) {
             Date date = new Date(validTo);
             if (date.getTime() < System.currentTimeMillis()) {
                 return false;
             }
         }
 
+        if (type == Type.CREDIT_CARD) {
+            return false;
+        }
+
         List<X509Certificate> certificates = Snabble.getInstance().getPaymentSigningCertificates();
         for (X509Certificate cert : certificates) {
             if (sha256Signature(cert).equals(signature)) {
@@ -511,7 +524,7 @@ public Map<String, String> getAdditionalData() {
     public PaymentMethod getPaymentMethod() {
         if (getType() == PaymentCredentials.Type.SEPA) {
             return PaymentMethod.DE_DIRECT_DEBIT;
-        } else if (type == PaymentCredentials.Type.CREDIT_CARD) {
+        } else if (type == Type.CREDIT_CARD_PSD2) {
             switch (getBrand()) {
                 case VISA: return PaymentMethod.VISA;
                 case AMEX: return PaymentMethod.AMEX;
diff --git a/core/src/main/java/io/snabble/sdk/payment/PaymentCredentialsStore.java b/core/src/main/java/io/snabble/sdk/payment/PaymentCredentialsStore.java
index 4dcf3a16af..dfcd48fedc 100644
--- a/core/src/main/java/io/snabble/sdk/payment/PaymentCredentialsStore.java
+++ b/core/src/main/java/io/snabble/sdk/payment/PaymentCredentialsStore.java
@@ -25,6 +25,7 @@ public class PaymentCredentialsStore {
     private class Data {
         private List<PaymentCredentials> credentialsList;
         private String id;
+        private boolean removedOldCreditCards;
         private boolean isKeyguarded;
     }
 
@@ -129,6 +130,10 @@ public String id() {
         return data.id;
     }
 
+    public boolean hasRemovedOldCreditCards() {
+        return data.removedOldCreditCards;
+    }
+
     public void add(PaymentCredentials credentials) {
         if (credentials == null) {
             return;
@@ -220,6 +225,11 @@ private void validate() {
             if (credentials != null) {
                 if (!credentials.validate()) {
                     removals.add(credentials);
+
+                    if (credentials.getType() == PaymentCredentials.Type.CREDIT_CARD) {
+                        data.removedOldCreditCards = true;
+                    }
+
                     changed = true;
                 } else {
                     // app id's were not stored in old versions, if its not there assume the
diff --git a/sample/src/main/java/io/snabble/testapp/App.java b/sample/src/main/java/io/snabble/testapp/App.java
index 760576d651..654079a373 100644
--- a/sample/src/main/java/io/snabble/testapp/App.java
+++ b/sample/src/main/java/io/snabble/testapp/App.java
@@ -36,7 +36,6 @@ public void onCreate() {
         // if you are using a light mode theme, disable night mode resources
         // this seems like a bug in android
         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-
     }
 
     public void initBlocking() {
diff --git a/sample/src/main/java/io/snabble/testapp/PaymentCredentialsListActivity.java b/sample/src/main/java/io/snabble/testapp/PaymentCredentialsListActivity.java
index d10a844d23..9a3e161d4f 100644
--- a/sample/src/main/java/io/snabble/testapp/PaymentCredentialsListActivity.java
+++ b/sample/src/main/java/io/snabble/testapp/PaymentCredentialsListActivity.java
@@ -7,7 +7,9 @@
 public class PaymentCredentialsListActivity extends BaseActivity{
     @Override
     public Fragment onCreateFragment() {
-        return new PaymentCredentialsListFragment();
+        Fragment fragment = new PaymentCredentialsListFragment();
+        fragment.setArguments(getIntent().getBundleExtra("args"));
+        return fragment;
     }
 }
 
diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt
index 54e523179c..17cabff6eb 100644
--- a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt
+++ b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt
@@ -6,25 +6,31 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import io.snabble.sdk.PaymentMethod
+import io.snabble.sdk.Project
+import io.snabble.sdk.Snabble
 import io.snabble.sdk.payment.PaymentCredentials
 import io.snabble.sdk.ui.payment.CreditCardInputView
 import io.snabble.sdk.ui.payment.PaymentCredentialsListView
 
 class PaymentCredentialsListFragment : Fragment() {
     companion object {
-        const val ARG_PAYMENT_TYPES = "paymentTypes"
+        const val ARG_PAYMENT_TYPE = "paymentType"
+        const val ARG_PROJECT_ID = "projectId"
     }
 
     var type: PaymentCredentials.Type? = null
+    var project: Project? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        type = arguments?.getSerializable(ARG_PAYMENT_TYPES) as PaymentCredentials.Type?
+        type = arguments?.getSerializable(ARG_PAYMENT_TYPE) as PaymentCredentials.Type?
+        val projectId = arguments?.getSerializable(ARG_PROJECT_ID) as String?
+        project = Snabble.getInstance().projects.firstOrNull { it.id == projectId }
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         val v = inflater.inflate(R.layout.snabble_fragment_payment_credentials_list, container, false) as PaymentCredentialsListView
-        type?.let { v.show(it) }
+        type?.let { v.show(it, project) }
         return v
     }
 }
\ No newline at end of file
diff --git a/ui/src/main/java/io/snabble/sdk/ui/cart/PaymentSelectionHelper.java b/ui/src/main/java/io/snabble/sdk/ui/cart/PaymentSelectionHelper.java
index b78857a3f7..a114c5295f 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/cart/PaymentSelectionHelper.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/cart/PaymentSelectionHelper.java
@@ -249,6 +249,10 @@ private void updateEntries() {
                 continue;
             }
 
+            if (pc.getProjectId() != null && !pc.getProjectId().equals(project.getId())) {
+                continue;
+            }
+
             e.paymentMethod = pc.getPaymentMethod();
             if (e.paymentMethod == null || !pc.isAvailableInCurrentApp()) {
                 continue;
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java
index b42bd6528b..64b258bf3b 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import io.snabble.sdk.Project;
 import io.snabble.sdk.Snabble;
 import io.snabble.sdk.payment.PaymentCredentials;
 import io.snabble.sdk.payment.PaymentCredentialsStore;
@@ -37,6 +38,7 @@ public class PaymentCredentialsListView extends FrameLayout implements PaymentCr
     private PaymentCredentialsStore paymentCredentialsStore;
     private RecyclerView recyclerView;
     private PaymentCredentials.Type type;
+    private Project project;
 
     public PaymentCredentialsListView(Context context) {
         super(context);
@@ -90,8 +92,10 @@ public void click() {
         });
     }
 
-    public void show(PaymentCredentials.Type type) {
+    public void show(PaymentCredentials.Type type, Project project) {
         this.type = type;
+        this.project = project;
+
         entries.clear();
         onChanged();
     }
@@ -140,12 +144,22 @@ public void onChanged() {
         List<PaymentCredentials> paymentCredentials = paymentCredentialsStore.getAll();
 
         for (PaymentCredentials pm : paymentCredentials) {
-            if (pm.isAvailableInCurrentApp() && pm.getType().equals(type)) {
+            boolean sameProject = true;
+            if (project != null) {
+                sameProject = project.getId().equals(pm.getProjectId());
+            }
+
+            boolean sameType = true;
+            if (type != null) {
+                sameType = type.equals(pm.getType());
+            }
+
+            if (pm.isAvailableInCurrentApp() && sameType && sameProject) {
                 switch (pm.getType()) {
                     case SEPA:
                         entries.add(new Entry(pm, R.drawable.snabble_ic_payment_select_sepa, pm.getObfuscatedId()));
                         break;
-                    case CREDIT_CARD:
+                    case CREDIT_CARD_PSD2:
                         PaymentCredentials.Brand ccBrand = pm.getBrand();
 
                         int drawableResId = 0;
@@ -220,7 +234,7 @@ public void onBindViewHolder(final RecyclerView.ViewHolder holder, final int pos
                 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM/yyyy");
                 String validTo = simpleDateFormat.format(e.paymentCredentials.getValidTo());
 
-                if (e.paymentCredentials.getType() == PaymentCredentials.Type.CREDIT_CARD) {
+                if (e.paymentCredentials.getType() == PaymentCredentials.Type.CREDIT_CARD_PSD2) {
                     vh.validTo.setText(getResources().getString(R.string.Snabble_Payment_CreditCard_expireDate, validTo));
                     vh.validTo.setVisibility(View.VISIBLE);
                 } else {
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
index b61f0840c3..26794eb82d 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
@@ -1,6 +1,7 @@
 package io.snabble.sdk.ui.payment
 
 import android.content.Context
+import android.graphics.Rect
 import android.os.Bundle
 import android.util.AttributeSet
 import android.view.LayoutInflater
@@ -10,24 +11,27 @@ import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.fragment.app.FragmentActivity
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
+import androidx.recyclerview.widget.*
 import io.snabble.sdk.Brand
 import io.snabble.sdk.PaymentMethod
 import io.snabble.sdk.Project
 import io.snabble.sdk.Snabble
+import io.snabble.sdk.payment.PaymentCredentials
 import io.snabble.sdk.ui.R
 import io.snabble.sdk.ui.SnabbleUI
 import io.snabble.sdk.ui.utils.UIUtils
 import io.snabble.sdk.ui.utils.executeUiAction
+import io.snabble.sdk.ui.utils.getFragmentActivity
 import io.snabble.sdk.ui.utils.loadAsset
 import java.util.*
 import kotlin.collections.ArrayList
+import kotlin.collections.HashMap
 
 class PaymentOptionsView @JvmOverloads constructor(
-        context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+    context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : FrameLayout(context, attrs, defStyleAttr) {
 
     init {
@@ -37,7 +41,22 @@ class PaymentOptionsView @JvmOverloads constructor(
         val adapter = EntryAdapter()
         recyclerView.adapter = adapter
         recyclerView.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+        recyclerView.itemAnimator = null
+        val dividerItemDecoration = DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL)
+        recyclerView.addItemDecoration(dividerItemDecoration)
         adapter.submitList(getEntries())
+
+        getFragmentActivity()?.lifecycle?.addObserver(object : LifecycleObserver {
+            @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
+            fun onResume() {
+                adapter.submitList(getEntries())
+            }
+
+            @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+            fun onDestroy() {
+                getFragmentActivity()?.lifecycle?.removeObserver(this)
+            }
+        })
     }
 
     private fun getEntries(): List<Entry> {
@@ -53,25 +72,52 @@ class PaymentOptionsView @JvmOverloads constructor(
             )
         )
 
+        val store = Snabble.getInstance().paymentCredentialsStore
+        val credentials = store.allWithoutKeyStoreValidation
+
         if (paymentMethods.contains(PaymentMethod.DE_DIRECT_DEBIT)) {
+            val count = credentials.count {
+                it.appId == Snabble.getInstance().config.appId &&
+                it.type == PaymentCredentials.Type.SEPA
+            }
+
             globalList.add(
                 Entry(
-                    text = "SEPA",
+                    text = "SEPA-Lastschrift",
                     icon = R.drawable.snabble_ic_payment_select_sepa,
+                    count = count,
                     click = {
-                        executeUiAction(SnabbleUI.Action.SHOW_SEPA_CARD_INPUT)
+                        if (count > 0) {
+                            val args = Bundle()
+                            args.putSerializable("paymentType", PaymentCredentials.Type.SEPA)
+                            executeUiAction(SnabbleUI.Action.SHOW_PAYMENT_CREDENTIALS_LIST, args)
+                        } else {
+                            executeUiAction(SnabbleUI.Action.SHOW_SEPA_CARD_INPUT)
+                        }
                     }
                 )
             )
         }
 
         if (paymentMethods.contains(PaymentMethod.PAYDIREKT)) {
+            val count = credentials.count {
+                it.appId == Snabble.getInstance().config.appId &&
+                it.type == PaymentCredentials.Type.PAYDIREKT
+            }
+
             globalList.add(
                 Entry(
                     text = "Paydirekt",
                     icon = R.drawable.snabble_ic_payment_select_paydirekt,
+                    count = count,
                     click = {
-                        executeUiAction(SnabbleUI.Action.SHOW_PAYDIREKT_INPUT)
+                        if (count > 0) {
+                            val args = Bundle()
+                            args.putSerializable("paymentType", PaymentCredentials.Type.PAYDIREKT)
+                            executeUiAction(SnabbleUI.Action.SHOW_PAYMENT_CREDENTIALS_LIST, args)
+                        } else {
+                            executeUiAction(SnabbleUI.Action.SHOW_PAYDIREKT_INPUT)
+                        }
                     }
                 )
             )
@@ -87,38 +133,65 @@ class PaymentOptionsView @JvmOverloads constructor(
         projectsWithCreditCards
             .filter { it.brand == null }
             .forEach { project ->
+                val count = credentials.count {
+                    it.appId == Snabble.getInstance().config.appId &&
+                    it.type == PaymentCredentials.Type.CREDIT_CARD_PSD2 &&
+                    it.projectId == project.id
+                }
+
                 projectList.add(
                     Entry(
                         text = project.name,
                         project = project,
+                        count = count,
                         click = {
-                            val activity = UIUtils.getHostActivity(context)
-                            if (activity is FragmentActivity) {
-                                val dialogFragment = SelectPaymentMethodFragment()
+                            if (count > 0) {
                                 val args = Bundle()
-                                args.putSerializable(SelectPaymentMethodFragment.ARG_PAYMENT_METHOD_LIST, java.util.ArrayList(listOf(
-                                    PaymentMethod.VISA,
-                                    PaymentMethod.MASTERCARD,
-                                    PaymentMethod.AMEX))
-                                )
-                                args.putString(SelectPaymentMethodFragment.ARG_PROJECT_ID, project.id)
-                                dialogFragment.arguments = args
-                                dialogFragment.show(activity.supportFragmentManager, null)
+                                args.putSerializable("paymentType", PaymentCredentials.Type.CREDIT_CARD_PSD2)
+                                args.putSerializable("projectId", project.id)
+                                executeUiAction(SnabbleUI.Action.SHOW_PAYMENT_CREDENTIALS_LIST, args)
                             } else {
-                                throw RuntimeException("Host activity needs to be a FragmentActivity")
+                                val activity = UIUtils.getHostActivity(context)
+                                if (activity is FragmentActivity) {
+                                    val dialogFragment = SelectPaymentMethodFragment()
+                                    val args = Bundle()
+                                    args.putSerializable(SelectPaymentMethodFragment.ARG_PAYMENT_METHOD_LIST, ArrayList(listOf(
+                                        PaymentMethod.VISA,
+                                        PaymentMethod.MASTERCARD,
+                                        PaymentMethod.AMEX))
+                                    )
+                                    args.putString(SelectPaymentMethodFragment.ARG_PROJECT_ID, project.id)
+                                    dialogFragment.arguments = args
+                                    dialogFragment.show(activity.supportFragmentManager, null)
+                                } else {
+                                    throw RuntimeException("Host activity needs to be a FragmentActivity")
+                                }
                             }
                         }
                     )
                 )
         }
 
-        val brands = TreeSet<Brand>()
+        val brands = ArrayList<Brand>()
+        val counts = HashMap<Brand, Int>()
 
         projectsWithCreditCards
             .filter { it.brand != null }
-            .forEach {
-                if (!brands.contains(it.brand)) {
-                    brands.add(it.brand)
+            .forEach { project ->
+                val count = credentials.count {
+                    it.appId == Snabble.getInstance().config.appId
+                    && it.type == PaymentCredentials.Type.CREDIT_CARD_PSD2
+                    && it.projectId == project.id }
+
+                if (!brands.contains(project.brand)) {
+                    brands.add(project.brand)
+                }
+
+                val currentCount = counts[project.brand]
+                if (currentCount == null) {
+                    counts[project.brand] = count
+                } else {
+                    counts[project.brand] = currentCount + count
                 }
         }
 
@@ -126,7 +199,8 @@ class PaymentOptionsView @JvmOverloads constructor(
             projectList.add(
                 Entry(
                     text = brand.name,
-                    project = projectsWithCreditCards.firstOrNull { it.brand.id == brand.id},
+                    project = projectsWithCreditCards.firstOrNull { it.brand.id == brand.id },
+                    count = counts[brand] ?: 0,
                     click = {
                         val args = Bundle()
                         args.putString("brandId", brand.id)
@@ -169,6 +243,7 @@ class PaymentOptionsView @JvmOverloads constructor(
     data class Entry(
         val isSectionHeader: Boolean = false,
         val text: String,
+        val count: Int = 0,
         val icon: Int? = null,
         val project: Project? = null,
         val click: OnClickListener? = null,
@@ -180,6 +255,7 @@ class PaymentOptionsView @JvmOverloads constructor(
 
     class EntryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val text: TextView = itemView.findViewById(R.id.text)
+        val count: TextView = itemView.findViewById(R.id.count)
         val image: ImageView = itemView.findViewById(R.id.helper_image)
     }
 
@@ -215,6 +291,13 @@ class PaymentOptionsView @JvmOverloads constructor(
                     holder.image.loadAsset(entry.project.assets, "icon")
                 }
 
+                if (entry.count > 0) {
+                    holder.count.visibility = View.VISIBLE
+                    holder.count.text = entry.count.toString()
+                } else {
+                    holder.count.visibility = View.GONE
+                }
+
                 holder.itemView.setOnClickListener(entry.click)
             }
         }
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt
index fbd4ae6bdc..6c0c67931f 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt
@@ -10,14 +10,19 @@ import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.fragment.app.FragmentActivity
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
+import androidx.recyclerview.widget.*
 import io.snabble.sdk.PaymentMethod
 import io.snabble.sdk.Project
+import io.snabble.sdk.Snabble
+import io.snabble.sdk.payment.PaymentCredentials
 import io.snabble.sdk.ui.R
+import io.snabble.sdk.ui.SnabbleUI
 import io.snabble.sdk.ui.utils.UIUtils
+import io.snabble.sdk.ui.utils.executeUiAction
+import io.snabble.sdk.ui.utils.getFragmentActivity
 import io.snabble.sdk.ui.utils.loadAsset
 import java.util.*
 
@@ -39,10 +44,26 @@ class SelectProjectPaymentView @JvmOverloads constructor(
         adapter = EntryAdapter()
         recyclerView.adapter = adapter
         recyclerView.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+        val dividerItemDecoration = DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL)
+        recyclerView.addItemDecoration(dividerItemDecoration)
+        recyclerView.itemAnimator = null
+
+        getFragmentActivity()?.lifecycle?.addObserver(object : LifecycleObserver {
+            @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
+            fun onResume() {
+                adapter.notifyDataSetChanged()
+            }
+
+            @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+            fun onDestroy() {
+                getFragmentActivity()?.lifecycle?.removeObserver(this)
+            }
+        })
     }
 
     class EntryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val text: TextView = itemView.findViewById(R.id.text)
+        val count: TextView = itemView.findViewById(R.id.count)
         val image: ImageView = itemView.findViewById(R.id.helper_image)
     }
 
@@ -53,24 +74,48 @@ class SelectProjectPaymentView @JvmOverloads constructor(
         }
 
         override fun onBindViewHolder(holder: EntryViewHolder, position: Int) {
-            val entry = getItem(position)
-            holder.text.text = entry.name
-            holder.image.loadAsset(entry.assets, "icon")
+            val project = getItem(position)
+            holder.text.text = project.name
+            holder.image.loadAsset(project.assets, "icon")
+
+            val store = Snabble.getInstance().paymentCredentialsStore
+            val credentials = store.allWithoutKeyStoreValidation
+
+            val count = credentials.count {
+                it.appId == Snabble.getInstance().config.appId &&
+                it.type == PaymentCredentials.Type.CREDIT_CARD_PSD2 &&
+                it.projectId == project.id
+            }
+
+            if (count > 0) {
+                holder.count.visibility = View.VISIBLE
+                holder.count.text = count.toString()
+            } else {
+                holder.count.visibility = View.GONE
+            }
+
             holder.itemView.setOnClickListener {
-                val activity = UIUtils.getHostActivity(context)
-                if (activity is FragmentActivity) {
-                    val dialogFragment = SelectPaymentMethodFragment()
+                if (count > 0) {
                     val args = Bundle()
-                    args.putSerializable(SelectPaymentMethodFragment.ARG_PAYMENT_METHOD_LIST, ArrayList(listOf(
-                        PaymentMethod.VISA,
-                        PaymentMethod.MASTERCARD,
-                        PaymentMethod.AMEX))
-                    )
-                    args.putString(SelectPaymentMethodFragment.ARG_PROJECT_ID, entry.id)
-                    dialogFragment.arguments = args
-                    dialogFragment.show(activity.supportFragmentManager, null)
+                    args.putSerializable("paymentType", PaymentCredentials.Type.CREDIT_CARD_PSD2)
+                    args.putSerializable("projectId", project.id)
+                    executeUiAction(SnabbleUI.Action.SHOW_PAYMENT_CREDENTIALS_LIST, args)
                 } else {
-                    throw RuntimeException("Host activity needs to be a FragmentActivity")
+                    val activity = UIUtils.getHostActivity(context)
+                    if (activity is FragmentActivity) {
+                        val dialogFragment = SelectPaymentMethodFragment()
+                        val args = Bundle()
+                        args.putSerializable(SelectPaymentMethodFragment.ARG_PAYMENT_METHOD_LIST, ArrayList(listOf(
+                            PaymentMethod.VISA,
+                            PaymentMethod.MASTERCARD,
+                            PaymentMethod.AMEX))
+                        )
+                        args.putString(SelectPaymentMethodFragment.ARG_PROJECT_ID, project.id)
+                        dialogFragment.arguments = args
+                        dialogFragment.show(activity.supportFragmentManager, null)
+                    } else {
+                        throw RuntimeException("Host activity needs to be a FragmentActivity")
+                    }
                 }
             }
         }
diff --git a/ui/src/main/java/io/snabble/sdk/ui/utils/ViewExt.kt b/ui/src/main/java/io/snabble/sdk/ui/utils/ViewExt.kt
index b44e0fd3be..b2ecf55c3a 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/utils/ViewExt.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/utils/ViewExt.kt
@@ -4,6 +4,7 @@ import android.graphics.Bitmap
 import android.os.Bundle
 import android.view.View
 import android.widget.ImageView
+import androidx.fragment.app.FragmentActivity
 import io.snabble.sdk.Assets
 import io.snabble.sdk.ui.R
 import io.snabble.sdk.ui.SnabbleUI
@@ -13,6 +14,10 @@ fun View.executeUiAction(action: SnabbleUI.Action, args: Bundle? = null) {
     SnabbleUI.getUiCallback()?.execute(action, args)
 }
 
+fun View.getFragmentActivity(): FragmentActivity? {
+    return UIUtils.getHostFragmentActivity(context)
+}
+
 fun ImageView.loadAsset(assets: Assets, name: String) {
     val randomUUID = UUID.randomUUID().toString()
     setTag(R.id.snabble_asset_load_id, randomUUID)
diff --git a/ui/src/main/res/layout/snabble_item_payment_options_entry.xml b/ui/src/main/res/layout/snabble_item_payment_options_entry.xml
index 847acd93b2..eeee98c6ce 100644
--- a/ui/src/main/res/layout/snabble_item_payment_options_entry.xml
+++ b/ui/src/main/res/layout/snabble_item_payment_options_entry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:background="?attr/selectableItemBackground"
@@ -19,8 +19,24 @@
         android:layout_marginEnd="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
+        android:layout_toStartOf="@+id/count"
+        android:layout_centerVertical="true"
+        android:layout_toEndOf="@+id/helper_image"
         tools:text="SEPA"
         android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
-</LinearLayout>
\ No newline at end of file
+
+    <TextView
+        android:id="@+id/count"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        tools:text="1"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/ui/src/main/res/layout/snabble_item_select_payment_project.xml b/ui/src/main/res/layout/snabble_item_select_payment_project.xml
index 847acd93b2..eeee98c6ce 100644
--- a/ui/src/main/res/layout/snabble_item_select_payment_project.xml
+++ b/ui/src/main/res/layout/snabble_item_select_payment_project.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:background="?attr/selectableItemBackground"
@@ -19,8 +19,24 @@
         android:layout_marginEnd="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
+        android:layout_toStartOf="@+id/count"
+        android:layout_centerVertical="true"
+        android:layout_toEndOf="@+id/helper_image"
         tools:text="SEPA"
         android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
-</LinearLayout>
\ No newline at end of file
+
+    <TextView
+        android:id="@+id/count"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        tools:text="1"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/ui/src/main/res/values-de/strings.xml b/ui/src/main/res/values-de/strings.xml
index d7bd69b22d..2481c3bfd3 100644
--- a/ui/src/main/res/values-de/strings.xml
+++ b/ui/src/main/res/values-de/strings.xml
@@ -95,8 +95,11 @@
     <string name="Snabble.PaymentError.title">Ein Fehler ist aufgetreten</string>
     <string name="Snabble.PaymentError.tryAgain">Nochmal versuchen</string>
     <string name="Snabble.PaymentMethods.add">Bezahlverfahren hinzufügen</string>
-    <string name="Snabble.PaymentMethods.noCodeAlert.biometry">Dein iPhone ist weder durch einen Code noch durch Touch ID/Face ID geschützt. Bitte richte zu deiner Sicherheit zuerst diesen Schutz sein, bevor du deine IBAN eingibst.</string>
-    <string name="Snabble.PaymentMethods.noCodeAlert.noBiometry">Dein iPhone ist nicht durch einen Code geschützt. Bitte richte zu deiner Sicherheit zuerst diesen Schutz sein, bevor du deine IBAN eingibst.</string>
+    <string name="Snabble.PaymentMethods.choose">Welches Bezahlverfahren hinzufügen?</string>
+    <string name="Snabble.PaymentMethods.forAllRetailers">Händlerübergreifend</string>
+    <string name="Snabble.PaymentMethods.forSingleRetailer">Für einzelne Händler</string>
+    <string name="Snabble.PaymentMethods.noCodeAlert.biometry">Dein iPhone ist weder durch einen Code noch durch Touch ID/Face ID geschützt. Bitte richte zu deiner Sicherheit zuerst diesen Schutz ein, bevor du deine IBAN oder Kreditkarte eingibst.</string>
+    <string name="Snabble.PaymentMethods.noCodeAlert.noBiometry">Dein iPhone ist nicht durch einen Code geschützt. Bitte richte zu deiner Sicherheit zuerst diesen Schutz ein, bevor du deine IBAN oder Kreditkarte eingibst.</string>
     <string name="Snabble.PaymentMethods.noDeviceCode">Ungeschütztes iPhone</string>
     <!-- ********* iOS Payment Methods ********* -->
     <string name="Snabble.PaymentMethods.title">Bezahlverfahren</string>
@@ -108,6 +111,7 @@
     <string name="Snabble.PaymentStatus.step2">Freigabe deines Einkaufs</string>
     <string name="Snabble.PaymentStatus.step3">Freigabe deiner Zahlung</string>
     <string name="Snabble.pleaseWait">Bitte warten…</string>
+    <string name="Snabble.QRCode.codeXofY">Code %1$d von %2$d</string>
     <string name="Snabble.QRCode.didPay">Fertig</string>
     <string name="Snabble.QRCode.entry.title">Code: %d</string>
     <string name="Snabble.QRCode.message">Bitte QR-Code an der Kasse vorhalten</string>
diff --git a/ui/src/main/res/values-en/strings.xml b/ui/src/main/res/values-en/strings.xml
index c0553812bb..89d240491b 100644
--- a/ui/src/main/res/values-en/strings.xml
+++ b/ui/src/main/res/values-en/strings.xml
@@ -95,6 +95,9 @@
     <string name="Snabble.PaymentError.title">An error has occurred</string>
     <string name="Snabble.PaymentError.tryAgain">Try again</string>
     <string name="Snabble.PaymentMethods.add">Add payment method</string>
+    <string name="Snabble.PaymentMethods.choose">Which payment method to add?</string>
+    <string name="Snabble.PaymentMethods.forAllRetailers">For all retailers</string>
+    <string name="Snabble.PaymentMethods.forSingleRetailer">For specific retailer</string>
     <string name="Snabble.PaymentMethods.noCodeAlert.biometry">Your iPhone isn\'t protected by a code or Touch ID/Face ID. For your own safety, please assign a code before storing your payment information.</string>
     <string name="Snabble.PaymentMethods.noCodeAlert.noBiometry">Your iPhone isn\'t protected by a code. For your own safety, please assign a code before storing your payment information.</string>
     <string name="Snabble.PaymentMethods.noDeviceCode">No Code Protection</string>
@@ -108,6 +111,7 @@
     <string name="Snabble.PaymentStatus.step2">Processing your purchase</string>
     <string name="Snabble.PaymentStatus.step3">Processing your payment</string>
     <string name="Snabble.pleaseWait">Please wait…</string>
+    <string name="Snabble.QRCode.codeXofY">Code %1$d of %2$d</string>
     <string name="Snabble.QRCode.didPay">Done</string>
     <string name="Snabble.QRCode.entry.title">Code: %d</string>
     <string name="Snabble.QRCode.message">Please show QR code at the cash desk</string>
diff --git a/ui/src/main/res/values-hu/strings.xml b/ui/src/main/res/values-hu/strings.xml
index 813b26b2d1..c4b861e227 100644
--- a/ui/src/main/res/values-hu/strings.xml
+++ b/ui/src/main/res/values-hu/strings.xml
@@ -39,7 +39,7 @@
     <string name="Snabble.Hints.closedBags">Csak így tovább! Kérjük, könnyítsd meg a pénztáros munkáját, és ne csomagold közvetlenül lezárt tasakba a termékedet. Köszönjük!</string>
     <string name="Snabble.Hints.continueScanning">Szkennelés folytatása</string>
     <string name="Snabble.Hints.title">%s megjegyzése</string>
-    <string name="Snabble.invalidDepositVoucher.errorMsg"/>
+    <string name="Snabble.invalidDepositVoucher.errorMsg">Az üvegvisszaváltó blokkot csak egyszer lehet beváltani.</string>
     <string name="Snabble.Keyguard.message">Ezzel garantálható, hogy csak te férj ehhez a fizetési eljáráshoz</string>
     <string name="Snabble.Keyguard.requireScreenLock">E fizetési mód hozzáadásához képernyőzárral kell védened az okostelefonod.</string>
     <!-- SECTION: Android KeyStore -->
@@ -95,6 +95,9 @@
     <string name="Snabble.PaymentError.title">Hiba történt</string>
     <string name="Snabble.PaymentError.tryAgain">Próbálkozz újra</string>
     <string name="Snabble.PaymentMethods.add">Fizetési mód hozzáadása</string>
+    <string name="Snabble.PaymentMethods.choose"/>
+    <string name="Snabble.PaymentMethods.forAllRetailers"/>
+    <string name="Snabble.PaymentMethods.forSingleRetailer"/>
     <string name="Snabble.PaymentMethods.noCodeAlert.biometry">Az iPhone-od nem védi se kód, se Touch ID/Face ID. Biztonságod érdekében először ezt állítsd be, és csak ezt követően add meg IBAN-kódod.</string>
     <string name="Snabble.PaymentMethods.noCodeAlert.noBiometry">Az iPhone-od nem védi kód. Biztonságod érdekében először ezt állítsd be, és csak ezt követően add meg IBAN-kódod.</string>
     <string name="Snabble.PaymentMethods.noDeviceCode">Védtelen iPhone</string>
@@ -108,6 +111,7 @@
     <string name="Snabble.PaymentStatus.step2">Bevásárlásod engedélyezése</string>
     <string name="Snabble.PaymentStatus.step3">Fizetésed engedélyezése</string>
     <string name="Snabble.pleaseWait">Kérlek, várj...</string>
+    <string name="Snabble.QRCode.codeXofY">%1$d / %2$d kód</string>
     <string name="Snabble.QRCode.didPay">Kész</string>
     <string name="Snabble.QRCode.entry.title">Kód: %d</string>
     <string name="Snabble.QRCode.message">A QR-kódot tartsd készenlétben a kasszánál</string>
diff --git a/ui/src/main/res/values-sk/strings.xml b/ui/src/main/res/values-sk/strings.xml
index 08f204a13f..c5f880dc52 100644
--- a/ui/src/main/res/values-sk/strings.xml
+++ b/ui/src/main/res/values-sk/strings.xml
@@ -39,7 +39,7 @@
     <string name="Snabble.Hints.closedBags">Len tak ďalej! Prosím, uľahči prácu pokladníkom a nevkladaj svoje produkty priamo do uzavretých tašiek. Ďakujem!</string>
     <string name="Snabble.Hints.continueScanning">Pokračovať v skenovaní</string>
     <string name="Snabble.Hints.title">Poznámka od %s</string>
-    <string name="Snabble.invalidDepositVoucher.errorMsg"/>
+    <string name="Snabble.invalidDepositVoucher.errorMsg">Poukážky za vratné produkty môžu byť uplatnené len jedenkrát.</string>
     <string name="Snabble.Keyguard.message">Tým zabezpečíme, že k tomuto spôsobu platby budeš mať prístup len ty sám/sama</string>
     <string name="Snabble.Keyguard.requireScreenLock">Aby si mohol/mohla priradiť tento spôsob platby, musíš chrániť svoj smartfón uzamknutím displeja.</string>
     <!-- SECTION: Android KeyStore -->
@@ -95,6 +95,9 @@
     <string name="Snabble.PaymentError.title">Vyskytla sa chyba</string>
     <string name="Snabble.PaymentError.tryAgain">Skúsiť znovu</string>
     <string name="Snabble.PaymentMethods.add">Pridať spôsob platby</string>
+    <string name="Snabble.PaymentMethods.choose"/>
+    <string name="Snabble.PaymentMethods.forAllRetailers"/>
+    <string name="Snabble.PaymentMethods.forSingleRetailer"/>
     <string name="Snabble.PaymentMethods.noCodeAlert.biometry">Tvoj iPhone nie je chránený ani kódom, ani funkciou Touch ID/Face ID. V záujme svojej ochrany pred zadaním svojho čísla IBAN najprv nastav túto ochranu.</string>
     <string name="Snabble.PaymentMethods.noCodeAlert.noBiometry">Tvoj iPhone nie je chránený kódom. V záujme svojej ochrany pred zadaním svojho čísla IBAN najprv nastav túto ochranu.</string>
     <string name="Snabble.PaymentMethods.noDeviceCode">Nepodporovaný iPhone</string>
@@ -108,6 +111,7 @@
     <string name="Snabble.PaymentStatus.step2">Povolenie tvojho nákupu</string>
     <string name="Snabble.PaymentStatus.step3">Povolenie tvojej platby</string>
     <string name="Snabble.pleaseWait">Čakaj, prosím...</string>
+    <string name="Snabble.QRCode.codeXofY">Kód %1$d z %2$d</string>
     <string name="Snabble.QRCode.didPay">Hotovo</string>
     <string name="Snabble.QRCode.entry.title">Kód: %d</string>
     <string name="Snabble.QRCode.message">Predlož QR kód pri pokladni, prosím</string>
diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
index c0553812bb..89d240491b 100644
--- a/ui/src/main/res/values/strings.xml
+++ b/ui/src/main/res/values/strings.xml
@@ -95,6 +95,9 @@
     <string name="Snabble.PaymentError.title">An error has occurred</string>
     <string name="Snabble.PaymentError.tryAgain">Try again</string>
     <string name="Snabble.PaymentMethods.add">Add payment method</string>
+    <string name="Snabble.PaymentMethods.choose">Which payment method to add?</string>
+    <string name="Snabble.PaymentMethods.forAllRetailers">For all retailers</string>
+    <string name="Snabble.PaymentMethods.forSingleRetailer">For specific retailer</string>
     <string name="Snabble.PaymentMethods.noCodeAlert.biometry">Your iPhone isn\'t protected by a code or Touch ID/Face ID. For your own safety, please assign a code before storing your payment information.</string>
     <string name="Snabble.PaymentMethods.noCodeAlert.noBiometry">Your iPhone isn\'t protected by a code. For your own safety, please assign a code before storing your payment information.</string>
     <string name="Snabble.PaymentMethods.noDeviceCode">No Code Protection</string>
@@ -108,6 +111,7 @@
     <string name="Snabble.PaymentStatus.step2">Processing your purchase</string>
     <string name="Snabble.PaymentStatus.step3">Processing your payment</string>
     <string name="Snabble.pleaseWait">Please wait…</string>
+    <string name="Snabble.QRCode.codeXofY">Code %1$d of %2$d</string>
     <string name="Snabble.QRCode.didPay">Done</string>
     <string name="Snabble.QRCode.entry.title">Code: %d</string>
     <string name="Snabble.QRCode.message">Please show QR code at the cash desk</string>

From 1ed2d8deedde22e6bbd0a281d58fc611246381ca Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Thu, 11 Feb 2021 14:34:11 +0100
Subject: [PATCH 08/21] provide projectId to payment selector dialog

---
 build.gradle                                  |  2 +-
 .../sdk/payment/PaymentCredentials.java       | 21 ++++++++++++-------
 .../cart/PaymentSelectionDialogFragment.java  |  3 +++
 .../snabble/sdk/ui/cart/ShoppingCartView.java |  4 ++++
 .../sdk/ui/payment/CreditCardInputView.java   | 14 +++++++++----
 .../payment/PaymentCredentialsListView.java   |  9 ++++++++
 6 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 063273ca2b..c79f34b180 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.32.11'
+        sdkVersion='0.33.0'
         versionCode=1
 
         compileSdkVersion=30
diff --git a/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java b/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java
index 592537f6cf..ac5fad2dc8 100644
--- a/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java
+++ b/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java
@@ -32,21 +32,27 @@
 
 public class PaymentCredentials {
     public enum Type {
-        SEPA(null),
-        CREDIT_CARD(null), // legacy credit card type, not used anmore.
-        CREDIT_CARD_PSD2(null),
-        PAYDIREKT(null),
-        TEGUT_EMPLOYEE_CARD("tegutEmployeeID");
+        SEPA(null, Collections.singletonList(PaymentMethod.DE_DIRECT_DEBIT)),
+        CREDIT_CARD(null, Arrays.asList(PaymentMethod.VISA, PaymentMethod.MASTERCARD, PaymentMethod.AMEX)), // legacy credit card type, not used anmore.
+        CREDIT_CARD_PSD2(null, Arrays.asList(PaymentMethod.VISA, PaymentMethod.MASTERCARD, PaymentMethod.AMEX)),
+        PAYDIREKT(null, Collections.singletonList(PaymentMethod.PAYDIREKT)),
+        TEGUT_EMPLOYEE_CARD("tegutEmployeeID", Collections.singletonList(PaymentMethod.TEGUT_EMPLOYEE_CARD));
 
         private String originType;
+        private List<PaymentMethod> paymentMethods;
 
-        Type(String originType) {
+        Type(String originType, List<PaymentMethod> paymentMethods) {
             this.originType = originType;
+            this.paymentMethods = paymentMethods;
         }
 
         public String getOriginType() {
             return originType;
         }
+
+        public List<PaymentMethod> getPaymentMethods() {
+            return paymentMethods;
+        }
     }
 
     public enum Brand {
@@ -260,7 +266,7 @@ public static PaymentCredentials fromPaydirekt(PaydirektAuthorizationData author
         return pc;
     }
 
-    public static PaymentCredentials fromTegutEmployeeCard(String obfuscatedId, String cardNumber) {
+    public static PaymentCredentials fromTegutEmployeeCard(String obfuscatedId, String cardNumber, String projectId) {
         if (cardNumber == null || cardNumber.length() != 19
                 || (!cardNumber.startsWith("9280001621")
                 && !cardNumber.startsWith("9280001625")
@@ -289,6 +295,7 @@ public static PaymentCredentials fromTegutEmployeeCard(String obfuscatedId, Stri
         pc.signature = pc.sha256Signature(certificate);
         pc.brand = Brand.UNKNOWN;
         pc.appId = Snabble.getInstance().getConfig().appId;
+        pc.projectId = projectId;
         pc.canBypassKeyStore = true;
 
         if (pc.encryptedData == null) {
diff --git a/ui/src/main/java/io/snabble/sdk/ui/cart/PaymentSelectionDialogFragment.java b/ui/src/main/java/io/snabble/sdk/ui/cart/PaymentSelectionDialogFragment.java
index 93d4f9669d..abd2316083 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/cart/PaymentSelectionDialogFragment.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/cart/PaymentSelectionDialogFragment.java
@@ -109,6 +109,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
                 Activity activity = UIUtils.getHostActivity(getContext());
                 if (activity instanceof FragmentActivity) {
                     SelectPaymentMethodFragment dialogFragment = new SelectPaymentMethodFragment();
+                    Bundle bundle = new Bundle();
+                    bundle.putString(SelectPaymentMethodFragment.ARG_PROJECT_ID, SnabbleUI.getProject().getId());
+                    dialogFragment.setArguments(bundle);
                     dialogFragment.show(((FragmentActivity) activity).getSupportFragmentManager(), null);
                 } else {
                     throw new RuntimeException("Host activity needs to be a Fragment Activity");
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
index c9084ab06e..d0976b960c 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/cart/ShoppingCartView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/cart/ShoppingCartView.java
@@ -7,6 +7,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
+import android.os.Bundle;
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.TextWatcher;
@@ -342,6 +343,9 @@ public void click() {
                     Activity activity = UIUtils.getHostActivity(getContext());
                     if (activity instanceof FragmentActivity) {
                         SelectPaymentMethodFragment dialogFragment = new SelectPaymentMethodFragment();
+                        Bundle bundle = new Bundle();
+                        bundle.putString(SelectPaymentMethodFragment.ARG_PROJECT_ID, SnabbleUI.getProject().getId());
+                        dialogFragment.setArguments(bundle);
                         dialogFragment.show(((FragmentActivity) activity).getSupportFragmentManager(), null);
                     }
                 } else {
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/CreditCardInputView.java b/ui/src/main/java/io/snabble/sdk/ui/payment/CreditCardInputView.java
index 182286e2ca..67a4e6b0e9 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/CreditCardInputView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/CreditCardInputView.java
@@ -51,7 +51,6 @@
 public class CreditCardInputView extends FrameLayout {
     private boolean acceptedKeyguard;
     private WebView webView;
-    private OkHttpClient okHttpClient;
     private Resources resources;
     private HashResponse lastHashResponse;
     private String cancelPreAuthUrl;
@@ -61,6 +60,7 @@ public class CreditCardInputView extends FrameLayout {
 
     private PaymentMethod paymentType;
     private String projectId;
+    private Project lastProject;
 
     public CreditCardInputView(Context context) {
         super(context);
@@ -80,7 +80,6 @@ private void inflateView() {
 
         inflate(getContext(), R.layout.snabble_view_cardinput_creditcard, this);
 
-        okHttpClient = Snabble.getInstance().getProjects().get(0).getOkHttpClient();
         resources = getContext().getResources();
 
         progressBar = findViewById(R.id.progress);
@@ -161,7 +160,9 @@ private void requestHash() {
                 .post(RequestBody.create("", null))
                 .build();
 
-        okHttpClient.newCall(request).enqueue(new SimpleJsonCallback<HashResponse>(HashResponse.class) {
+        lastProject = project;
+
+        project.getOkHttpClient().newCall(request).enqueue(new SimpleJsonCallback<HashResponse>(HashResponse.class) {
             @Override
             public void success(final HashResponse hashResponse) {
                 lastHashResponse = hashResponse;
@@ -282,6 +283,11 @@ private void cancelPreAuth(CreditCardInfo creditCardInfo) {
             return;
         }
 
+        if (lastProject == null) {
+            Logger.e("Could not abort pre authorization, no project provided");
+            return;
+        }
+
         url = url.replace("{orderID}", creditCardInfo.transactionId);
 
         Request request = new Request.Builder()
@@ -290,7 +296,7 @@ private void cancelPreAuth(CreditCardInfo creditCardInfo) {
                 .build();
 
         // fire and forget
-        okHttpClient.newCall(request).enqueue(new Callback() {
+        lastProject.getOkHttpClient().newCall(request).enqueue(new Callback() {
             @Override
             public void onFailure(Call call, IOException e) {
                 // ignore
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java
index 64b258bf3b..c6f9f78d4d 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java
@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
+import android.os.Bundle;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -17,16 +18,19 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import java.lang.reflect.Array;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import io.snabble.sdk.PaymentMethod;
 import io.snabble.sdk.Project;
 import io.snabble.sdk.Snabble;
 import io.snabble.sdk.payment.PaymentCredentials;
 import io.snabble.sdk.payment.PaymentCredentialsStore;
 import io.snabble.sdk.ui.R;
+import io.snabble.sdk.ui.SnabbleUI;
 import io.snabble.sdk.ui.telemetry.Telemetry;
 import io.snabble.sdk.ui.utils.KeyguardUtils;
 import io.snabble.sdk.ui.utils.OneShotClickListener;
@@ -77,6 +81,11 @@ public void click() {
                     Activity activity = UIUtils.getHostActivity(getContext());
                     if (activity instanceof FragmentActivity) {
                         SelectPaymentMethodFragment dialogFragment = new SelectPaymentMethodFragment();
+                        Bundle bundle = new Bundle();
+                        bundle.putString(SelectPaymentMethodFragment.ARG_PROJECT_ID, SnabbleUI.getProject().getId());
+                        ArrayList<PaymentMethod> types = new ArrayList<>(type.getPaymentMethods());
+                        bundle.putSerializable(SelectPaymentMethodFragment.ARG_PAYMENT_METHOD_LIST, types);
+                        dialogFragment.setArguments(bundle);
                         dialogFragment.show(((FragmentActivity) activity).getSupportFragmentManager(), null);
                     } else {
                         throw new RuntimeException("Host activity needs to be a Fragment Activity");

From 495a9d30765fbba206ec0007d4f3f3b02dbf0e23 Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Thu, 11 Feb 2021 16:41:21 +0100
Subject: [PATCH 09/21] make kotlin views open

---
 .../main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt   | 2 +-
 .../java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
index 26794eb82d..d05a277c9c 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
@@ -30,7 +30,7 @@ import java.util.*
 import kotlin.collections.ArrayList
 import kotlin.collections.HashMap
 
-class PaymentOptionsView @JvmOverloads constructor(
+open class PaymentOptionsView @JvmOverloads constructor(
     context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : FrameLayout(context, attrs, defStyleAttr) {
 
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt
index 6c0c67931f..33d7734a02 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt
@@ -26,7 +26,7 @@ import io.snabble.sdk.ui.utils.getFragmentActivity
 import io.snabble.sdk.ui.utils.loadAsset
 import java.util.*
 
-class SelectProjectPaymentView @JvmOverloads constructor(
+open class SelectProjectPaymentView @JvmOverloads constructor(
     context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : FrameLayout(context, attrs, defStyleAttr) {
     private var adapter: EntryAdapter

From 15e021f9facf423e101bd2361fdb926ee87489d7 Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Mon, 15 Feb 2021 11:20:56 +0100
Subject: [PATCH 10/21] use i18n

---
 .../java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
index d05a277c9c..9880942230 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
@@ -68,7 +68,7 @@ open class PaymentOptionsView @JvmOverloads constructor(
         globalList.add(
             Entry(
                 isSectionHeader = true,
-                text = "Händlerübergreifend",
+                text = resources.getString(R.string.Snabble_PaymentMethods_forAllRetailers),
             )
         )
 
@@ -83,7 +83,7 @@ open class PaymentOptionsView @JvmOverloads constructor(
 
             globalList.add(
                 Entry(
-                    text = "SEPA-Lastschrift",
+                    text = resources.getString(R.string.Snabble_Payment_SEPA_Title),
                     icon = R.drawable.snabble_ic_payment_select_sepa,
                     count = count,
                     click = {
@@ -126,7 +126,7 @@ open class PaymentOptionsView @JvmOverloads constructor(
         projectList.add(
             Entry(
                 isSectionHeader = true,
-                text = "Für einzelnen Händler",
+                text = resources.getString(R.string.Snabble_PaymentMethods_forSingleRetailer),
             )
         )
 

From 4631e1c8b1d86fa0c37c13fc298da04b54142b03 Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Mon, 15 Feb 2021 13:37:04 +0100
Subject: [PATCH 11/21] rename project payment options view

---
 .../sdk/ui/integration/ProjectPaymentOptionsFragment.kt       | 4 ++--
 .../res/layout/snabble_fragment_select_payment_project.xml    | 4 ++--
 ...lectProjectPaymentView.kt => ProjectPaymentOptionsView.kt} | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename ui/src/main/java/io/snabble/sdk/ui/payment/{SelectProjectPaymentView.kt => ProjectPaymentOptionsView.kt} (98%)

diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
index d92f8d3541..e359a4dd2b 100644
--- a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
+++ b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import io.snabble.sdk.Project
 import io.snabble.sdk.Snabble
-import io.snabble.sdk.ui.payment.SelectProjectPaymentView
+import io.snabble.sdk.ui.payment.ProjectPaymentOptionsView
 
 class ProjectPaymentOptionsFragment : Fragment() {
     companion object {
@@ -22,7 +22,7 @@ class ProjectPaymentOptionsFragment : Fragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val v =  inflater.inflate(R.layout.snabble_fragment_select_payment_project, container, false) as SelectProjectPaymentView
+        val v =  inflater.inflate(R.layout.snabble_fragment_select_payment_project, container, false) as ProjectPaymentOptionsView
 
         brand?.let { brand ->
             val projects = ArrayList<Project>()
diff --git a/ui-integration/src/main/res/layout/snabble_fragment_select_payment_project.xml b/ui-integration/src/main/res/layout/snabble_fragment_select_payment_project.xml
index 19e0e47a7f..9add369992 100644
--- a/ui-integration/src/main/res/layout/snabble_fragment_select_payment_project.xml
+++ b/ui-integration/src/main/res/layout/snabble_fragment_select_payment_project.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<io.snabble.sdk.ui.payment.SelectProjectPaymentView xmlns:android="http://schemas.android.com/apk/res/android"
+<io.snabble.sdk.ui.payment.ProjectPaymentOptionsView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/select_payment_project_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-</io.snabble.sdk.ui.payment.SelectProjectPaymentView>
\ No newline at end of file
+</io.snabble.sdk.ui.payment.ProjectPaymentOptionsView>
\ No newline at end of file
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt
similarity index 98%
rename from ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt
rename to ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt
index 33d7734a02..3c0104b23c 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectProjectPaymentView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt
@@ -26,7 +26,7 @@ import io.snabble.sdk.ui.utils.getFragmentActivity
 import io.snabble.sdk.ui.utils.loadAsset
 import java.util.*
 
-open class SelectProjectPaymentView @JvmOverloads constructor(
+open class ProjectPaymentOptionsView @JvmOverloads constructor(
     context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : FrameLayout(context, attrs, defStyleAttr) {
     private var adapter: EntryAdapter

From f8f6344cfce204647c2249e53d3ce47fabde9333 Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Mon, 15 Feb 2021 13:37:29 +0100
Subject: [PATCH 12/21] v0.33.0-beta01

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c79f34b180..5a626cc570 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.33.0'
+        sdkVersion='0.33.0-beta01'
         versionCode=1
 
         compileSdkVersion=30

From aea2fad6f69df34d11d0e6b336894c09ccf7ca95 Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Mon, 15 Feb 2021 13:44:56 +0100
Subject: [PATCH 13/21] Update CHANGELOG.md

---
 CHANGELOG.md                                           | 10 ++++++++++
 .../snabble/sdk/payment/PaymentCredentialsStore.java   |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02177e4a52..cef5ef3e60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.33.0-beta01]
+
+### Breaking Changes
+- Added support for PSD2 credit cards. This requires that existing credit cards are invalidated, which
+can be checked using PaymentCredentialsStore.hasRemovedOldCreditCards()
+- 2 new views and there respective fragments related to the new credit card flow have been added: PaymentOptionsView and ProjectPaymentOptionsView.
+ProjectCredentialsListView should not be used as a Overview anymore, the new recommended entry point is now PaymentOptionsView.
+- SnabbleUI.Callback now provides data as a Bundle. This bundle is mostly used for fragment arguments.
+- EVENT_PRODUCT_CONFIRMATION_HIDE now provides its ShoppingCart.Item in the Bundle as a Serializable "cartItem".
+
 ## [0.32.11]
 
 ### Fixed
diff --git a/core/src/main/java/io/snabble/sdk/payment/PaymentCredentialsStore.java b/core/src/main/java/io/snabble/sdk/payment/PaymentCredentialsStore.java
index dfcd48fedc..fab34581fd 100644
--- a/core/src/main/java/io/snabble/sdk/payment/PaymentCredentialsStore.java
+++ b/core/src/main/java/io/snabble/sdk/payment/PaymentCredentialsStore.java
@@ -130,6 +130,9 @@ public String id() {
         return data.id;
     }
 
+    /**
+     * @return true if old credit cards before v0.33.0 were added and therefore rendered unusable and deleted
+     */
     public boolean hasRemovedOldCreditCards() {
         return data.removedOldCreditCards;
     }

From 1512ba61baec7255b9066647f05e2c9bc04d63ed Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Mon, 15 Feb 2021 16:36:57 +0100
Subject: [PATCH 14/21] layout improvements

---
 .../java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt     | 2 +-
 .../main/res/layout/snabble_item_payment_options_entry.xml   | 2 ++
 .../main/res/layout/snabble_item_payment_options_header.xml  | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
index 9880942230..1ce2da88b3 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
@@ -42,7 +42,7 @@ open class PaymentOptionsView @JvmOverloads constructor(
         recyclerView.adapter = adapter
         recyclerView.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
         recyclerView.itemAnimator = null
-        val dividerItemDecoration = DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL)
+        val dividerItemDecoration = DividerItemDecoration(context, LinearLayoutManager.VERTICAL)
         recyclerView.addItemDecoration(dividerItemDecoration)
         adapter.submitList(getEntries())
 
diff --git a/ui/src/main/res/layout/snabble_item_payment_options_entry.xml b/ui/src/main/res/layout/snabble_item_payment_options_entry.xml
index eeee98c6ce..896143c84c 100644
--- a/ui/src/main/res/layout/snabble_item_payment_options_entry.xml
+++ b/ui/src/main/res/layout/snabble_item_payment_options_entry.xml
@@ -8,7 +8,9 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:minWidth="24dp"
         android:layout_gravity="center_vertical"
+        android:scaleType="fitStart"
         android:layout_margin="16dp"
         android:id="@+id/helper_image"
         tools:src="@drawable/snabble_ic_sepa_small" />
diff --git a/ui/src/main/res/layout/snabble_item_payment_options_header.xml b/ui/src/main/res/layout/snabble_item_payment_options_header.xml
index b7c269da06..4ca0e84732 100644
--- a/ui/src/main/res/layout/snabble_item_payment_options_header.xml
+++ b/ui/src/main/res/layout/snabble_item_payment_options_header.xml
@@ -6,5 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2"
-    android:padding="16dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
     tools:text="Zahlungsmethoden" />
\ No newline at end of file

From 93e91c8415deae78060cef431e8fad97e936d690 Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Mon, 15 Feb 2021 16:54:02 +0100
Subject: [PATCH 15/21] fix payment option count not updating

---
 .../java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt | 9 ++++++++-
 .../snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt  | 7 +++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
index 1ce2da88b3..e36677442b 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
@@ -20,6 +20,7 @@ import io.snabble.sdk.PaymentMethod
 import io.snabble.sdk.Project
 import io.snabble.sdk.Snabble
 import io.snabble.sdk.payment.PaymentCredentials
+import io.snabble.sdk.payment.PaymentCredentialsStore
 import io.snabble.sdk.ui.R
 import io.snabble.sdk.ui.SnabbleUI
 import io.snabble.sdk.ui.utils.UIUtils
@@ -46,15 +47,21 @@ open class PaymentOptionsView @JvmOverloads constructor(
         recyclerView.addItemDecoration(dividerItemDecoration)
         adapter.submitList(getEntries())
 
+        val listener = PaymentCredentialsStore.OnPaymentCredentialsAddedListener {
+            adapter.notifyDataSetChanged()
+        }
+
         getFragmentActivity()?.lifecycle?.addObserver(object : LifecycleObserver {
             @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
             fun onResume() {
-                adapter.submitList(getEntries())
+                adapter.notifyDataSetChanged()
+                Snabble.getInstance().paymentCredentialsStore.addOnPaymentCredentialsAddedListener(listener)
             }
 
             @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
             fun onDestroy() {
                 getFragmentActivity()?.lifecycle?.removeObserver(this)
+                Snabble.getInstance().paymentCredentialsStore.removeOnPaymentCredentialsAddedListener(listener)
             }
         })
     }
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt
index 3c0104b23c..5380fa1ca5 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt
@@ -18,6 +18,7 @@ import io.snabble.sdk.PaymentMethod
 import io.snabble.sdk.Project
 import io.snabble.sdk.Snabble
 import io.snabble.sdk.payment.PaymentCredentials
+import io.snabble.sdk.payment.PaymentCredentialsStore
 import io.snabble.sdk.ui.R
 import io.snabble.sdk.ui.SnabbleUI
 import io.snabble.sdk.ui.utils.UIUtils
@@ -48,15 +49,21 @@ open class ProjectPaymentOptionsView @JvmOverloads constructor(
         recyclerView.addItemDecoration(dividerItemDecoration)
         recyclerView.itemAnimator = null
 
+        val listener = PaymentCredentialsStore.OnPaymentCredentialsAddedListener {
+            adapter.notifyDataSetChanged()
+        }
+
         getFragmentActivity()?.lifecycle?.addObserver(object : LifecycleObserver {
             @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
             fun onResume() {
                 adapter.notifyDataSetChanged()
+                Snabble.getInstance().paymentCredentialsStore.addOnPaymentCredentialsAddedListener(listener)
             }
 
             @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
             fun onDestroy() {
                 getFragmentActivity()?.lifecycle?.removeObserver(this)
+                Snabble.getInstance().paymentCredentialsStore.removeOnPaymentCredentialsAddedListener(listener)
             }
         })
     }

From 35f7c8ea723f9f45acb20ed35437e2ec921bf225 Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Tue, 16 Feb 2021 09:49:46 +0100
Subject: [PATCH 16/21] bump version

---
 CHANGELOG.md | 6 ++++++
 build.gradle | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cef5ef3e60..8d1d292e06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.33.0-beta02]
+
+### Fixed
+- PaymentOptionsView not always updating
+- Improved layout of PaymentOptionsView
+
 ## [0.33.0-beta01]
 
 ### Breaking Changes
diff --git a/build.gradle b/build.gradle
index 5a626cc570..7a881546e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.33.0-beta01'
+        sdkVersion='0.33.0-beta02'
         versionCode=1
 
         compileSdkVersion=30

From a80418b6f846b9b82a5036b28bcd2a9979b3d2b2 Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Tue, 16 Feb 2021 10:35:34 +0100
Subject: [PATCH 17/21] extracted view parameters

---
 .../sdk/ui/integration/CreditCardInputFragment.kt   |  6 +++---
 .../integration/PaymentCredentialsListFragment.kt   |  4 ++--
 .../ui/integration/ProjectPaymentOptionsFragment.kt |  2 +-
 .../snabble/sdk/ui/payment/CreditCardInputView.java |  3 +++
 .../sdk/ui/payment/PaymentCredentialsListView.java  |  3 +++
 .../sdk/ui/payment/PaymentInputViewHelper.java      | 12 ++++++------
 .../io/snabble/sdk/ui/payment/PaymentOptionsView.kt | 10 +++++-----
 .../sdk/ui/payment/ProjectPaymentOptionsView.kt     |  8 ++++++--
 .../sdk/ui/payment/SelectPaymentMethodFragment.java | 13 ++++++-------
 9 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt
index b0ac9afb8b..1d05066b5a 100644
--- a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt
+++ b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt
@@ -10,8 +10,8 @@ import io.snabble.sdk.ui.payment.CreditCardInputView
 
 class CreditCardInputFragment : Fragment() {
     companion object {
-        const val ARG_PROJECT_ID = "projectId"
-        const val ARG_PAYMENT_METHOD = "paymentType"
+        const val ARG_PROJECT_ID = CreditCardInputView.ARG_PROJECT_ID
+        const val ARG_PAYMENT_TYPE = CreditCardInputView.ARG_PAYMENT_TYPE
     }
 
     var projectId: String? = null
@@ -22,7 +22,7 @@ class CreditCardInputFragment : Fragment() {
         setHasOptionsMenu(true)
 
         projectId = arguments?.getString(ARG_PROJECT_ID, null)
-        paymentMethod = arguments?.getSerializable(ARG_PAYMENT_METHOD) as PaymentMethod?
+        paymentMethod = arguments?.getSerializable(ARG_PAYMENT_TYPE) as PaymentMethod?
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt
index 17cabff6eb..1e907c4fe7 100644
--- a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt
+++ b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt
@@ -14,8 +14,8 @@ import io.snabble.sdk.ui.payment.PaymentCredentialsListView
 
 class PaymentCredentialsListFragment : Fragment() {
     companion object {
-        const val ARG_PAYMENT_TYPE = "paymentType"
-        const val ARG_PROJECT_ID = "projectId"
+        const val ARG_PAYMENT_TYPE = PaymentCredentialsListView.ARG_PAYMENT_TYPE
+        const val ARG_PROJECT_ID = PaymentCredentialsListView.ARG_PROJECT_ID
     }
 
     var type: PaymentCredentials.Type? = null
diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
index e359a4dd2b..a6572968a6 100644
--- a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
+++ b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
@@ -11,7 +11,7 @@ import io.snabble.sdk.ui.payment.ProjectPaymentOptionsView
 
 class ProjectPaymentOptionsFragment : Fragment() {
     companion object {
-        const val ARG_BRAND = "brandId"
+        const val ARG_BRAND = ProjectPaymentOptionsView.ARG_BRAND
     }
 
     var brand: String? = null
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/CreditCardInputView.java b/ui/src/main/java/io/snabble/sdk/ui/payment/CreditCardInputView.java
index 67a4e6b0e9..a0590623a4 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/CreditCardInputView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/CreditCardInputView.java
@@ -49,6 +49,9 @@
 import okhttp3.Response;
 
 public class CreditCardInputView extends FrameLayout {
+    public static final String ARG_PROJECT_ID = "projectId";
+    public static final String ARG_PAYMENT_TYPE = "paymentType";
+
     private boolean acceptedKeyguard;
     private WebView webView;
     private Resources resources;
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java
index c6f9f78d4d..1c6312a49b 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java
@@ -38,6 +38,9 @@
 import io.snabble.sdk.utils.SimpleActivityLifecycleCallbacks;
 
 public class PaymentCredentialsListView extends FrameLayout implements PaymentCredentialsStore.Callback {
+    public static final String ARG_PAYMENT_TYPE = "paymentType";
+    public static final String ARG_PROJECT_ID = "projectId";
+
     private List<Entry> entries = new ArrayList<>();
     private PaymentCredentialsStore paymentCredentialsStore;
     private RecyclerView recyclerView;
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentInputViewHelper.java b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentInputViewHelper.java
index a4707972e8..f85318d15e 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentInputViewHelper.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentInputViewHelper.java
@@ -13,18 +13,18 @@ public static void openPaymentInputView(PaymentMethod paymentMethod, Project pro
             Bundle args = new Bundle();
             switch (paymentMethod) {
                 case VISA:
-                    args.putString("projectId", project.getId());
-                    args.putSerializable("paymentType", PaymentMethod.VISA);
+                    args.putString(CreditCardInputView.ARG_PROJECT_ID, project.getId());
+                    args.putSerializable(CreditCardInputView.ARG_PAYMENT_TYPE, PaymentMethod.VISA);
                     callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
                     break;
                 case AMEX:
-                    args.putString("projectId", project.getId());
-                    args.putSerializable("paymentType", PaymentMethod.AMEX);
+                    args.putString(CreditCardInputView.ARG_PROJECT_ID, project.getId());
+                    args.putSerializable(CreditCardInputView.ARG_PAYMENT_TYPE, PaymentMethod.AMEX);
                     callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
                     break;
                 case MASTERCARD:
-                    args.putString("projectId", project.getId());
-                    args.putSerializable("paymentType", PaymentMethod.MASTERCARD);
+                    args.putString(CreditCardInputView.ARG_PROJECT_ID, project.getId());
+                    args.putSerializable(CreditCardInputView.ARG_PAYMENT_TYPE, PaymentMethod.MASTERCARD);
                     callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
                     break;
                 case PAYDIREKT:
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
index e36677442b..5760752a28 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
@@ -96,7 +96,7 @@ open class PaymentOptionsView @JvmOverloads constructor(
                     click = {
                         if (count > 0) {
                             val args = Bundle()
-                            args.putSerializable("paymentType", PaymentCredentials.Type.SEPA)
+                            args.putSerializable(PaymentCredentialsListView.ARG_PAYMENT_TYPE, PaymentCredentials.Type.SEPA)
                             executeUiAction(SnabbleUI.Action.SHOW_PAYMENT_CREDENTIALS_LIST, args)
                         } else {
                             executeUiAction(SnabbleUI.Action.SHOW_SEPA_CARD_INPUT)
@@ -120,7 +120,7 @@ open class PaymentOptionsView @JvmOverloads constructor(
                     click = {
                         if (count > 0) {
                             val args = Bundle()
-                            args.putSerializable("paymentType", PaymentCredentials.Type.PAYDIREKT)
+                            args.putSerializable(PaymentCredentialsListView.ARG_PAYMENT_TYPE, PaymentCredentials.Type.PAYDIREKT)
                             executeUiAction(SnabbleUI.Action.SHOW_PAYMENT_CREDENTIALS_LIST, args)
                         } else {
                             executeUiAction(SnabbleUI.Action.SHOW_PAYDIREKT_INPUT)
@@ -154,8 +154,8 @@ open class PaymentOptionsView @JvmOverloads constructor(
                         click = {
                             if (count > 0) {
                                 val args = Bundle()
-                                args.putSerializable("paymentType", PaymentCredentials.Type.CREDIT_CARD_PSD2)
-                                args.putSerializable("projectId", project.id)
+                                args.putSerializable(PaymentCredentialsListView.ARG_PAYMENT_TYPE, PaymentCredentials.Type.CREDIT_CARD_PSD2)
+                                args.putSerializable(PaymentCredentialsListView.ARG_PROJECT_ID, project.id)
                                 executeUiAction(SnabbleUI.Action.SHOW_PAYMENT_CREDENTIALS_LIST, args)
                             } else {
                                 val activity = UIUtils.getHostActivity(context)
@@ -210,7 +210,7 @@ open class PaymentOptionsView @JvmOverloads constructor(
                     count = counts[brand] ?: 0,
                     click = {
                         val args = Bundle()
-                        args.putString("brandId", brand.id)
+                        args.putString(ProjectPaymentOptionsView.ARG_BRAND, brand.id)
                         executeUiAction(SnabbleUI.Action.SHOW_PROJECT_PAYMENT_OPTIONS, args)
                     }
                 )
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt
index 5380fa1ca5..fe605565b7 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt
@@ -30,6 +30,10 @@ import java.util.*
 open class ProjectPaymentOptionsView @JvmOverloads constructor(
     context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : FrameLayout(context, attrs, defStyleAttr) {
+    companion object {
+        const val ARG_BRAND = "brandId"
+    }
+
     private var adapter: EntryAdapter
 
     var projects: List<Project>? = null
@@ -104,8 +108,8 @@ open class ProjectPaymentOptionsView @JvmOverloads constructor(
             holder.itemView.setOnClickListener {
                 if (count > 0) {
                     val args = Bundle()
-                    args.putSerializable("paymentType", PaymentCredentials.Type.CREDIT_CARD_PSD2)
-                    args.putSerializable("projectId", project.id)
+                    args.putSerializable(PaymentCredentialsListView.ARG_PAYMENT_TYPE, PaymentCredentials.Type.CREDIT_CARD_PSD2)
+                    args.putSerializable(PaymentCredentialsListView.ARG_PROJECT_ID, project.id)
                     executeUiAction(SnabbleUI.Action.SHOW_PAYMENT_CREDENTIALS_LIST, args)
                 } else {
                     val activity = UIUtils.getHostActivity(context)
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java
index 68339fe4a8..60df899cee 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java
@@ -27,7 +27,6 @@
 import io.snabble.sdk.ui.R;
 import io.snabble.sdk.ui.SnabbleUI;
 import io.snabble.sdk.ui.utils.OneShotClickListener;
-import io.snabble.sdk.ui.utils.ViewExtKt;
 
 public class SelectPaymentMethodFragment extends BottomSheetDialogFragment {
     public static final String ARG_PAYMENT_METHOD_LIST = "paymentMethods";
@@ -91,8 +90,8 @@ public void click() {
                     SnabbleUI.Callback callback = SnabbleUI.getUiCallback();
                     if (callback != null) {
                         Bundle args = new Bundle();
-                        args.putString("projectId", projectId);
-                        args.putSerializable("paymentType", PaymentMethod.VISA);
+                        args.putString(CreditCardInputView.ARG_PROJECT_ID, projectId);
+                        args.putSerializable(CreditCardInputView.ARG_PAYMENT_TYPE, PaymentMethod.VISA);
                         callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
                     }
 
@@ -110,8 +109,8 @@ public void click() {
                     SnabbleUI.Callback callback = SnabbleUI.getUiCallback();
                     if (callback != null) {
                         Bundle args = new Bundle();
-                        args.putString("projectId", projectId);
-                        args.putSerializable("paymentType", PaymentMethod.MASTERCARD);
+                        args.putString(CreditCardInputView.ARG_PROJECT_ID, projectId);
+                        args.putSerializable(CreditCardInputView.ARG_PAYMENT_TYPE, PaymentMethod.MASTERCARD);
                         callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
                     }
 
@@ -129,8 +128,8 @@ public void click() {
                     SnabbleUI.Callback callback = SnabbleUI.getUiCallback();
                     if (callback != null) {
                         Bundle args = new Bundle();
-                        args.putString("projectId", projectId);
-                        args.putSerializable("paymentType", PaymentMethod.AMEX);
+                        args.putString(CreditCardInputView.ARG_PROJECT_ID, projectId);
+                        args.putSerializable(CreditCardInputView.ARG_PAYMENT_TYPE, PaymentMethod.AMEX);
                         callback.execute(SnabbleUI.Action.SHOW_CREDIT_CARD_INPUT, args);
                     }
 

From 37f4d23598dc7bbb56a2283e518320652ebf1248 Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Tue, 16 Feb 2021 11:44:19 +0100
Subject: [PATCH 18/21] cleanup

---
 .../main/java/io/snabble/sdk/payment/PaymentCredentials.java   | 3 ++-
 .../sdk/ui/integration/PaymentCredentialsListFragment.kt       | 2 +-
 .../io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt     | 2 +-
 .../java/io/snabble/sdk/utils/security/KeyStoreCipher.java     | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java b/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java
index ac5fad2dc8..68734e84be 100644
--- a/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java
+++ b/core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java
@@ -33,7 +33,8 @@
 public class PaymentCredentials {
     public enum Type {
         SEPA(null, Collections.singletonList(PaymentMethod.DE_DIRECT_DEBIT)),
-        CREDIT_CARD(null, Arrays.asList(PaymentMethod.VISA, PaymentMethod.MASTERCARD, PaymentMethod.AMEX)), // legacy credit card type, not used anmore.
+        // legacy credit card type, not used anymore.
+        CREDIT_CARD(null, Arrays.asList(PaymentMethod.VISA, PaymentMethod.MASTERCARD, PaymentMethod.AMEX)),
         CREDIT_CARD_PSD2(null, Arrays.asList(PaymentMethod.VISA, PaymentMethod.MASTERCARD, PaymentMethod.AMEX)),
         PAYDIREKT(null, Collections.singletonList(PaymentMethod.PAYDIREKT)),
         TEGUT_EMPLOYEE_CARD("tegutEmployeeID", Collections.singletonList(PaymentMethod.TEGUT_EMPLOYEE_CARD));
diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt
index 1e907c4fe7..c915e1014a 100644
--- a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt
+++ b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt
@@ -24,7 +24,7 @@ class PaymentCredentialsListFragment : Fragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         type = arguments?.getSerializable(ARG_PAYMENT_TYPE) as PaymentCredentials.Type?
-        val projectId = arguments?.getSerializable(ARG_PROJECT_ID) as String?
+        val projectId = arguments?.getString(ARG_PROJECT_ID)
         project = Snabble.getInstance().projects.firstOrNull { it.id == projectId }
     }
 
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt
index fe605565b7..4955f34984 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt
@@ -109,7 +109,7 @@ open class ProjectPaymentOptionsView @JvmOverloads constructor(
                 if (count > 0) {
                     val args = Bundle()
                     args.putSerializable(PaymentCredentialsListView.ARG_PAYMENT_TYPE, PaymentCredentials.Type.CREDIT_CARD_PSD2)
-                    args.putSerializable(PaymentCredentialsListView.ARG_PROJECT_ID, project.id)
+                    args.putString(PaymentCredentialsListView.ARG_PROJECT_ID, project.id)
                     executeUiAction(SnabbleUI.Action.SHOW_PAYMENT_CREDENTIALS_LIST, args)
                 } else {
                     val activity = UIUtils.getHostActivity(context)
diff --git a/utils/src/main/java/io/snabble/sdk/utils/security/KeyStoreCipher.java b/utils/src/main/java/io/snabble/sdk/utils/security/KeyStoreCipher.java
index d5479a26da..36d0e9f855 100644
--- a/utils/src/main/java/io/snabble/sdk/utils/security/KeyStoreCipher.java
+++ b/utils/src/main/java/io/snabble/sdk/utils/security/KeyStoreCipher.java
@@ -19,7 +19,7 @@ public static KeyStoreCipher create(Context context, String tag, boolean require
         try {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 return new KeyStoreCipherMarshmallow(tag, requireUserAuthentication);
-            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2){
+            } else {
                 return new KeyStoreCipherJellyBeanMR2(context.getApplicationContext(), tag, requireUserAuthentication);
             }
         } catch (Exception e) {

From 78cce519ad4683ab73524a5437a8687a9695e175 Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Tue, 16 Feb 2021 12:17:38 +0100
Subject: [PATCH 19/21] bump version

---
 CHANGELOG.md | 5 +++++
 build.gradle | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d1d292e06..64a1e16d7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.33.0-beta03]
+
+### Changes
+- Small bugfixes
+
 ## [0.33.0-beta02]
 
 ### Fixed
diff --git a/build.gradle b/build.gradle
index 7a881546e8..1610ad0d40 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.33.0-beta02'
+        sdkVersion='0.33.0-beta03'
         versionCode=1
 
         compileSdkVersion=30

From b3b0b93aaaf7099a5d248c879eba1c6d8e263943 Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Tue, 16 Feb 2021 13:18:08 +0100
Subject: [PATCH 20/21] mark kotlin fragments as open

---
 CHANGELOG.md                                                 | 5 +++++
 build.gradle                                                 | 2 +-
 .../io/snabble/sdk/ui/integration/CreditCardInputFragment.kt | 2 +-
 .../sdk/ui/integration/PaymentCredentialsListFragment.kt     | 2 +-
 .../sdk/ui/integration/ProjectPaymentOptionsFragment.kt      | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64a1e16d7f..c308ba0549 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.33.0-beta04]
+
+### Changes
+- Mark all kotlin fragments as open
+
 ## [0.33.0-beta03]
 
 ### Changes
diff --git a/build.gradle b/build.gradle
index 1610ad0d40..fba5de3822 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.33.0-beta03'
+        sdkVersion='0.33.0-beta04'
         versionCode=1
 
         compileSdkVersion=30
diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt
index 1d05066b5a..86d47f626e 100644
--- a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt
+++ b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/CreditCardInputFragment.kt
@@ -8,7 +8,7 @@ import androidx.fragment.app.Fragment
 import io.snabble.sdk.PaymentMethod
 import io.snabble.sdk.ui.payment.CreditCardInputView
 
-class CreditCardInputFragment : Fragment() {
+open class CreditCardInputFragment : Fragment() {
     companion object {
         const val ARG_PROJECT_ID = CreditCardInputView.ARG_PROJECT_ID
         const val ARG_PAYMENT_TYPE = CreditCardInputView.ARG_PAYMENT_TYPE
diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt
index c915e1014a..dd1aa3dcd9 100644
--- a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt
+++ b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/PaymentCredentialsListFragment.kt
@@ -12,7 +12,7 @@ import io.snabble.sdk.payment.PaymentCredentials
 import io.snabble.sdk.ui.payment.CreditCardInputView
 import io.snabble.sdk.ui.payment.PaymentCredentialsListView
 
-class PaymentCredentialsListFragment : Fragment() {
+open class PaymentCredentialsListFragment : Fragment() {
     companion object {
         const val ARG_PAYMENT_TYPE = PaymentCredentialsListView.ARG_PAYMENT_TYPE
         const val ARG_PROJECT_ID = PaymentCredentialsListView.ARG_PROJECT_ID
diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
index a6572968a6..bc2244f4a5 100644
--- a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
+++ b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
@@ -9,7 +9,7 @@ import io.snabble.sdk.Project
 import io.snabble.sdk.Snabble
 import io.snabble.sdk.ui.payment.ProjectPaymentOptionsView
 
-class ProjectPaymentOptionsFragment : Fragment() {
+open class ProjectPaymentOptionsFragment : Fragment() {
     companion object {
         const val ARG_BRAND = ProjectPaymentOptionsView.ARG_BRAND
     }

From 7fc386804b3c6c4dc12706c5b76f6c1f7135ba8b Mon Sep 17 00:00:00 2001
From: Alexander Junggeburth <alexander.junggeburth@snabble.io>
Date: Wed, 17 Feb 2021 14:23:12 +0100
Subject: [PATCH 21/21] cleanup & improvements

---
 .../ui/integration/ProjectPaymentOptionsFragment.kt  |  6 +++++-
 .../sdk/ui/cart/PaymentSelectionDialogFragment.java  |  2 +-
 .../sdk/ui/payment/PaymentCredentialsListView.java   | 12 ++++++------
 .../io/snabble/sdk/ui/payment/PaymentOptionsView.kt  | 10 +++-------
 .../sdk/ui/payment/ProjectPaymentOptionsView.kt      |  2 +-
 ui/src/main/res/layout/snabble_payment_options.xml   | 11 ++++-------
 .../res/layout/snabble_select_payment_project.xml    | 11 ++++-------
 7 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
index bc2244f4a5..8d747192ce 100644
--- a/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
+++ b/ui-integration/src/main/java/io/snabble/sdk/ui/integration/ProjectPaymentOptionsFragment.kt
@@ -8,6 +8,7 @@ import androidx.fragment.app.Fragment
 import io.snabble.sdk.Project
 import io.snabble.sdk.Snabble
 import io.snabble.sdk.ui.payment.ProjectPaymentOptionsView
+import java.lang.RuntimeException
 
 open class ProjectPaymentOptionsFragment : Fragment() {
     companion object {
@@ -18,7 +19,10 @@ open class ProjectPaymentOptionsFragment : Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        brand = arguments?.getString(ARG_BRAND, null)
+        brand = arguments?.getString(ARG_BRAND)
+        if (brand == null) {
+            throw IllegalArgumentException("ProjectPaymentOptionsFragment needs a brand id as argument")
+        }
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
diff --git a/ui/src/main/java/io/snabble/sdk/ui/cart/PaymentSelectionDialogFragment.java b/ui/src/main/java/io/snabble/sdk/ui/cart/PaymentSelectionDialogFragment.java
index abd2316083..b704e51bc6 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/cart/PaymentSelectionDialogFragment.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/cart/PaymentSelectionDialogFragment.java
@@ -114,7 +114,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
                     dialogFragment.setArguments(bundle);
                     dialogFragment.show(((FragmentActivity) activity).getSupportFragmentManager(), null);
                 } else {
-                    throw new RuntimeException("Host activity needs to be a Fragment Activity");
+                    throw new RuntimeException("Host activity must be a Fragment Activity");
                 }
                 dismissAllowingStateLoss();
             });
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java
index 1c6312a49b..0b54697c43 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java
@@ -91,7 +91,7 @@ public void click() {
                         dialogFragment.setArguments(bundle);
                         dialogFragment.show(((FragmentActivity) activity).getSupportFragmentManager(), null);
                     } else {
-                        throw new RuntimeException("Host activity needs to be a Fragment Activity");
+                        throw new RuntimeException("Host activity must be a Fragment Activity");
                     }
                 } else {
                     new AlertDialog.Builder(getContext())
@@ -156,17 +156,17 @@ public void onChanged() {
         List<PaymentCredentials> paymentCredentials = paymentCredentialsStore.getAll();
 
         for (PaymentCredentials pm : paymentCredentials) {
-            boolean sameProject = true;
+            boolean sameProjectOrNull = true;
             if (project != null) {
-                sameProject = project.getId().equals(pm.getProjectId());
+                sameProjectOrNull = project.getId().equals(pm.getProjectId());
             }
 
-            boolean sameType = true;
+            boolean sameTypeOrNull = true;
             if (type != null) {
-                sameType = type.equals(pm.getType());
+                sameTypeOrNull = type.equals(pm.getType());
             }
 
-            if (pm.isAvailableInCurrentApp() && sameType && sameProject) {
+            if (pm.isAvailableInCurrentApp() && sameTypeOrNull && sameProjectOrNull) {
                 switch (pm.getType()) {
                     case SEPA:
                         entries.add(new Entry(pm, R.drawable.snabble_ic_payment_select_sepa, pm.getObfuscatedId()));
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
index 5760752a28..496277276d 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentOptionsView.kt
@@ -171,7 +171,7 @@ open class PaymentOptionsView @JvmOverloads constructor(
                                     dialogFragment.arguments = args
                                     dialogFragment.show(activity.supportFragmentManager, null)
                                 } else {
-                                    throw RuntimeException("Host activity needs to be a FragmentActivity")
+                                    throw RuntimeException("Host activity must be a FragmentActivity")
                                 }
                             }
                         }
@@ -194,12 +194,8 @@ open class PaymentOptionsView @JvmOverloads constructor(
                     brands.add(project.brand)
                 }
 
-                val currentCount = counts[project.brand]
-                if (currentCount == null) {
-                    counts[project.brand] = count
-                } else {
-                    counts[project.brand] = currentCount + count
-                }
+                val currentCount = counts.getOrPut(project.brand) { 0 }
+                counts[project.brand] = currentCount + count
         }
 
         brands.forEach { brand ->
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt
index 4955f34984..321a450025 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/ProjectPaymentOptionsView.kt
@@ -125,7 +125,7 @@ open class ProjectPaymentOptionsView @JvmOverloads constructor(
                         dialogFragment.arguments = args
                         dialogFragment.show(activity.supportFragmentManager, null)
                     } else {
-                        throw RuntimeException("Host activity needs to be a FragmentActivity")
+                        throw RuntimeException("Host activity must be a FragmentActivity")
                     }
                 }
             }
diff --git a/ui/src/main/res/layout/snabble_payment_options.xml b/ui/src/main/res/layout/snabble_payment_options.xml
index 4e2d1c2c16..1096ae44cd 100644
--- a/ui/src/main/res/layout/snabble_payment_options.xml
+++ b/ui/src/main/res/layout/snabble_payment_options.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" android:layout_height="match_parent">
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</FrameLayout>
\ No newline at end of file
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/recycler_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/ui/src/main/res/layout/snabble_select_payment_project.xml b/ui/src/main/res/layout/snabble_select_payment_project.xml
index 4e2d1c2c16..1096ae44cd 100644
--- a/ui/src/main/res/layout/snabble_select_payment_project.xml
+++ b/ui/src/main/res/layout/snabble_select_payment_project.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" android:layout_height="match_parent">
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</FrameLayout>
\ No newline at end of file
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/recycler_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
\ No newline at end of file