From 21d129779c3ac4a26de73daf9caafb2d37dd51cf Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Tue, 10 Sep 2024 11:56:39 +0200
Subject: [PATCH 01/31] fix bug in PurchasesRepository

---
 .../purchase/repository/PurchasesRepository.kt       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/purchase/repository/PurchasesRepository.kt b/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/purchase/repository/PurchasesRepository.kt
index 80f2a228f7..a0418e2717 100644
--- a/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/purchase/repository/PurchasesRepository.kt
+++ b/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/purchase/repository/PurchasesRepository.kt
@@ -41,8 +41,12 @@ internal class PurchasesRepositoryImpl(
         }
     }
 
-    private fun Array<ReceiptInfo>.mapToPurchases(count: Int): List<Purchase> =
-        this.filter { it.pdfUrl != null }
-            .slice(0 until size.coerceAtMost(count))
-            .map { it.toPurchase(timeFormatter) }
+    private fun Array<ReceiptInfo>.mapToPurchases(count: Int): List<Purchase> {
+        val receipts = filter { it.pdfUrl != null }
+        return when {
+            receipts.isEmpty() -> emptyList()
+            else -> receipts.slice(0 until size.coerceAtMost(count))
+                .map { it.toPurchase(timeFormatter) }
+        }
+    }
 }

From e0588c37701c694be8cddc9824e93c8bc726646d Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Tue, 10 Sep 2024 11:59:59 +0200
Subject: [PATCH 02/31] replace old primary button with new on to keep colors
 for states like disables, hovered, etc.

---
 .../ui/remotetheme/SnabblePrimaryButton.kt    | 99 ++++++++++++++++---
 .../res/layout/snabble_primary_button.xml     | 11 +++
 2 files changed, 97 insertions(+), 13 deletions(-)
 create mode 100644 ui/src/main/res/layout/snabble_primary_button.xml

diff --git a/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt b/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
index 22db2379ff..b7ca80cd51 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
@@ -2,27 +2,100 @@ package io.snabble.sdk.ui.remotetheme
 
 import android.content.Context
 import android.util.AttributeSet
-import com.google.android.material.button.MaterialButton
-import io.snabble.sdk.Snabble
+import android.util.DisplayMetrics
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import androidx.annotation.StringRes
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Text
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import io.snabble.sdk.extensions.xx
 import io.snabble.sdk.ui.R
+import io.snabble.sdk.ui.utils.ThemeWrapper
+import kotlinx.coroutines.flow.MutableStateFlow
 
-/**
- * A default Materialbutton which automatically sets the remote theme colors of the
- * current checked in project.
- */
 class SnabblePrimaryButton @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
-    defStyleAttr: Int = R.attr.materialButtonStyle,
-) : MaterialButton(context, attrs, defStyleAttr) {
+    defStyleAttr: Int = 0,
+) : LinearLayout(context, attrs, defStyleAttr) {
+
+    private var isButtonEnabled = MutableStateFlow(isEnabled)
+    private var textRes: MutableStateFlow<String> = MutableStateFlow(getDefaultString(attrs))
+    private var setHeight: MutableStateFlow<Dp?> = MutableStateFlow(null)
 
     init {
-        setProjectAppTheme()
+        init()
+    }
+
+    private fun init() {
+        inflate(context, R.layout.snabble_primary_button, this).apply {
+
+            findViewById<ComposeView>(R.id.button_container).setContent {
+                ThemeWrapper {
+                    val isEnable = isButtonEnabled.collectAsStateWithLifecycle().value
+                    val text = textRes.collectAsStateWithLifecycle().value
+                    val height = setHeight.collectAsStateWithLifecycle().value
+
+                    Button(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(height ?: ButtonDefaults.MinHeight),
+                        onClick = { callOnClick() },
+                        enabled = isEnable
+                    ) {
+                        Text(text = text)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun getDefaultString(attrs: AttributeSet?): String {
+        context.theme.obtainStyledAttributes(attrs, intArrayOf(android.R.attr.text), 0, 0)
+            .apply {
+                try {
+                    return getString(0) ?: ""
+                } finally {
+                    recycle()
+                }
+            }
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        if (layoutParams.height != ViewGroup.LayoutParams.WRAP_CONTENT) {
+            setHeight.value = pxToDp(context, layoutParams.height).dp.xx()
+        }
     }
 
-    private fun setProjectAppTheme() {
-        val project = Snabble.checkedInProject.value
-        setBackgroundColor(context.getPrimaryColorForProject(project))
-        setTextColor(context.getOnPrimaryColorForProject(project))
+    fun setText(@StringRes value: Int) {
+        textRes.value = context.getString(value)
+    }
+
+    fun setText(value: String) {
+        textRes.value = value
+    }
+
+    override fun setEnabled(enabled: Boolean) {
+        super.setEnabled(enabled)
+        isButtonEnabled.value = enabled.xx("set it")
+    }
+
+    private fun pxToDp(context: Context, px: Int): Float {
+        val metrics: DisplayMetrics = context.resources.displayMetrics
+        return px / (metrics.densityDpi / BASELINE_DENSITY)
+    }
+
+    companion object {
+
+        private const val BASELINE_DENSITY = 160f
     }
 }
diff --git a/ui/src/main/res/layout/snabble_primary_button.xml b/ui/src/main/res/layout/snabble_primary_button.xml
new file mode 100644
index 0000000000..ae66046141
--- /dev/null
+++ b/ui/src/main/res/layout/snabble_primary_button.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.compose.ui.platform.ComposeView
+        android:id="@+id/button_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>

From 8ace08320bb0664aa7855162a4ad0a097bd87680 Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Tue, 10 Sep 2024 12:42:03 +0200
Subject: [PATCH 03/31] remove logs

---
 .../io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt b/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
index b7ca80cd51..069b7bdc04 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
@@ -16,7 +16,6 @@ import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import io.snabble.sdk.extensions.xx
 import io.snabble.sdk.ui.R
 import io.snabble.sdk.ui.utils.ThemeWrapper
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -72,7 +71,7 @@ class SnabblePrimaryButton @JvmOverloads constructor(
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         if (layoutParams.height != ViewGroup.LayoutParams.WRAP_CONTENT) {
-            setHeight.value = pxToDp(context, layoutParams.height).dp.xx()
+            setHeight.value = pxToDp(context, layoutParams.height).dp
         }
     }
 
@@ -86,7 +85,7 @@ class SnabblePrimaryButton @JvmOverloads constructor(
 
     override fun setEnabled(enabled: Boolean) {
         super.setEnabled(enabled)
-        isButtonEnabled.value = enabled.xx("set it")
+        isButtonEnabled.value = enabled
     }
 
     private fun pxToDp(context: Context, px: Int): Float {

From 545279885a423bc2782ac92fda7254da7bc9d03e Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Tue, 10 Sep 2024 12:43:26 +0200
Subject: [PATCH 04/31] remove obsolete styles

---
 ui/src/main/res/layout/snabble_view_checkout_bar.xml | 1 -
 ui/src/main/res/values/styles.xml                    | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ui/src/main/res/layout/snabble_view_checkout_bar.xml b/ui/src/main/res/layout/snabble_view_checkout_bar.xml
index 0c77119f00..a92da7962b 100644
--- a/ui/src/main/res/layout/snabble_view_checkout_bar.xml
+++ b/ui/src/main/res/layout/snabble_view_checkout_bar.xml
@@ -93,7 +93,6 @@
             </FrameLayout>
 
             <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
-                style="@style/Snabble.Widget.MaterialComponents.Button"
                 android:id="@+id/pay"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
diff --git a/ui/src/main/res/values/styles.xml b/ui/src/main/res/values/styles.xml
index df1aaf1575..e7386ff94c 100644
--- a/ui/src/main/res/values/styles.xml
+++ b/ui/src/main/res/values/styles.xml
@@ -37,13 +37,13 @@
 
     <style name="Snabble.CouponDetail" />
 
-    <style name="Snabble.CouponDetail.ActivateButtonStyle" parent="Widget.Material3.Button">
+    <style name="Snabble.CouponDetail.ActivateButtonStyle">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">32dp</item>
         <item name="android:layout_marginBottom">32dp</item>
-        <item name="android:layout_marginLeft">16dp</item>
-        <item name="android:layout_marginRight">16dp</item>
+        <item name="android:layout_marginLeft">24dp</item>
+        <item name="android:layout_marginRight">24dp</item>
         <item name="android:text">@string/Snabble.Coupon.activate</item>
     </style>
 

From 773a2aa6b00a92315a7c5d33414cc29d259b90dd Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Tue, 10 Sep 2024 12:45:05 +0200
Subject: [PATCH 05/31] change to cast to primary button

---
 ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt     | 6 +++---
 .../java/io/snabble/sdk/ui/coupon/CouponDetailFragment.kt  | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt b/ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt
index b4b74c97d9..3d0f4b82e2 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt
@@ -11,7 +11,6 @@ import android.util.AttributeSet
 import android.view.KeyEvent
 import android.view.View
 import android.widget.ArrayAdapter
-import android.widget.Button
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -23,7 +22,6 @@ import androidx.fragment.app.FragmentActivity
 import io.snabble.accessibility.accessibility
 import io.snabble.sdk.PaymentMethod
 import io.snabble.sdk.Project
-import io.snabble.sdk.shoppingcart.ShoppingCart
 import io.snabble.sdk.Snabble
 import io.snabble.sdk.Snabble.instance
 import io.snabble.sdk.checkout.Checkout
@@ -31,6 +29,7 @@ import io.snabble.sdk.checkout.CheckoutState
 import io.snabble.sdk.config.ExternalBillingSubjectLength
 import io.snabble.sdk.config.ProjectId
 import io.snabble.sdk.extensions.getApplicationInfoCompat
+import io.snabble.sdk.shoppingcart.ShoppingCart
 import io.snabble.sdk.shoppingcart.data.Taxation
 import io.snabble.sdk.shoppingcart.data.listener.SimpleShoppingCartListener
 import io.snabble.sdk.ui.Keyguard
@@ -41,6 +40,7 @@ import io.snabble.sdk.ui.payment.PaymentInputViewHelper
 import io.snabble.sdk.ui.payment.SEPALegalInfoHelper
 import io.snabble.sdk.ui.payment.SelectPaymentMethodFragment
 import io.snabble.sdk.ui.payment.externalbilling.ui.widgets.SubjectAlertDialog
+import io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
 import io.snabble.sdk.ui.telemetry.Telemetry
 import io.snabble.sdk.ui.utils.DelayedProgressDialog
 import io.snabble.sdk.ui.utils.I18nUtils
@@ -63,7 +63,7 @@ open class CheckoutBar @JvmOverloads constructor(
 
     private val paymentSelectorButton = findViewById<View>(R.id.payment_selector_button)
     private val paymentSelectorButtonBig = findViewById<View>(R.id.payment_selector_button_big)
-    private val payButton = findViewById<Button>(R.id.pay)
+    private val payButton = findViewById<SnabblePrimaryButton>(R.id.pay)
     private val priceSum = findViewById<TextView>(R.id.price_sum)
     private val sumContainer = findViewById<View>(R.id.sum_container)
     private val googlePayButtonLayout = findViewById<View>(R.id.google_pay_button_layout)
diff --git a/ui/src/main/java/io/snabble/sdk/ui/coupon/CouponDetailFragment.kt b/ui/src/main/java/io/snabble/sdk/ui/coupon/CouponDetailFragment.kt
index dc2bffd3dc..038efebe9e 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/coupon/CouponDetailFragment.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/coupon/CouponDetailFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.fragment.app.Fragment
@@ -12,6 +11,7 @@ import io.snabble.sdk.Snabble
 import io.snabble.sdk.coupons.Coupon
 import io.snabble.sdk.coupons.CouponType
 import io.snabble.sdk.ui.R
+import io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
 import io.snabble.sdk.ui.utils.loadImage
 import io.snabble.sdk.ui.utils.parcelableExtra
 import io.snabble.sdk.ui.utils.setTextOrHide
@@ -46,8 +46,8 @@ open class CouponDetailFragment : Fragment() {
     private lateinit var description: TextView
     private lateinit var discount: TextView
     private lateinit var expire: TextView
-    private lateinit var activateCoupon: Button
-    private lateinit var appliedCoupon: Button
+    private lateinit var activateCoupon: SnabblePrimaryButton
+    private lateinit var appliedCoupon: SnabblePrimaryButton
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -110,7 +110,6 @@ open class CouponDetailFragment : Fragment() {
             item.coupon?.let {
                 removeCoupon(it)
             }
-
         }
     }
 

From 491fa079d6f5aed82b498dfb042122f9ca9c8c7b Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Tue, 10 Sep 2024 12:49:13 +0200
Subject: [PATCH 06/31] change to cast to primary button

---
 .../sdk/ui/scanner/DefaultProductConfirmationDialog.kt        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/scanner/DefaultProductConfirmationDialog.kt b/ui/src/main/java/io/snabble/sdk/ui/scanner/DefaultProductConfirmationDialog.kt
index 05eb4f0461..cbc03799aa 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/scanner/DefaultProductConfirmationDialog.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/scanner/DefaultProductConfirmationDialog.kt
@@ -15,7 +15,6 @@ import android.view.animation.TranslateAnimation
 import android.view.animation.CycleInterpolator
 import android.view.inputmethod.InputMethodManager
 import android.widget.Button
-import androidx.appcompat.widget.AppCompatButton
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentActivity
@@ -24,6 +23,7 @@ import com.google.android.material.textfield.TextInputLayout
 import io.snabble.accessibility.accessibility
 import io.snabble.sdk.*
 import io.snabble.sdk.shoppingcart.ShoppingCart
+import io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
 import io.snabble.sdk.ui.utils.*
 import io.snabble.sdk.utils.Dispatch
 import java.lang.NumberFormatException
@@ -39,7 +39,7 @@ class DefaultProductConfirmationDialog : DialogFragment(), ProductConfirmationDi
     private lateinit var price: TextView
     private lateinit var originalPrice: TextView
     private lateinit var depositPrice: TextView
-    private lateinit var addToCart: AppCompatButton
+    private lateinit var addToCart: SnabblePrimaryButton
     private lateinit var plusLayout: View
     private lateinit var minusLayout: View
     private lateinit var enterReducedPrice: Button

From d2a73eb006016de8cbf2d463cd00dce5659131ab Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Tue, 10 Sep 2024 12:53:45 +0200
Subject: [PATCH 07/31] adjust floating action buttons and deletion dialog

---
 .../payment/PaymentCredentialsListView.java   | 44 ++++++++++++++++---
 1 file changed, 37 insertions(+), 7 deletions(-)

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 b3febd614a..69b700354a 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
@@ -6,6 +6,7 @@
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.os.Bundle;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
@@ -21,6 +22,8 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -30,6 +33,7 @@
 import io.snabble.sdk.payment.PaymentCredentials;
 import io.snabble.sdk.payment.PaymentCredentialsStore;
 import io.snabble.sdk.ui.R;
+import io.snabble.sdk.ui.remotetheme.RemoteThemingExtensionsKt;
 import io.snabble.sdk.ui.telemetry.Telemetry;
 import io.snabble.sdk.ui.utils.KeyguardUtils;
 import io.snabble.sdk.ui.utils.OneShotClickListener;
@@ -74,7 +78,13 @@ private void inflateView() {
         recyclerView.setLayoutManager(layoutManager);
         recyclerView.setItemAnimator(null);
 
-        View fab = findViewById(R.id.fab);
+        FloatingActionButton fab = findViewById(R.id.fab);
+        final Project currentProject = Snabble.getInstance().getCheckedInProject().getLatestValue();
+        final int secondaryColor = RemoteThemingExtensionsKt.getSecondaryColorForProject(getContext(), currentProject);
+        final int onSecondaryColor = RemoteThemingExtensionsKt.getOnSecondaryColorForProject(getContext(), currentProject);
+        fab.setBackgroundTintList(ColorStateList.valueOf(secondaryColor));
+        fab.setImageTintList(ColorStateList.valueOf(onSecondaryColor));
+
         fab.setOnClickListener(new OneShotClickListener() {
             @Override
             public void click() {
@@ -100,11 +110,20 @@ public void click() {
                         throw new RuntimeException("Host activity must be a Fragment Activity");
                     }
                 } else {
-                    new AlertDialog.Builder(getContext())
+
+                    final int primaryColor = RemoteThemingExtensionsKt.getPrimaryColorForProject(getContext(), currentProject);
+
+                    final AlertDialog alertDialog = new AlertDialog.Builder(getContext())
                             .setMessage(R.string.Snabble_Keyguard_requireScreenLock)
                             .setPositiveButton(R.string.Snabble_ok, null)
                             .setCancelable(false)
-                            .show();
+                            .create();
+
+                    alertDialog.setOnShowListener(dialog -> {
+                        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(primaryColor);
+                    });
+
+                    alertDialog.show();
                 }
             }
         });
@@ -204,7 +223,7 @@ public void onChanged() {
                         entries.add(new Entry(pm, R.drawable.snabble_ic_payment_select_tegut, pm.getObfuscatedId()));
                         break;
                     case EXTERNAL_BILLING:
-                        entries.add(new Entry(pm,R.drawable.ic_snabble_external_billing,pm.getObfuscatedId()));
+                        entries.add(new Entry(pm, R.drawable.ic_snabble_external_billing, pm.getObfuscatedId()));
                         break;
                 }
             }
@@ -283,12 +302,23 @@ public void onBindViewHolder(@NonNull final EntryViewHolder vh, final int positi
 
             if (e.paymentCredentials != null) {
                 vh.delete.setOnClickListener(view -> {
-                    new AlertDialog.Builder(getContext())
+                    final int primaryColor = RemoteThemingExtensionsKt.getPrimaryColorForProject(
+                            getContext(),
+                            Snabble.getInstance().getCheckedInProject().getLatestValue()
+                    );
+
+                    final AlertDialog alertDialog = new AlertDialog.Builder(getContext())
                             .setMessage(R.string.Snabble_Payment_Delete_message)
                             .setPositiveButton(R.string.Snabble_yes, (dialog, which) -> paymentCredentialsStore.remove(e.paymentCredentials))
                             .setNegativeButton(R.string.Snabble_no, null)
-                            .create()
-                            .show();
+                            .create();
+
+                    alertDialog.setOnShowListener(dialog -> {
+                        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(primaryColor);
+                        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(primaryColor);
+                    });
+
+                    alertDialog.show();
 
                     Telemetry.event(Telemetry.Event.PaymentMethodDeleted, e.paymentCredentials.getType());
                 });

From bd76f9be73366ccbbac5890edefec9864be17234 Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Tue, 10 Sep 2024 12:54:03 +0200
Subject: [PATCH 08/31] change to cast to primary button

---
 .../main/java/io/snabble/sdk/ui/scanner/SelfScanningView.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningView.java b/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningView.java
index 338a1f0781..95d502d7a5 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningView.java
@@ -47,6 +47,7 @@
 import io.snabble.sdk.ui.SnabbleUI;
 import io.snabble.sdk.ui.checkout.ViolationNotificationUtils;
 import io.snabble.sdk.ui.remotetheme.RemoteThemingExtensionsKt;
+import io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton;
 import io.snabble.sdk.ui.telemetry.Telemetry;
 import io.snabble.sdk.ui.utils.DelayedProgressDialog;
 import io.snabble.sdk.ui.utils.I18nUtils;
@@ -62,7 +63,7 @@ public class SelfScanningView extends FrameLayout {
     private BarcodeScannerView barcodeScanner;
     private ProductDatabase productDatabase;
     private boolean isInitialized;
-    private Button goToCart;
+    private SnabblePrimaryButton goToCart;
     private View noPermission;
     private boolean isRunning;
 

From c45e879fe7120f8c1328135ddd0f2ca428dbc54e Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Tue, 10 Sep 2024 13:44:20 +0200
Subject: [PATCH 09/31] revert external billing subject dialog changes since it
 is not needed

---
 ui/src/main/res/layout/snabble_subject_alert_dialog.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/main/res/layout/snabble_subject_alert_dialog.xml b/ui/src/main/res/layout/snabble_subject_alert_dialog.xml
index 1a1ff5bbd5..d42bdbc833 100644
--- a/ui/src/main/res/layout/snabble_subject_alert_dialog.xml
+++ b/ui/src/main/res/layout/snabble_subject_alert_dialog.xml
@@ -43,7 +43,7 @@
         android:layout_width="match_parent"
         android:layout_height="24dp" />
 
-    <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/subject_add"
         style="@style/Snabble.ShapeAppearanceOverlay.RoundedCorners.Big"
         android:layout_width="match_parent"
@@ -55,7 +55,7 @@
         android:layout_width="match_parent"
         android:layout_height="4dp" />
 
-    <io.snabble.sdk.ui.remotetheme.SnabbleSecondaryButton
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/subject_skip"
         style="@style/Snabble.Widget.MaterialComponents.Button.TextButton"
         android:layout_width="match_parent"

From 5684ab1a5564c73b825b78c93c4239292c9e396f Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Tue, 10 Sep 2024 13:48:28 +0200
Subject: [PATCH 10/31] change to cast to primary button

---
 .../io/snabble/sdk/ui/payment/AgeVerificationInputView.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/AgeVerificationInputView.java b/ui/src/main/java/io/snabble/sdk/ui/payment/AgeVerificationInputView.java
index afde1fb9ab..76d71db68a 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/AgeVerificationInputView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/AgeVerificationInputView.java
@@ -26,6 +26,7 @@
 import io.snabble.sdk.Users;
 import io.snabble.sdk.ui.R;
 import io.snabble.sdk.ui.SnabbleUI;
+import io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton;
 import io.snabble.sdk.ui.utils.DelayedProgressDialog;
 
 public class AgeVerificationInputView extends FrameLayout {
@@ -79,7 +80,7 @@ public void inflateView() {
                     return false;
                 });
 
-        Button save = findViewById(R.id.save);
+        SnabblePrimaryButton save = findViewById(R.id.save);
         save.setOnClickListener(view -> handleInput());
     }
 

From 27eb0646854953e620818bcd6a2fbb3c58f1d338 Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Tue, 10 Sep 2024 13:53:52 +0200
Subject: [PATCH 11/31] change to cast to primary button

---
 .../snabble/sdk/ui/checkout/CheckoutCustomerCardView.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutCustomerCardView.java b/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutCustomerCardView.java
index 026cd2c450..1834bfdbaa 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutCustomerCardView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutCustomerCardView.java
@@ -5,6 +5,7 @@
 import android.graphics.Bitmap;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -17,6 +18,7 @@
 import io.snabble.sdk.Snabble;
 import io.snabble.sdk.codes.EAN13;
 import io.snabble.sdk.ui.R;
+import io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton;
 import io.snabble.sdk.ui.scanner.BarcodeView;
 import io.snabble.sdk.ui.telemetry.Telemetry;
 import io.snabble.sdk.ui.utils.I18nUtils;
@@ -56,7 +58,7 @@ private void init() {
     }
 
     private void update() {
-        Button paidButton = findViewById(R.id.paid);
+        SnabblePrimaryButton paidButton = findViewById(R.id.paid);
         paidButton.setOnClickListener(new OneShotClickListener() {
             @Override
             public void click() {
@@ -117,4 +119,4 @@ public void setHelperImage(Bitmap bitmap) {
             helperText.setVisibility(View.VISIBLE);
         }
     }
-}
\ No newline at end of file
+}

From 8afad11f2cd6db03fa834b1f5dbe1f645a2648ff Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Tue, 10 Sep 2024 13:57:27 +0200
Subject: [PATCH 12/31] roll back to use default button

---
 .../io/snabble/sdk/ui/checkout/CheckoutCustomerCardView.java  | 4 +---
 ui/src/main/res/layout/snabble_view_checkout_customercard.xml | 2 +-
 ui/src/main/res/layout/snabble_view_checkout_offline.xml      | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutCustomerCardView.java b/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutCustomerCardView.java
index 1834bfdbaa..2164431250 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutCustomerCardView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutCustomerCardView.java
@@ -5,7 +5,6 @@
 import android.graphics.Bitmap;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -18,7 +17,6 @@
 import io.snabble.sdk.Snabble;
 import io.snabble.sdk.codes.EAN13;
 import io.snabble.sdk.ui.R;
-import io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton;
 import io.snabble.sdk.ui.scanner.BarcodeView;
 import io.snabble.sdk.ui.telemetry.Telemetry;
 import io.snabble.sdk.ui.utils.I18nUtils;
@@ -58,7 +56,7 @@ private void init() {
     }
 
     private void update() {
-        SnabblePrimaryButton paidButton = findViewById(R.id.paid);
+        Button paidButton = findViewById(R.id.paid);
         paidButton.setOnClickListener(new OneShotClickListener() {
             @Override
             public void click() {
diff --git a/ui/src/main/res/layout/snabble_view_checkout_customercard.xml b/ui/src/main/res/layout/snabble_view_checkout_customercard.xml
index fd1039d602..06041ba904 100644
--- a/ui/src/main/res/layout/snabble_view_checkout_customercard.xml
+++ b/ui/src/main/res/layout/snabble_view_checkout_customercard.xml
@@ -52,7 +52,7 @@
                 android:format="EAN_13"/>
         </LinearLayout>
     </FrameLayout>
-    <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/paid"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/ui/src/main/res/layout/snabble_view_checkout_offline.xml b/ui/src/main/res/layout/snabble_view_checkout_offline.xml
index 5d23af207e..94b31573c8 100644
--- a/ui/src/main/res/layout/snabble_view_checkout_offline.xml
+++ b/ui/src/main/res/layout/snabble_view_checkout_offline.xml
@@ -82,7 +82,7 @@
         android:layout_marginTop="4dp"
         android:layout_above="@+id/paid"/>
 
-    <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/paid"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

From 1b0a8fc4577d7ec24635777ec2287f6e3b894d7b Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Tue, 10 Sep 2024 13:59:59 +0200
Subject: [PATCH 13/31] change to cast to snabble primary button

---
 .../java/io/snabble/sdk/ui/checkout/PaymentStatusView.kt | 9 +++++----
 ui/src/main/res/layout/snabble_view_payment_status.xml   | 2 --
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/checkout/PaymentStatusView.kt b/ui/src/main/java/io/snabble/sdk/ui/checkout/PaymentStatusView.kt
index d2524b2b98..7c4d05100b 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/checkout/PaymentStatusView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/checkout/PaymentStatusView.kt
@@ -42,6 +42,7 @@ import io.snabble.sdk.ui.checkout.PaymentOriginCandidateHelper.PaymentOriginCand
 import io.snabble.sdk.ui.checkout.PaymentOriginCandidateHelper.PaymentOriginCandidateAvailableListener
 import io.snabble.sdk.ui.payment.SEPACardInputActivity
 import io.snabble.sdk.ui.payment.payone.sepa.form.PayoneSepaActivity
+import io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
 import io.snabble.sdk.ui.scanner.BarcodeView
 import io.snabble.sdk.ui.telemetry.Telemetry
 import io.snabble.sdk.ui.utils.executeUiAction
@@ -60,9 +61,9 @@ class PaymentStatusView @JvmOverloads constructor(
     }
 
     private val image = findViewById<ImageView>(R.id.image)
-    private val back = findViewById<MaterialButton>(R.id.back)
+    private val back = findViewById<SnabblePrimaryButton>(R.id.back)
     private var selectedRating = ""
-    private val sendFeedback: View? = findViewById(R.id.send_feedback)
+    private val sendFeedback: SnabblePrimaryButton? = findViewById(R.id.send_feedback)
     private val successAnimation: LottieAnimationView = findViewById(R.id.success_animation)
     private val inputBadRatingLayout = findViewById<TextInputLayout>(R.id.input_bad_rating_layout)
     private var addIbanLayout = findViewById<LinearLayout>(R.id.add_iban_layout)
@@ -124,7 +125,7 @@ class PaymentStatusView @JvmOverloads constructor(
         paymentOriginCandidateHelper = PaymentOriginCandidateHelper(project)
         paymentOriginCandidateHelper.addPaymentOriginCandidateAvailableListener(this)
 
-        back.text = resources.getString(R.string.Snabble_cancel)
+        back.setText(R.string.Snabble_cancel)
         back.setOnClickListener {
             val state = lastState
 
@@ -267,7 +268,7 @@ class PaymentStatusView @JvmOverloads constructor(
                 } else {
                     receipt.state = PaymentStatusItemView.State.NOT_EXECUTED
                 }
-                back.text = resources.getString(R.string.Snabble_PaymentStatus_close)
+                back.setText(R.string.Snabble_PaymentStatus_close)
                 backPressedCallback.isEnabled = false
                 ratingCardLayout.isVisible = true
                 paymentOriginCandidateHelper.startPollingIfLinkIsAvailable(checkout?.checkoutProcess)
diff --git a/ui/src/main/res/layout/snabble_view_payment_status.xml b/ui/src/main/res/layout/snabble_view_payment_status.xml
index c03ea7b828..48ec330e27 100644
--- a/ui/src/main/res/layout/snabble_view_payment_status.xml
+++ b/ui/src/main/res/layout/snabble_view_payment_status.xml
@@ -286,7 +286,6 @@
 
                 <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
                     android:id="@+id/send_feedback"
-                    style="@style/Widget.Material3.Button"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
@@ -326,7 +325,6 @@
 
         <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
             android:id="@+id/back"
-            style="@style/Widget.Material3.Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"

From 3b99acdb8b7482b79a6d6cc2d50b8110ae70dc11 Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Wed, 11 Sep 2024 07:45:51 +0200
Subject: [PATCH 14/31] change to cast to snabble primary button

---
 .../io/snabble/sdk/ui/scanner/SelfScanningFragment.kt    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningFragment.kt b/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningFragment.kt
index a158632cb3..52baaa6b9a 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningFragment.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningFragment.kt
@@ -33,6 +33,7 @@ import io.snabble.sdk.codes.ScannedCode
 import io.snabble.sdk.ui.AccessibilityPreferences
 import io.snabble.sdk.ui.BaseFragment
 import io.snabble.sdk.ui.R
+import io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
 import io.snabble.sdk.ui.search.SearchHelper
 import io.snabble.sdk.ui.utils.setOneShotClickListener
 import io.snabble.sdk.utils.Dispatch
@@ -43,7 +44,7 @@ open class SelfScanningFragment : BaseFragment(), MenuProvider {
     var selfScanningView: SelfScanningView? = null
     protected lateinit var rootView: ViewGroup
     private lateinit var permissionContainer: View
-    private lateinit var askForPermission: Button
+    private lateinit var askForPermission: SnabblePrimaryButton
     private var canAskAgain = false
     private var isStart = false
     var allowShowingHints = false
@@ -80,7 +81,7 @@ open class SelfScanningFragment : BaseFragment(), MenuProvider {
         rootView = view as ViewGroup
         selfScanningView = null
         permissionContainer = rootView.findViewById(R.id.permission_denied_container)
-        askForPermission = rootView.findViewById(R.id.open_settings)
+        askForPermission = view.findViewById(R.id.open_settings)
 
         if (isPermissionGranted) {
             createSelfScanningView()
@@ -170,12 +171,12 @@ open class SelfScanningFragment : BaseFragment(), MenuProvider {
     private fun showPermissionRationale() {
         permissionContainer.visibility = View.VISIBLE
         if (canAskAgain) {
-            askForPermission.text = getString(R.string.Snabble_askForPermission)
+            askForPermission.setText(R.string.Snabble_askForPermission)
             askForPermission.setOneShotClickListener {
                 activityResultLauncher.launch(Manifest.permission.CAMERA)
             }
         } else {
-            askForPermission.text = getString(R.string.Snabble_goToSettings)
+            askForPermission.setText(R.string.Snabble_goToSettings)
             askForPermission.setOneShotClickListener {
                 goToSettings()
             }

From 241ec1f3c4865be8ba7565f40258c34e57845a0e Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Wed, 11 Sep 2024 07:46:33 +0200
Subject: [PATCH 15/31] set dispose strategy

---
 .../ui/remotetheme/SnabblePrimaryButton.kt    | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt b/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
index 069b7bdc04..650ff02b29 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
@@ -13,6 +13,7 @@ import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Text
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -36,21 +37,24 @@ class SnabblePrimaryButton @JvmOverloads constructor(
 
     private fun init() {
         inflate(context, R.layout.snabble_primary_button, this).apply {
+            val container = findViewById<ComposeView>(R.id.button_container)
+            container.apply {
+                setViewCompositionStrategy(DisposeOnViewTreeLifecycleDestroyed)
+                setContent {
+                    ThemeWrapper {
+                        val isEnable = isButtonEnabled.collectAsStateWithLifecycle().value
+                        val text = textRes.collectAsStateWithLifecycle().value
+                        val height = setHeight.collectAsStateWithLifecycle().value
 
-            findViewById<ComposeView>(R.id.button_container).setContent {
-                ThemeWrapper {
-                    val isEnable = isButtonEnabled.collectAsStateWithLifecycle().value
-                    val text = textRes.collectAsStateWithLifecycle().value
-                    val height = setHeight.collectAsStateWithLifecycle().value
-
-                    Button(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(height ?: ButtonDefaults.MinHeight),
-                        onClick = { callOnClick() },
-                        enabled = isEnable
-                    ) {
-                        Text(text = text)
+                        Button(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .height(height ?: ButtonDefaults.MinHeight),
+                            onClick = { callOnClick() },
+                            enabled = isEnable
+                        ) {
+                            Text(text = text)
+                        }
                     }
                 }
             }

From 6201731d710289f7f764b5d851e4965bbe63d5d3 Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Wed, 11 Sep 2024 08:05:48 +0200
Subject: [PATCH 16/31] switch to use primary color

---
 .../io/snabble/sdk/ui/payment/PaymentCredentialsListView.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 69b700354a..ee907bcd71 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
@@ -80,8 +80,8 @@ private void inflateView() {
 
         FloatingActionButton fab = findViewById(R.id.fab);
         final Project currentProject = Snabble.getInstance().getCheckedInProject().getLatestValue();
-        final int secondaryColor = RemoteThemingExtensionsKt.getSecondaryColorForProject(getContext(), currentProject);
-        final int onSecondaryColor = RemoteThemingExtensionsKt.getOnSecondaryColorForProject(getContext(), currentProject);
+        final int secondaryColor = RemoteThemingExtensionsKt.getPrimaryColorForProject(getContext(), currentProject);
+        final int onSecondaryColor = RemoteThemingExtensionsKt.getOnPrimaryColorForProject(getContext(), currentProject);
         fab.setBackgroundTintList(ColorStateList.valueOf(secondaryColor));
         fab.setImageTintList(ColorStateList.valueOf(onSecondaryColor));
 

From da165958a9e36cbf5fb08907382bb405a8e7e413 Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Wed, 11 Sep 2024 08:34:28 +0200
Subject: [PATCH 17/31] rename

---
 .../sdk/ui/payment/PaymentCredentialsListView.java        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 ee907bcd71..440b2ae1e1 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
@@ -80,10 +80,10 @@ private void inflateView() {
 
         FloatingActionButton fab = findViewById(R.id.fab);
         final Project currentProject = Snabble.getInstance().getCheckedInProject().getLatestValue();
-        final int secondaryColor = RemoteThemingExtensionsKt.getPrimaryColorForProject(getContext(), currentProject);
-        final int onSecondaryColor = RemoteThemingExtensionsKt.getOnPrimaryColorForProject(getContext(), currentProject);
-        fab.setBackgroundTintList(ColorStateList.valueOf(secondaryColor));
-        fab.setImageTintList(ColorStateList.valueOf(onSecondaryColor));
+        final int primaryColor = RemoteThemingExtensionsKt.getPrimaryColorForProject(getContext(), currentProject);
+        final int onPrimaryColor = RemoteThemingExtensionsKt.getOnPrimaryColorForProject(getContext(), currentProject);
+        fab.setBackgroundTintList(ColorStateList.valueOf(primaryColor));
+        fab.setImageTintList(ColorStateList.valueOf(onPrimaryColor));
 
         fab.setOnClickListener(new OneShotClickListener() {
             @Override

From 3609ff09a33666ca3c135c1c2ea9b1297af19ead Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Wed, 11 Sep 2024 08:36:13 +0200
Subject: [PATCH 18/31] remove obsolete declaration

---
 .../io/snabble/sdk/ui/payment/PaymentCredentialsListView.java   | 2 --
 1 file changed, 2 deletions(-)

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 440b2ae1e1..f3db18fb0d 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
@@ -111,8 +111,6 @@ public void click() {
                     }
                 } else {
 
-                    final int primaryColor = RemoteThemingExtensionsKt.getPrimaryColorForProject(getContext(), currentProject);
-
                     final AlertDialog alertDialog = new AlertDialog.Builder(getContext())
                             .setMessage(R.string.Snabble_Keyguard_requireScreenLock)
                             .setPositiveButton(R.string.Snabble_ok, null)

From 65e0d1df7708c5f43c4fb1702e9c3a1e3e02416d Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Wed, 11 Sep 2024 09:41:25 +0200
Subject: [PATCH 19/31] override onclickListener to ensure that it is actually
 called

---
 .../snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt b/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
index 650ff02b29..a1dc954592 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
@@ -17,6 +17,7 @@ import androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnViewTreeLif
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import io.snabble.sdk.extensions.xx
 import io.snabble.sdk.ui.R
 import io.snabble.sdk.ui.utils.ThemeWrapper
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -31,6 +32,8 @@ class SnabblePrimaryButton @JvmOverloads constructor(
     private var textRes: MutableStateFlow<String> = MutableStateFlow(getDefaultString(attrs))
     private var setHeight: MutableStateFlow<Dp?> = MutableStateFlow(null)
 
+    private var clickListener: OnClickListener? = null
+
     init {
         init()
     }
@@ -50,7 +53,7 @@ class SnabblePrimaryButton @JvmOverloads constructor(
                             modifier = Modifier
                                 .fillMaxWidth()
                                 .height(height ?: ButtonDefaults.MinHeight),
-                            onClick = { callOnClick() },
+                            onClick = { clickListener?.onClick(this) },
                             enabled = isEnable
                         ) {
                             Text(text = text)
@@ -61,6 +64,10 @@ class SnabblePrimaryButton @JvmOverloads constructor(
         }
     }
 
+    override fun setOnClickListener(l: OnClickListener?) {
+        clickListener = l
+    }
+
     private fun getDefaultString(attrs: AttributeSet?): String {
         context.theme.obtainStyledAttributes(attrs, intArrayOf(android.R.attr.text), 0, 0)
             .apply {

From 3861398921722fdc5b6187f082c33ffe5f156458 Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Wed, 11 Sep 2024 13:17:07 +0200
Subject: [PATCH 20/31] adjust button to use layout height and fontsize set via
 xml

---
 .../ui/remotetheme/SnabblePrimaryButton.kt    | 67 +++++++++++++++----
 1 file changed, 53 insertions(+), 14 deletions(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt b/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
index a1dc954592..80dce7e67c 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
@@ -1,8 +1,10 @@
 package io.snabble.sdk.ui.remotetheme
 
 import android.content.Context
+import android.os.Build
 import android.util.AttributeSet
 import android.util.DisplayMetrics
+import android.util.TypedValue
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.annotation.StringRes
@@ -15,22 +17,26 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed
 import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import io.snabble.sdk.extensions.xx
 import io.snabble.sdk.ui.R
 import io.snabble.sdk.ui.utils.ThemeWrapper
 import kotlinx.coroutines.flow.MutableStateFlow
 
+
 class SnabblePrimaryButton @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0,
 ) : LinearLayout(context, attrs, defStyleAttr) {
 
-    private var isButtonEnabled = MutableStateFlow(isEnabled)
-    private var textRes: MutableStateFlow<String> = MutableStateFlow(getDefaultString(attrs))
-    private var setHeight: MutableStateFlow<Dp?> = MutableStateFlow(null)
+    private var isButtonEnabled: MutableStateFlow<Boolean> = MutableStateFlow(isEnabled)
+    private var buttonLabel: MutableStateFlow<String> = MutableStateFlow(getDefaultString(attrs))
+    private var buttonHeight: MutableStateFlow<Dp?> = MutableStateFlow(null)
+    private var buttonFontSize: MutableStateFlow<Float?> =
+        MutableStateFlow(getFontSize(attrs)?.let(::pxToSp))
 
     private var clickListener: OnClickListener? = null
 
@@ -40,14 +46,15 @@ class SnabblePrimaryButton @JvmOverloads constructor(
 
     private fun init() {
         inflate(context, R.layout.snabble_primary_button, this).apply {
-            val container = findViewById<ComposeView>(R.id.button_container)
-            container.apply {
+            val container: ComposeView? = findViewById(R.id.button_container)
+            container?.apply {
                 setViewCompositionStrategy(DisposeOnViewTreeLifecycleDestroyed)
                 setContent {
                     ThemeWrapper {
                         val isEnable = isButtonEnabled.collectAsStateWithLifecycle().value
-                        val text = textRes.collectAsStateWithLifecycle().value
-                        val height = setHeight.collectAsStateWithLifecycle().value
+                        val text = buttonLabel.collectAsStateWithLifecycle().value
+                        val height = buttonHeight.collectAsStateWithLifecycle().value
+                        val fontSize = buttonFontSize.collectAsStateWithLifecycle().value
 
                         Button(
                             modifier = Modifier
@@ -56,7 +63,10 @@ class SnabblePrimaryButton @JvmOverloads constructor(
                             onClick = { clickListener?.onClick(this) },
                             enabled = isEnable
                         ) {
-                            Text(text = text)
+                            Text(
+                                text = text,
+                                fontSize = fontSize?.sp ?: TextUnit.Unspecified
+                            )
                         }
                     }
                 }
@@ -79,19 +89,37 @@ class SnabblePrimaryButton @JvmOverloads constructor(
             }
     }
 
+    private fun getFontSize(attrs: AttributeSet?): Float? {
+        context.theme.obtainStyledAttributes(attrs, intArrayOf(android.R.attr.textSize), 0, 0)
+            .apply {
+                return try {
+                    val pixel = getDimensionPixelSize(0, 0).toFloat()
+                    when {
+                        pixel <= 0f -> null
+                        else -> pixel
+                    }
+                } finally {
+                    recycle()
+                }
+            }
+    }
+
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         if (layoutParams.height != ViewGroup.LayoutParams.WRAP_CONTENT) {
-            setHeight.value = pxToDp(context, layoutParams.height).dp
+            val height = layoutParams.height
+            if (height > 0) {
+                buttonHeight.value = pxToDp(height).dp
+            }
         }
     }
 
     fun setText(@StringRes value: Int) {
-        textRes.value = context.getString(value)
+        buttonLabel.value = context.getString(value)
     }
 
     fun setText(value: String) {
-        textRes.value = value
+        buttonLabel.value = value
     }
 
     override fun setEnabled(enabled: Boolean) {
@@ -99,11 +127,22 @@ class SnabblePrimaryButton @JvmOverloads constructor(
         isButtonEnabled.value = enabled
     }
 
-    private fun pxToDp(context: Context, px: Int): Float {
-        val metrics: DisplayMetrics = context.resources.displayMetrics
+    private fun pxToDp(px: Int): Float {
+        val metrics: DisplayMetrics = resources.displayMetrics
         return px / (metrics.densityDpi / BASELINE_DENSITY)
     }
 
+    private fun pxToSp(px: Float): Float {
+        val dm = resources.displayMetrics
+        val scaledDensity = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1f, dm)
+        } else {
+            @Suppress("DEPRECATION")
+            dm.scaledDensity
+        }
+        return px / scaledDensity
+    }
+
     companion object {
 
         private const val BASELINE_DENSITY = 160f

From b1fe2ba265549a3d1fafd1e6ba59a79dff3ad425 Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Wed, 11 Sep 2024 13:56:59 +0200
Subject: [PATCH 21/31] convert to lambda ref

---
 .../java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt b/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
index 80dce7e67c..b854c47431 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabblePrimaryButton.kt
@@ -35,8 +35,7 @@ class SnabblePrimaryButton @JvmOverloads constructor(
     private var isButtonEnabled: MutableStateFlow<Boolean> = MutableStateFlow(isEnabled)
     private var buttonLabel: MutableStateFlow<String> = MutableStateFlow(getDefaultString(attrs))
     private var buttonHeight: MutableStateFlow<Dp?> = MutableStateFlow(null)
-    private var buttonFontSize: MutableStateFlow<Float?> =
-        MutableStateFlow(getFontSize(attrs)?.let(::pxToSp))
+    private var buttonFontSize: MutableStateFlow<Float?> = MutableStateFlow(getFontSize(attrs)?.let(::pxToSp))
 
     private var clickListener: OnClickListener? = null
 

From e902114ec625c3aa007853f7e0795e836aab4b96 Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Wed, 11 Sep 2024 13:57:06 +0200
Subject: [PATCH 22/31] change button style

---
 .../io/snabble/sdk/ui/remotetheme/SnabbleSecondaryButton.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabbleSecondaryButton.kt b/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabbleSecondaryButton.kt
index 408013461d..1cdb2c36b4 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabbleSecondaryButton.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabbleSecondaryButton.kt
@@ -15,7 +15,7 @@ import io.snabble.sdk.ui.R
 class SnabbleSecondaryButton @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
-    defStyleAttr: Int = R.attr.materialButtonStyle,
+    defStyleAttr: Int = R.attr.buttonStyle,
 ) : MaterialButton(context, attrs, defStyleAttr) {
 
     init {

From 41726fad660324a68b17e2eba9882a6b74b930da Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Thu, 12 Sep 2024 08:07:00 +0200
Subject: [PATCH 23/31] WIP: Add style to customize the snabble primary button

---
 ui/src/main/res/layout/snabble_view_checkout_bar.xml | 1 +
 ui/src/main/res/values/styles.xml                    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/ui/src/main/res/layout/snabble_view_checkout_bar.xml b/ui/src/main/res/layout/snabble_view_checkout_bar.xml
index a92da7962b..7b8a31d991 100644
--- a/ui/src/main/res/layout/snabble_view_checkout_bar.xml
+++ b/ui/src/main/res/layout/snabble_view_checkout_bar.xml
@@ -93,6 +93,7 @@
             </FrameLayout>
 
             <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
+                style="@style/Snabble.Primary.Button"
                 android:id="@+id/pay"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
diff --git a/ui/src/main/res/values/styles.xml b/ui/src/main/res/values/styles.xml
index e7386ff94c..0c7d1ed153 100644
--- a/ui/src/main/res/values/styles.xml
+++ b/ui/src/main/res/values/styles.xml
@@ -10,6 +10,8 @@
         <item name="cornerSize">32dp</item>
     </style>
 
+    <style name="Snabble.Primary.Button" parent="" />
+
     <style name="Snabble.Widget.MaterialComponents.Button" parent="Widget.Material3.Button" />
 
     <style name="Snabble.Widget.MaterialComponents.Button.Passive" parent="Snabble.Widget.MaterialComponents.Button">

From 23136a2ae73a9fd1847d98d29c4985f9ceda969e Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Thu, 12 Sep 2024 08:29:04 +0200
Subject: [PATCH 24/31] WIP: add snabble primary button style

---
 .../main/res/layout/snabble_dialog_product_confirmation.xml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/main/res/layout/snabble_dialog_product_confirmation.xml b/ui/src/main/res/layout/snabble_dialog_product_confirmation.xml
index a86e938652..2cb7a31abb 100644
--- a/ui/src/main/res/layout/snabble_dialog_product_confirmation.xml
+++ b/ui/src/main/res/layout/snabble_dialog_product_confirmation.xml
@@ -4,10 +4,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/colorSurface"
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:gravity="center"
-    android:background="?attr/colorSurface"
     android:minWidth="350dp"
     android:orientation="vertical">
 
@@ -167,7 +167,7 @@
 
     <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
         android:id="@+id/addToCart"
-        style="@style/Snabble.Widget.MaterialComponents.Button"
+        style="@style/Snabble.Primary.Button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"

From ed03e812346fe859bdce8643c42950c3399e5c45 Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Thu, 12 Sep 2024 08:37:53 +0200
Subject: [PATCH 25/31] WIP: add snabble primary button style if needed

---
 ui/src/main/res/layout/snabble_fragment_selfscanning.xml | 1 +
 ui/src/main/res/layout/snabble_view_age_verification.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ui/src/main/res/layout/snabble_fragment_selfscanning.xml b/ui/src/main/res/layout/snabble_fragment_selfscanning.xml
index 803004f7b1..7efe0d69eb 100644
--- a/ui/src/main/res/layout/snabble_fragment_selfscanning.xml
+++ b/ui/src/main/res/layout/snabble_fragment_selfscanning.xml
@@ -37,6 +37,7 @@
                 android:text="@string/Snabble.Scanner.Camera.allowAccess"/>
 
             <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
+                style="@style/Snabble.Primary.Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/open_settings"
diff --git a/ui/src/main/res/layout/snabble_view_age_verification.xml b/ui/src/main/res/layout/snabble_view_age_verification.xml
index 7580bf49d6..0eb1d3012c 100644
--- a/ui/src/main/res/layout/snabble_view_age_verification.xml
+++ b/ui/src/main/res/layout/snabble_view_age_verification.xml
@@ -45,6 +45,7 @@
             </com.google.android.material.textfield.TextInputLayout>
 
             <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
+                style="@style/Snabble.Primary.Button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="16dp"

From 9ed2a9325b6eed50a19015847058666f46bd4c3a Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Thu, 12 Sep 2024 08:53:01 +0200
Subject: [PATCH 26/31] WIP: add method to apply project theme

---
 .../io/snabble/sdk/ui/cart/CheckoutBar.kt     | 119 ++++++++++++++----
 1 file changed, 94 insertions(+), 25 deletions(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt b/ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt
index 3d0f4b82e2..86580a229a 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt
@@ -19,6 +19,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
 import androidx.core.view.marginTop
 import androidx.fragment.app.FragmentActivity
+import com.google.android.material.button.MaterialButton
 import io.snabble.accessibility.accessibility
 import io.snabble.sdk.PaymentMethod
 import io.snabble.sdk.Project
@@ -41,6 +42,8 @@ import io.snabble.sdk.ui.payment.SEPALegalInfoHelper
 import io.snabble.sdk.ui.payment.SelectPaymentMethodFragment
 import io.snabble.sdk.ui.payment.externalbilling.ui.widgets.SubjectAlertDialog
 import io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
+import io.snabble.sdk.ui.remotetheme.getOnPrimaryColorForProject
+import io.snabble.sdk.ui.remotetheme.getPrimaryColorForProject
 import io.snabble.sdk.ui.telemetry.Telemetry
 import io.snabble.sdk.ui.utils.DelayedProgressDialog
 import io.snabble.sdk.ui.utils.I18nUtils
@@ -62,7 +65,7 @@ open class CheckoutBar @JvmOverloads constructor(
     }
 
     private val paymentSelectorButton = findViewById<View>(R.id.payment_selector_button)
-    private val paymentSelectorButtonBig = findViewById<View>(R.id.payment_selector_button_big)
+    private val paymentSelectorButtonBig = findViewById<MaterialButton>(R.id.payment_selector_button_big)
     private val payButton = findViewById<SnabblePrimaryButton>(R.id.pay)
     private val priceSum = findViewById<TextView>(R.id.price_sum)
     private val sumContainer = findViewById<View>(R.id.sum_container)
@@ -128,7 +131,10 @@ open class CheckoutBar @JvmOverloads constructor(
         googlePayButtonLayout.setOneShotClickListener {
             val packageName = "com.google.android.apps.walletnfcrel"
             try {
-                context.packageManager.getApplicationInfoCompat(packageName, PackageManager.GET_ACTIVITIES)
+                context.packageManager.getApplicationInfoCompat(
+                    packageName,
+                    PackageManager.GET_ACTIVITIES
+                )
                 handleButtonClick()
             } catch (ignored: PackageManager.NameNotFoundException) {
                 try {
@@ -167,6 +173,11 @@ open class CheckoutBar @JvmOverloads constructor(
         project.checkout.state.observeView(this, ::onStateChanged)
     }
 
+    fun applyProjectTheme(){
+        paymentSelectorButtonBig.setBackgroundColor(context.getPrimaryColorForProject(project))
+        paymentSelectorButtonBig.setTextColor(context.getOnPrimaryColorForProject(project))
+    }
+
     private fun handleButtonClick() {
         if (cart.isRestorable) {
             cart.restore()
@@ -198,7 +209,10 @@ open class CheckoutBar @JvmOverloads constructor(
             paymentSelector.isVisible = !isHidden
             paymentIcon.setImageResource(entry.iconResId)
             paymentSelectorButton.contentDescription =
-                resources.getString(R.string.Snabble_Shoppingcart_Accessibility_paymentMethod, entry.text)
+                resources.getString(
+                    R.string.Snabble_Shoppingcart_Accessibility_paymentMethod,
+                    entry.text
+                )
             paymentSelectorButton.accessibility {
                 setClickAction(R.string.Snabble_Shoppingcart_BuyProducts_selectPaymentMethod)
             }
@@ -209,7 +223,8 @@ open class CheckoutBar @JvmOverloads constructor(
         cart.let { cart ->
             val quantity = cart.totalQuantity
             val price = cart.totalPrice
-            val articlesText = resources.getQuantityText(R.plurals.Snabble_Shoppingcart_numberOfItems, quantity)
+            val articlesText =
+                resources.getQuantityText(R.plurals.Snabble_Shoppingcart_numberOfItems, quantity)
             articleCount.text = String.format(articlesText.toString(), quantity)
             priceSum.text = project.priceFormatter.format(price)
 
@@ -266,7 +281,11 @@ open class CheckoutBar @JvmOverloads constructor(
             val entry = paymentSelectionHelper.selectedEntry.value
             if (entry != null) {
                 if (entry.paymentMethod.isRequiringCredentials && entry.paymentCredentials == null) {
-                    PaymentInputViewHelper.openPaymentInputView(context, entry.paymentMethod, project.id)
+                    PaymentInputViewHelper.openPaymentInputView(
+                        context,
+                        entry.paymentMethod,
+                        project.id
+                    )
                 } else {
                     Telemetry.event(Telemetry.Event.ClickCheckout)
                     SEPALegalInfoHelper.showSEPALegalInfoIfNeeded(context,
@@ -299,7 +318,11 @@ open class CheckoutBar @JvmOverloads constructor(
                         dialogFragment.show(activity.supportFragmentManager, null)
                     }
                 } else {
-                    Toast.makeText(context, R.string.Snabble_Payment_errorStarting, Toast.LENGTH_LONG).show()
+                    Toast.makeText(
+                        context,
+                        R.string.Snabble_Payment_errorStarting,
+                        Toast.LENGTH_LONG
+                    ).show()
                 }
             }
         }
@@ -315,7 +338,11 @@ open class CheckoutBar @JvmOverloads constructor(
                 val entry = paymentSelectionHelper.selectedEntry.value
                 if (entry == null) {
                     progressDialog.dismiss()
-                    Toast.makeText(context, R.string.Snabble_Payment_errorStarting, Toast.LENGTH_LONG).show()
+                    Toast.makeText(
+                        context,
+                        R.string.Snabble_Payment_errorStarting,
+                        Toast.LENGTH_LONG
+                    ).show()
                     return
                 }
                 if (entry.paymentCredentials != null) {
@@ -339,17 +366,22 @@ open class CheckoutBar @JvmOverloads constructor(
                             }
                             .show()
                     } else {
-                        Keyguard.unlock(UIUtils.getHostFragmentActivity(context), object : Keyguard.Callback {
-                            override fun success() {
-                                progressDialog.showAfterDelay(300)
-                                project.checkout.pay(entry.paymentMethod, entry.paymentCredentials)
-                            }
+                        Keyguard.unlock(
+                            UIUtils.getHostFragmentActivity(context),
+                            object : Keyguard.Callback {
+                                override fun success() {
+                                    progressDialog.showAfterDelay(300)
+                                    project.checkout.pay(
+                                        entry.paymentMethod,
+                                        entry.paymentCredentials
+                                    )
+                                }
 
-                            override fun error() {
-                                progressDialog.dismiss()
-                                project.checkout.reset()
-                            }
-                        })
+                                override fun error() {
+                                    progressDialog.dismiss()
+                                    project.checkout.reset()
+                                }
+                            })
                     }
                 } else {
                     progressDialog.showAfterDelay(300)
@@ -391,7 +423,12 @@ open class CheckoutBar @JvmOverloads constructor(
                     val res = resources
                     val sb = StringBuilder()
                     if (invalidProducts.size == 1) {
-                        sb.append(I18nUtils.getIdentifier(res, R.string.Snabble_SaleStop_ErrorMsg_one))
+                        sb.append(
+                            I18nUtils.getIdentifier(
+                                res,
+                                R.string.Snabble_SaleStop_ErrorMsg_one
+                            )
+                        )
                     } else {
                         sb.append(I18nUtils.getIdentifier(res, R.string.Snabble_SaleStop_errorMsg))
                     }
@@ -406,12 +443,21 @@ open class CheckoutBar @JvmOverloads constructor(
                     }
                     AlertDialog.Builder(context)
                         .setCancelable(false)
-                        .setTitle(I18nUtils.getIdentifier(resources, R.string.Snabble_SaleStop_ErrorMsg_title))
+                        .setTitle(
+                            I18nUtils.getIdentifier(
+                                resources,
+                                R.string.Snabble_SaleStop_ErrorMsg_title
+                            )
+                        )
                         .setMessage(sb.toString())
                         .setPositiveButton(R.string.Snabble_ok, null)
                         .show()
                 } else {
-                    SnackbarUtils.make(this, R.string.Snabble_Payment_errorStarting, UIUtils.SNACKBAR_LENGTH_VERY_LONG)
+                    SnackbarUtils.make(
+                        this,
+                        R.string.Snabble_Payment_errorStarting,
+                        UIUtils.SNACKBAR_LENGTH_VERY_LONG
+                    )
                         .show()
                 }
                 progressDialog.dismiss()
@@ -421,7 +467,11 @@ open class CheckoutBar @JvmOverloads constructor(
             CheckoutState.NO_SHOP,
             CheckoutState.PAYMENT_PROCESSING_ERROR -> {
                 if (isAttachedToWindow) {
-                    SnackbarUtils.make(this, R.string.Snabble_Payment_errorStarting, UIUtils.SNACKBAR_LENGTH_VERY_LONG)
+                    SnackbarUtils.make(
+                        this,
+                        R.string.Snabble_Payment_errorStarting,
+                        UIUtils.SNACKBAR_LENGTH_VERY_LONG
+                    )
                         .show()
                     progressDialog.dismiss()
                 }
@@ -432,14 +482,22 @@ open class CheckoutBar @JvmOverloads constructor(
             }
 
             CheckoutState.REQUEST_VERIFY_AGE -> {
-                SnabbleUI.executeAction(requireFragmentActivity(), SnabbleUI.Event.SHOW_AGE_VERIFICATION)
+                SnabbleUI.executeAction(
+                    requireFragmentActivity(),
+                    SnabbleUI.Event.SHOW_AGE_VERIFICATION
+                )
                 progressDialog.dismiss()
             }
 
             CheckoutState.REQUEST_TAXATION -> {
                 progressDialog.dismiss()
                 AlertDialog.Builder(context)
-                    .setTitle(I18nUtils.getIdentifier(context.resources, R.string.Snabble_Taxation_consumeWhere))
+                    .setTitle(
+                        I18nUtils.getIdentifier(
+                            context.resources,
+                            R.string.Snabble_Taxation_consumeWhere
+                        )
+                    )
                     .setAdapter(
                         ArrayAdapter(
                             context, R.layout.snabble_item_taxation, listOf(
@@ -463,12 +521,23 @@ open class CheckoutBar @JvmOverloads constructor(
             CheckoutState.NO_PAYMENT_METHOD_AVAILABLE -> {
                 AlertDialog.Builder(context)
                     .setCancelable(false)
-                    .setTitle(I18nUtils.getIdentifier(resources, R.string.Snabble_SaleStop_ErrorMsg_title))
-                    .setMessage(I18nUtils.getIdentifier(resources, R.string.Snabble_Payment_noMethodAvailable))
+                    .setTitle(
+                        I18nUtils.getIdentifier(
+                            resources,
+                            R.string.Snabble_SaleStop_ErrorMsg_title
+                        )
+                    )
+                    .setMessage(
+                        I18nUtils.getIdentifier(
+                            resources,
+                            R.string.Snabble_Payment_noMethodAvailable
+                        )
+                    )
                     .setPositiveButton(R.string.Snabble_ok, null)
                     .show()
                 progressDialog.dismiss()
             }
+
             else -> {
                 Logger.d("Unhandled event in CheckoutBar: $state")
             }

From 4aea64d2927a932fbba19ae28d2a4441cf099407 Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Thu, 12 Sep 2024 12:56:05 +0200
Subject: [PATCH 27/31] provide customization config

---
 core/src/main/java/io/snabble/sdk/Project.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/io/snabble/sdk/Project.kt b/core/src/main/java/io/snabble/sdk/Project.kt
index 328231b2d9..537b95b199 100644
--- a/core/src/main/java/io/snabble/sdk/Project.kt
+++ b/core/src/main/java/io/snabble/sdk/Project.kt
@@ -4,7 +4,6 @@ import com.google.gson.Gson
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 import com.google.gson.JsonSyntaxException
-import com.google.gson.annotations.SerializedName
 import com.google.gson.reflect.TypeToken
 import io.snabble.sdk.auth.SnabbleAuthorizationInterceptor
 import io.snabble.sdk.checkout.Checkout
@@ -352,6 +351,9 @@ class Project internal constructor(
 
     var appTheme: AppTheme? = null
 
+    var customizationConfig: JsonElement? = null
+        private set
+
     init {
         parse(jsonObject)
     }
@@ -368,7 +370,7 @@ class Project internal constructor(
             brand = Snabble.brands[brandId]
         }
 
-        val customizationConfig: JsonElement? = jsonObject["appCustomizationConfig"]
+        customizationConfig = jsonObject["appCustomizationConfig"]
         try {
             val lightModeColors: LightModeColors? = gson.fromJson(customizationConfig, LightModeColors::class.java)
             val darkModeColors: DarkModeColors? = gson.fromJson(customizationConfig, DarkModeColors::class.java)

From 7881fa8af64ef0110c7a8f644c39d2e12ee7161c Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Fri, 13 Sep 2024 10:18:42 +0200
Subject: [PATCH 28/31] make setter private

---
 core/src/main/java/io/snabble/sdk/Project.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/io/snabble/sdk/Project.kt b/core/src/main/java/io/snabble/sdk/Project.kt
index 537b95b199..40a08fa63a 100644
--- a/core/src/main/java/io/snabble/sdk/Project.kt
+++ b/core/src/main/java/io/snabble/sdk/Project.kt
@@ -350,6 +350,7 @@ class Project internal constructor(
         private set
 
     var appTheme: AppTheme? = null
+        private set
 
     var customizationConfig: JsonElement? = null
         private set

From 536c7f970a42bfb252a6b967b4e4530e7d9c9b4b Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Fri, 13 Sep 2024 10:22:09 +0200
Subject: [PATCH 29/31] revert obsolete changes

---
 .../io/snabble/sdk/ui/cart/CheckoutBar.kt     | 125 ++++--------------
 1 file changed, 28 insertions(+), 97 deletions(-)

diff --git a/ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt b/ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt
index 86580a229a..b4b74c97d9 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt
@@ -11,6 +11,7 @@ import android.util.AttributeSet
 import android.view.KeyEvent
 import android.view.View
 import android.widget.ArrayAdapter
+import android.widget.Button
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -19,10 +20,10 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
 import androidx.core.view.marginTop
 import androidx.fragment.app.FragmentActivity
-import com.google.android.material.button.MaterialButton
 import io.snabble.accessibility.accessibility
 import io.snabble.sdk.PaymentMethod
 import io.snabble.sdk.Project
+import io.snabble.sdk.shoppingcart.ShoppingCart
 import io.snabble.sdk.Snabble
 import io.snabble.sdk.Snabble.instance
 import io.snabble.sdk.checkout.Checkout
@@ -30,7 +31,6 @@ import io.snabble.sdk.checkout.CheckoutState
 import io.snabble.sdk.config.ExternalBillingSubjectLength
 import io.snabble.sdk.config.ProjectId
 import io.snabble.sdk.extensions.getApplicationInfoCompat
-import io.snabble.sdk.shoppingcart.ShoppingCart
 import io.snabble.sdk.shoppingcart.data.Taxation
 import io.snabble.sdk.shoppingcart.data.listener.SimpleShoppingCartListener
 import io.snabble.sdk.ui.Keyguard
@@ -41,9 +41,6 @@ import io.snabble.sdk.ui.payment.PaymentInputViewHelper
 import io.snabble.sdk.ui.payment.SEPALegalInfoHelper
 import io.snabble.sdk.ui.payment.SelectPaymentMethodFragment
 import io.snabble.sdk.ui.payment.externalbilling.ui.widgets.SubjectAlertDialog
-import io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
-import io.snabble.sdk.ui.remotetheme.getOnPrimaryColorForProject
-import io.snabble.sdk.ui.remotetheme.getPrimaryColorForProject
 import io.snabble.sdk.ui.telemetry.Telemetry
 import io.snabble.sdk.ui.utils.DelayedProgressDialog
 import io.snabble.sdk.ui.utils.I18nUtils
@@ -65,8 +62,8 @@ open class CheckoutBar @JvmOverloads constructor(
     }
 
     private val paymentSelectorButton = findViewById<View>(R.id.payment_selector_button)
-    private val paymentSelectorButtonBig = findViewById<MaterialButton>(R.id.payment_selector_button_big)
-    private val payButton = findViewById<SnabblePrimaryButton>(R.id.pay)
+    private val paymentSelectorButtonBig = findViewById<View>(R.id.payment_selector_button_big)
+    private val payButton = findViewById<Button>(R.id.pay)
     private val priceSum = findViewById<TextView>(R.id.price_sum)
     private val sumContainer = findViewById<View>(R.id.sum_container)
     private val googlePayButtonLayout = findViewById<View>(R.id.google_pay_button_layout)
@@ -131,10 +128,7 @@ open class CheckoutBar @JvmOverloads constructor(
         googlePayButtonLayout.setOneShotClickListener {
             val packageName = "com.google.android.apps.walletnfcrel"
             try {
-                context.packageManager.getApplicationInfoCompat(
-                    packageName,
-                    PackageManager.GET_ACTIVITIES
-                )
+                context.packageManager.getApplicationInfoCompat(packageName, PackageManager.GET_ACTIVITIES)
                 handleButtonClick()
             } catch (ignored: PackageManager.NameNotFoundException) {
                 try {
@@ -173,11 +167,6 @@ open class CheckoutBar @JvmOverloads constructor(
         project.checkout.state.observeView(this, ::onStateChanged)
     }
 
-    fun applyProjectTheme(){
-        paymentSelectorButtonBig.setBackgroundColor(context.getPrimaryColorForProject(project))
-        paymentSelectorButtonBig.setTextColor(context.getOnPrimaryColorForProject(project))
-    }
-
     private fun handleButtonClick() {
         if (cart.isRestorable) {
             cart.restore()
@@ -209,10 +198,7 @@ open class CheckoutBar @JvmOverloads constructor(
             paymentSelector.isVisible = !isHidden
             paymentIcon.setImageResource(entry.iconResId)
             paymentSelectorButton.contentDescription =
-                resources.getString(
-                    R.string.Snabble_Shoppingcart_Accessibility_paymentMethod,
-                    entry.text
-                )
+                resources.getString(R.string.Snabble_Shoppingcart_Accessibility_paymentMethod, entry.text)
             paymentSelectorButton.accessibility {
                 setClickAction(R.string.Snabble_Shoppingcart_BuyProducts_selectPaymentMethod)
             }
@@ -223,8 +209,7 @@ open class CheckoutBar @JvmOverloads constructor(
         cart.let { cart ->
             val quantity = cart.totalQuantity
             val price = cart.totalPrice
-            val articlesText =
-                resources.getQuantityText(R.plurals.Snabble_Shoppingcart_numberOfItems, quantity)
+            val articlesText = resources.getQuantityText(R.plurals.Snabble_Shoppingcart_numberOfItems, quantity)
             articleCount.text = String.format(articlesText.toString(), quantity)
             priceSum.text = project.priceFormatter.format(price)
 
@@ -281,11 +266,7 @@ open class CheckoutBar @JvmOverloads constructor(
             val entry = paymentSelectionHelper.selectedEntry.value
             if (entry != null) {
                 if (entry.paymentMethod.isRequiringCredentials && entry.paymentCredentials == null) {
-                    PaymentInputViewHelper.openPaymentInputView(
-                        context,
-                        entry.paymentMethod,
-                        project.id
-                    )
+                    PaymentInputViewHelper.openPaymentInputView(context, entry.paymentMethod, project.id)
                 } else {
                     Telemetry.event(Telemetry.Event.ClickCheckout)
                     SEPALegalInfoHelper.showSEPALegalInfoIfNeeded(context,
@@ -318,11 +299,7 @@ open class CheckoutBar @JvmOverloads constructor(
                         dialogFragment.show(activity.supportFragmentManager, null)
                     }
                 } else {
-                    Toast.makeText(
-                        context,
-                        R.string.Snabble_Payment_errorStarting,
-                        Toast.LENGTH_LONG
-                    ).show()
+                    Toast.makeText(context, R.string.Snabble_Payment_errorStarting, Toast.LENGTH_LONG).show()
                 }
             }
         }
@@ -338,11 +315,7 @@ open class CheckoutBar @JvmOverloads constructor(
                 val entry = paymentSelectionHelper.selectedEntry.value
                 if (entry == null) {
                     progressDialog.dismiss()
-                    Toast.makeText(
-                        context,
-                        R.string.Snabble_Payment_errorStarting,
-                        Toast.LENGTH_LONG
-                    ).show()
+                    Toast.makeText(context, R.string.Snabble_Payment_errorStarting, Toast.LENGTH_LONG).show()
                     return
                 }
                 if (entry.paymentCredentials != null) {
@@ -366,22 +339,17 @@ open class CheckoutBar @JvmOverloads constructor(
                             }
                             .show()
                     } else {
-                        Keyguard.unlock(
-                            UIUtils.getHostFragmentActivity(context),
-                            object : Keyguard.Callback {
-                                override fun success() {
-                                    progressDialog.showAfterDelay(300)
-                                    project.checkout.pay(
-                                        entry.paymentMethod,
-                                        entry.paymentCredentials
-                                    )
-                                }
+                        Keyguard.unlock(UIUtils.getHostFragmentActivity(context), object : Keyguard.Callback {
+                            override fun success() {
+                                progressDialog.showAfterDelay(300)
+                                project.checkout.pay(entry.paymentMethod, entry.paymentCredentials)
+                            }
 
-                                override fun error() {
-                                    progressDialog.dismiss()
-                                    project.checkout.reset()
-                                }
-                            })
+                            override fun error() {
+                                progressDialog.dismiss()
+                                project.checkout.reset()
+                            }
+                        })
                     }
                 } else {
                     progressDialog.showAfterDelay(300)
@@ -423,12 +391,7 @@ open class CheckoutBar @JvmOverloads constructor(
                     val res = resources
                     val sb = StringBuilder()
                     if (invalidProducts.size == 1) {
-                        sb.append(
-                            I18nUtils.getIdentifier(
-                                res,
-                                R.string.Snabble_SaleStop_ErrorMsg_one
-                            )
-                        )
+                        sb.append(I18nUtils.getIdentifier(res, R.string.Snabble_SaleStop_ErrorMsg_one))
                     } else {
                         sb.append(I18nUtils.getIdentifier(res, R.string.Snabble_SaleStop_errorMsg))
                     }
@@ -443,21 +406,12 @@ open class CheckoutBar @JvmOverloads constructor(
                     }
                     AlertDialog.Builder(context)
                         .setCancelable(false)
-                        .setTitle(
-                            I18nUtils.getIdentifier(
-                                resources,
-                                R.string.Snabble_SaleStop_ErrorMsg_title
-                            )
-                        )
+                        .setTitle(I18nUtils.getIdentifier(resources, R.string.Snabble_SaleStop_ErrorMsg_title))
                         .setMessage(sb.toString())
                         .setPositiveButton(R.string.Snabble_ok, null)
                         .show()
                 } else {
-                    SnackbarUtils.make(
-                        this,
-                        R.string.Snabble_Payment_errorStarting,
-                        UIUtils.SNACKBAR_LENGTH_VERY_LONG
-                    )
+                    SnackbarUtils.make(this, R.string.Snabble_Payment_errorStarting, UIUtils.SNACKBAR_LENGTH_VERY_LONG)
                         .show()
                 }
                 progressDialog.dismiss()
@@ -467,11 +421,7 @@ open class CheckoutBar @JvmOverloads constructor(
             CheckoutState.NO_SHOP,
             CheckoutState.PAYMENT_PROCESSING_ERROR -> {
                 if (isAttachedToWindow) {
-                    SnackbarUtils.make(
-                        this,
-                        R.string.Snabble_Payment_errorStarting,
-                        UIUtils.SNACKBAR_LENGTH_VERY_LONG
-                    )
+                    SnackbarUtils.make(this, R.string.Snabble_Payment_errorStarting, UIUtils.SNACKBAR_LENGTH_VERY_LONG)
                         .show()
                     progressDialog.dismiss()
                 }
@@ -482,22 +432,14 @@ open class CheckoutBar @JvmOverloads constructor(
             }
 
             CheckoutState.REQUEST_VERIFY_AGE -> {
-                SnabbleUI.executeAction(
-                    requireFragmentActivity(),
-                    SnabbleUI.Event.SHOW_AGE_VERIFICATION
-                )
+                SnabbleUI.executeAction(requireFragmentActivity(), SnabbleUI.Event.SHOW_AGE_VERIFICATION)
                 progressDialog.dismiss()
             }
 
             CheckoutState.REQUEST_TAXATION -> {
                 progressDialog.dismiss()
                 AlertDialog.Builder(context)
-                    .setTitle(
-                        I18nUtils.getIdentifier(
-                            context.resources,
-                            R.string.Snabble_Taxation_consumeWhere
-                        )
-                    )
+                    .setTitle(I18nUtils.getIdentifier(context.resources, R.string.Snabble_Taxation_consumeWhere))
                     .setAdapter(
                         ArrayAdapter(
                             context, R.layout.snabble_item_taxation, listOf(
@@ -521,23 +463,12 @@ open class CheckoutBar @JvmOverloads constructor(
             CheckoutState.NO_PAYMENT_METHOD_AVAILABLE -> {
                 AlertDialog.Builder(context)
                     .setCancelable(false)
-                    .setTitle(
-                        I18nUtils.getIdentifier(
-                            resources,
-                            R.string.Snabble_SaleStop_ErrorMsg_title
-                        )
-                    )
-                    .setMessage(
-                        I18nUtils.getIdentifier(
-                            resources,
-                            R.string.Snabble_Payment_noMethodAvailable
-                        )
-                    )
+                    .setTitle(I18nUtils.getIdentifier(resources, R.string.Snabble_SaleStop_ErrorMsg_title))
+                    .setMessage(I18nUtils.getIdentifier(resources, R.string.Snabble_Payment_noMethodAvailable))
                     .setPositiveButton(R.string.Snabble_ok, null)
                     .show()
                 progressDialog.dismiss()
             }
-
             else -> {
                 Logger.d("Unhandled event in CheckoutBar: $state")
             }

From da6d5cc2aff3b9e0cef6d032b38ac9ee3ed66e17 Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Fri, 13 Sep 2024 10:33:01 +0200
Subject: [PATCH 30/31] revert obsolete changes

---
 .../io/snabble/sdk/ui/checkout/PaymentStatusView.kt   |  9 ++++-----
 .../io/snabble/sdk/ui/coupon/CouponDetailFragment.kt  |  7 ++++---
 .../sdk/ui/payment/AgeVerificationInputView.java      |  3 +--
 .../ui/scanner/DefaultProductConfirmationDialog.kt    |  4 ++--
 .../io/snabble/sdk/ui/scanner/SelfScanningFragment.kt |  9 ++++-----
 .../io/snabble/sdk/ui/scanner/SelfScanningView.java   |  3 +--
 .../layout/snabble_dialog_product_confirmation.xml    |  4 ++--
 .../main/res/layout/snabble_fragment_selfscanning.xml |  1 -
 ui/src/main/res/layout/snabble_primary_button.xml     | 11 -----------
 .../main/res/layout/snabble_subject_alert_dialog.xml  |  4 ++--
 ui/src/main/res/layout/snabble_view_checkout_bar.xml  |  2 +-
 .../res/layout/snabble_view_checkout_customercard.xml |  2 +-
 .../main/res/layout/snabble_view_checkout_offline.xml |  2 +-
 .../main/res/layout/snabble_view_payment_status.xml   |  2 ++
 ui/src/main/res/values/styles.xml                     |  6 ++----
 15 files changed, 27 insertions(+), 42 deletions(-)
 delete mode 100644 ui/src/main/res/layout/snabble_primary_button.xml

diff --git a/ui/src/main/java/io/snabble/sdk/ui/checkout/PaymentStatusView.kt b/ui/src/main/java/io/snabble/sdk/ui/checkout/PaymentStatusView.kt
index 7c4d05100b..d2524b2b98 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/checkout/PaymentStatusView.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/checkout/PaymentStatusView.kt
@@ -42,7 +42,6 @@ import io.snabble.sdk.ui.checkout.PaymentOriginCandidateHelper.PaymentOriginCand
 import io.snabble.sdk.ui.checkout.PaymentOriginCandidateHelper.PaymentOriginCandidateAvailableListener
 import io.snabble.sdk.ui.payment.SEPACardInputActivity
 import io.snabble.sdk.ui.payment.payone.sepa.form.PayoneSepaActivity
-import io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
 import io.snabble.sdk.ui.scanner.BarcodeView
 import io.snabble.sdk.ui.telemetry.Telemetry
 import io.snabble.sdk.ui.utils.executeUiAction
@@ -61,9 +60,9 @@ class PaymentStatusView @JvmOverloads constructor(
     }
 
     private val image = findViewById<ImageView>(R.id.image)
-    private val back = findViewById<SnabblePrimaryButton>(R.id.back)
+    private val back = findViewById<MaterialButton>(R.id.back)
     private var selectedRating = ""
-    private val sendFeedback: SnabblePrimaryButton? = findViewById(R.id.send_feedback)
+    private val sendFeedback: View? = findViewById(R.id.send_feedback)
     private val successAnimation: LottieAnimationView = findViewById(R.id.success_animation)
     private val inputBadRatingLayout = findViewById<TextInputLayout>(R.id.input_bad_rating_layout)
     private var addIbanLayout = findViewById<LinearLayout>(R.id.add_iban_layout)
@@ -125,7 +124,7 @@ class PaymentStatusView @JvmOverloads constructor(
         paymentOriginCandidateHelper = PaymentOriginCandidateHelper(project)
         paymentOriginCandidateHelper.addPaymentOriginCandidateAvailableListener(this)
 
-        back.setText(R.string.Snabble_cancel)
+        back.text = resources.getString(R.string.Snabble_cancel)
         back.setOnClickListener {
             val state = lastState
 
@@ -268,7 +267,7 @@ class PaymentStatusView @JvmOverloads constructor(
                 } else {
                     receipt.state = PaymentStatusItemView.State.NOT_EXECUTED
                 }
-                back.setText(R.string.Snabble_PaymentStatus_close)
+                back.text = resources.getString(R.string.Snabble_PaymentStatus_close)
                 backPressedCallback.isEnabled = false
                 ratingCardLayout.isVisible = true
                 paymentOriginCandidateHelper.startPollingIfLinkIsAvailable(checkout?.checkoutProcess)
diff --git a/ui/src/main/java/io/snabble/sdk/ui/coupon/CouponDetailFragment.kt b/ui/src/main/java/io/snabble/sdk/ui/coupon/CouponDetailFragment.kt
index 038efebe9e..dc2bffd3dc 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/coupon/CouponDetailFragment.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/coupon/CouponDetailFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.fragment.app.Fragment
@@ -11,7 +12,6 @@ import io.snabble.sdk.Snabble
 import io.snabble.sdk.coupons.Coupon
 import io.snabble.sdk.coupons.CouponType
 import io.snabble.sdk.ui.R
-import io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
 import io.snabble.sdk.ui.utils.loadImage
 import io.snabble.sdk.ui.utils.parcelableExtra
 import io.snabble.sdk.ui.utils.setTextOrHide
@@ -46,8 +46,8 @@ open class CouponDetailFragment : Fragment() {
     private lateinit var description: TextView
     private lateinit var discount: TextView
     private lateinit var expire: TextView
-    private lateinit var activateCoupon: SnabblePrimaryButton
-    private lateinit var appliedCoupon: SnabblePrimaryButton
+    private lateinit var activateCoupon: Button
+    private lateinit var appliedCoupon: Button
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -110,6 +110,7 @@ open class CouponDetailFragment : Fragment() {
             item.coupon?.let {
                 removeCoupon(it)
             }
+
         }
     }
 
diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/AgeVerificationInputView.java b/ui/src/main/java/io/snabble/sdk/ui/payment/AgeVerificationInputView.java
index 76d71db68a..afde1fb9ab 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/payment/AgeVerificationInputView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/payment/AgeVerificationInputView.java
@@ -26,7 +26,6 @@
 import io.snabble.sdk.Users;
 import io.snabble.sdk.ui.R;
 import io.snabble.sdk.ui.SnabbleUI;
-import io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton;
 import io.snabble.sdk.ui.utils.DelayedProgressDialog;
 
 public class AgeVerificationInputView extends FrameLayout {
@@ -80,7 +79,7 @@ public void inflateView() {
                     return false;
                 });
 
-        SnabblePrimaryButton save = findViewById(R.id.save);
+        Button save = findViewById(R.id.save);
         save.setOnClickListener(view -> handleInput());
     }
 
diff --git a/ui/src/main/java/io/snabble/sdk/ui/scanner/DefaultProductConfirmationDialog.kt b/ui/src/main/java/io/snabble/sdk/ui/scanner/DefaultProductConfirmationDialog.kt
index cbc03799aa..05eb4f0461 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/scanner/DefaultProductConfirmationDialog.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/scanner/DefaultProductConfirmationDialog.kt
@@ -15,6 +15,7 @@ import android.view.animation.TranslateAnimation
 import android.view.animation.CycleInterpolator
 import android.view.inputmethod.InputMethodManager
 import android.widget.Button
+import androidx.appcompat.widget.AppCompatButton
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentActivity
@@ -23,7 +24,6 @@ import com.google.android.material.textfield.TextInputLayout
 import io.snabble.accessibility.accessibility
 import io.snabble.sdk.*
 import io.snabble.sdk.shoppingcart.ShoppingCart
-import io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
 import io.snabble.sdk.ui.utils.*
 import io.snabble.sdk.utils.Dispatch
 import java.lang.NumberFormatException
@@ -39,7 +39,7 @@ class DefaultProductConfirmationDialog : DialogFragment(), ProductConfirmationDi
     private lateinit var price: TextView
     private lateinit var originalPrice: TextView
     private lateinit var depositPrice: TextView
-    private lateinit var addToCart: SnabblePrimaryButton
+    private lateinit var addToCart: AppCompatButton
     private lateinit var plusLayout: View
     private lateinit var minusLayout: View
     private lateinit var enterReducedPrice: Button
diff --git a/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningFragment.kt b/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningFragment.kt
index 52baaa6b9a..a158632cb3 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningFragment.kt
+++ b/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningFragment.kt
@@ -33,7 +33,6 @@ import io.snabble.sdk.codes.ScannedCode
 import io.snabble.sdk.ui.AccessibilityPreferences
 import io.snabble.sdk.ui.BaseFragment
 import io.snabble.sdk.ui.R
-import io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
 import io.snabble.sdk.ui.search.SearchHelper
 import io.snabble.sdk.ui.utils.setOneShotClickListener
 import io.snabble.sdk.utils.Dispatch
@@ -44,7 +43,7 @@ open class SelfScanningFragment : BaseFragment(), MenuProvider {
     var selfScanningView: SelfScanningView? = null
     protected lateinit var rootView: ViewGroup
     private lateinit var permissionContainer: View
-    private lateinit var askForPermission: SnabblePrimaryButton
+    private lateinit var askForPermission: Button
     private var canAskAgain = false
     private var isStart = false
     var allowShowingHints = false
@@ -81,7 +80,7 @@ open class SelfScanningFragment : BaseFragment(), MenuProvider {
         rootView = view as ViewGroup
         selfScanningView = null
         permissionContainer = rootView.findViewById(R.id.permission_denied_container)
-        askForPermission = view.findViewById(R.id.open_settings)
+        askForPermission = rootView.findViewById(R.id.open_settings)
 
         if (isPermissionGranted) {
             createSelfScanningView()
@@ -171,12 +170,12 @@ open class SelfScanningFragment : BaseFragment(), MenuProvider {
     private fun showPermissionRationale() {
         permissionContainer.visibility = View.VISIBLE
         if (canAskAgain) {
-            askForPermission.setText(R.string.Snabble_askForPermission)
+            askForPermission.text = getString(R.string.Snabble_askForPermission)
             askForPermission.setOneShotClickListener {
                 activityResultLauncher.launch(Manifest.permission.CAMERA)
             }
         } else {
-            askForPermission.setText(R.string.Snabble_goToSettings)
+            askForPermission.text = getString(R.string.Snabble_goToSettings)
             askForPermission.setOneShotClickListener {
                 goToSettings()
             }
diff --git a/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningView.java b/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningView.java
index a0e1fa65f8..8065acdd07 100644
--- a/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningView.java
+++ b/ui/src/main/java/io/snabble/sdk/ui/scanner/SelfScanningView.java
@@ -47,7 +47,6 @@
 import io.snabble.sdk.ui.SnabbleUI;
 import io.snabble.sdk.ui.checkout.ViolationNotificationUtils;
 import io.snabble.sdk.ui.remotetheme.RemoteThemingExtensionsKt;
-import io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton;
 import io.snabble.sdk.ui.telemetry.Telemetry;
 import io.snabble.sdk.ui.utils.DelayedProgressDialog;
 import io.snabble.sdk.ui.utils.I18nUtils;
@@ -63,7 +62,7 @@ public class SelfScanningView extends FrameLayout {
     private BarcodeScannerView barcodeScanner;
     private ProductDatabase productDatabase;
     private boolean isInitialized;
-    private SnabblePrimaryButton goToCart;
+    private Button goToCart;
     private View noPermission;
     private boolean isRunning;
 
diff --git a/ui/src/main/res/layout/snabble_dialog_product_confirmation.xml b/ui/src/main/res/layout/snabble_dialog_product_confirmation.xml
index 2cb7a31abb..a86e938652 100644
--- a/ui/src/main/res/layout/snabble_dialog_product_confirmation.xml
+++ b/ui/src/main/res/layout/snabble_dialog_product_confirmation.xml
@@ -4,10 +4,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/colorSurface"
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:gravity="center"
+    android:background="?attr/colorSurface"
     android:minWidth="350dp"
     android:orientation="vertical">
 
@@ -167,7 +167,7 @@
 
     <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
         android:id="@+id/addToCart"
-        style="@style/Snabble.Primary.Button"
+        style="@style/Snabble.Widget.MaterialComponents.Button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
diff --git a/ui/src/main/res/layout/snabble_fragment_selfscanning.xml b/ui/src/main/res/layout/snabble_fragment_selfscanning.xml
index 7efe0d69eb..803004f7b1 100644
--- a/ui/src/main/res/layout/snabble_fragment_selfscanning.xml
+++ b/ui/src/main/res/layout/snabble_fragment_selfscanning.xml
@@ -37,7 +37,6 @@
                 android:text="@string/Snabble.Scanner.Camera.allowAccess"/>
 
             <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
-                style="@style/Snabble.Primary.Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/open_settings"
diff --git a/ui/src/main/res/layout/snabble_primary_button.xml b/ui/src/main/res/layout/snabble_primary_button.xml
deleted file mode 100644
index ae66046141..0000000000
--- a/ui/src/main/res/layout/snabble_primary_button.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.compose.ui.platform.ComposeView
-        android:id="@+id/button_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/ui/src/main/res/layout/snabble_subject_alert_dialog.xml b/ui/src/main/res/layout/snabble_subject_alert_dialog.xml
index d42bdbc833..d36841c9a1 100644
--- a/ui/src/main/res/layout/snabble_subject_alert_dialog.xml
+++ b/ui/src/main/res/layout/snabble_subject_alert_dialog.xml
@@ -43,7 +43,7 @@
         android:layout_width="match_parent"
         android:layout_height="24dp" />
 
-    <com.google.android.material.button.MaterialButton
+    <io.snabble.sdk.ui.remotetheme.SnabbleSecondaryButton
         android:id="@+id/subject_add"
         style="@style/Snabble.ShapeAppearanceOverlay.RoundedCorners.Big"
         android:layout_width="match_parent"
@@ -55,7 +55,7 @@
         android:layout_width="match_parent"
         android:layout_height="4dp" />
 
-    <com.google.android.material.button.MaterialButton
+    <io.snabble.sdk.ui.remotetheme.SnabbleSecondaryButton
         android:id="@+id/subject_skip"
         style="@style/Snabble.Widget.MaterialComponents.Button.TextButton"
         android:layout_width="match_parent"
diff --git a/ui/src/main/res/layout/snabble_view_checkout_bar.xml b/ui/src/main/res/layout/snabble_view_checkout_bar.xml
index 4995bba32c..16d6a60b5b 100644
--- a/ui/src/main/res/layout/snabble_view_checkout_bar.xml
+++ b/ui/src/main/res/layout/snabble_view_checkout_bar.xml
@@ -93,7 +93,7 @@
             </FrameLayout>
 
             <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
-                style="@style/Snabble.Primary.Button"
+                style="@style/Snabble.Widget.MaterialComponents.Button"
                 android:id="@+id/pay"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
diff --git a/ui/src/main/res/layout/snabble_view_checkout_customercard.xml b/ui/src/main/res/layout/snabble_view_checkout_customercard.xml
index 06041ba904..fd1039d602 100644
--- a/ui/src/main/res/layout/snabble_view_checkout_customercard.xml
+++ b/ui/src/main/res/layout/snabble_view_checkout_customercard.xml
@@ -52,7 +52,7 @@
                 android:format="EAN_13"/>
         </LinearLayout>
     </FrameLayout>
-    <com.google.android.material.button.MaterialButton
+    <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
         android:id="@+id/paid"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/ui/src/main/res/layout/snabble_view_checkout_offline.xml b/ui/src/main/res/layout/snabble_view_checkout_offline.xml
index 94b31573c8..5d23af207e 100644
--- a/ui/src/main/res/layout/snabble_view_checkout_offline.xml
+++ b/ui/src/main/res/layout/snabble_view_checkout_offline.xml
@@ -82,7 +82,7 @@
         android:layout_marginTop="4dp"
         android:layout_above="@+id/paid"/>
 
-    <com.google.android.material.button.MaterialButton
+    <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
         android:id="@+id/paid"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/ui/src/main/res/layout/snabble_view_payment_status.xml b/ui/src/main/res/layout/snabble_view_payment_status.xml
index 48ec330e27..c03ea7b828 100644
--- a/ui/src/main/res/layout/snabble_view_payment_status.xml
+++ b/ui/src/main/res/layout/snabble_view_payment_status.xml
@@ -286,6 +286,7 @@
 
                 <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
                     android:id="@+id/send_feedback"
+                    style="@style/Widget.Material3.Button"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
@@ -325,6 +326,7 @@
 
         <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
             android:id="@+id/back"
+            style="@style/Widget.Material3.Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
diff --git a/ui/src/main/res/values/styles.xml b/ui/src/main/res/values/styles.xml
index 0c7d1ed153..b66dda7240 100644
--- a/ui/src/main/res/values/styles.xml
+++ b/ui/src/main/res/values/styles.xml
@@ -10,8 +10,6 @@
         <item name="cornerSize">32dp</item>
     </style>
 
-    <style name="Snabble.Primary.Button" parent="" />
-
     <style name="Snabble.Widget.MaterialComponents.Button" parent="Widget.Material3.Button" />
 
     <style name="Snabble.Widget.MaterialComponents.Button.Passive" parent="Snabble.Widget.MaterialComponents.Button">
@@ -44,8 +42,8 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">32dp</item>
         <item name="android:layout_marginBottom">32dp</item>
-        <item name="android:layout_marginLeft">24dp</item>
-        <item name="android:layout_marginRight">24dp</item>
+        <item name="android:layout_marginLeft">16dp</item>
+        <item name="android:layout_marginRight">16dp</item>
         <item name="android:text">@string/Snabble.Coupon.activate</item>
     </style>
 

From 29001fce52c74e3390a8564fbbef438b6146360f Mon Sep 17 00:00:00 2001
From: Fabian Bender <fabian.bender@snabble.io>
Date: Fri, 13 Sep 2024 10:35:21 +0200
Subject: [PATCH 31/31] revert obsolete changes

---
 ui/src/main/res/layout/snabble_subject_alert_dialog.xml  | 2 +-
 ui/src/main/res/layout/snabble_view_age_verification.xml | 1 -
 ui/src/main/res/values/styles.xml                        | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ui/src/main/res/layout/snabble_subject_alert_dialog.xml b/ui/src/main/res/layout/snabble_subject_alert_dialog.xml
index d36841c9a1..1a1ff5bbd5 100644
--- a/ui/src/main/res/layout/snabble_subject_alert_dialog.xml
+++ b/ui/src/main/res/layout/snabble_subject_alert_dialog.xml
@@ -43,7 +43,7 @@
         android:layout_width="match_parent"
         android:layout_height="24dp" />
 
-    <io.snabble.sdk.ui.remotetheme.SnabbleSecondaryButton
+    <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
         android:id="@+id/subject_add"
         style="@style/Snabble.ShapeAppearanceOverlay.RoundedCorners.Big"
         android:layout_width="match_parent"
diff --git a/ui/src/main/res/layout/snabble_view_age_verification.xml b/ui/src/main/res/layout/snabble_view_age_verification.xml
index 0eb1d3012c..7580bf49d6 100644
--- a/ui/src/main/res/layout/snabble_view_age_verification.xml
+++ b/ui/src/main/res/layout/snabble_view_age_verification.xml
@@ -45,7 +45,6 @@
             </com.google.android.material.textfield.TextInputLayout>
 
             <io.snabble.sdk.ui.remotetheme.SnabblePrimaryButton
-                style="@style/Snabble.Primary.Button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="16dp"
diff --git a/ui/src/main/res/values/styles.xml b/ui/src/main/res/values/styles.xml
index b66dda7240..df1aaf1575 100644
--- a/ui/src/main/res/values/styles.xml
+++ b/ui/src/main/res/values/styles.xml
@@ -37,7 +37,7 @@
 
     <style name="Snabble.CouponDetail" />
 
-    <style name="Snabble.CouponDetail.ActivateButtonStyle">
+    <style name="Snabble.CouponDetail.ActivateButtonStyle" parent="Widget.Material3.Button">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">32dp</item>