Merge pull request #2745 from Adyen/chore/simplify-additional-callbacks

v6 - Simplify additional callbacks

Author: OscarSpruit

card/api/card.api

@@ -41,9 +41,10 @@ public final class com/adyen/checkout/card/BuildConfig {
 }
 
 public final class com/adyen/checkout/card/CardCallbackExtKt {
-	public static final fun card (Lcom/adyen/checkout/core/components/CheckoutCallbacks;Lkotlin/jvm/functions/Function1;)V
-	public static final fun onBinLookup (Lcom/adyen/checkout/card/internal/CardCallbacks;Lcom/adyen/checkout/card/OnBinLookupCallback;)V
-	public static final fun onBinValue (Lcom/adyen/checkout/card/internal/CardCallbacks;Lcom/adyen/checkout/card/OnBinValueCallback;)V
+	public static final fun card (Lcom/adyen/checkout/core/components/CheckoutCallbacks;)V
+	public static final fun card (Lcom/adyen/checkout/core/components/CheckoutCallbacks;Lcom/adyen/checkout/card/OnBinValueCallback;)V
+	public static final fun card (Lcom/adyen/checkout/core/components/CheckoutCallbacks;Lcom/adyen/checkout/card/OnBinValueCallback;Lcom/adyen/checkout/card/OnBinLookupCallback;)V
+	public static synthetic fun card$default (Lcom/adyen/checkout/core/components/CheckoutCallbacks;Lcom/adyen/checkout/card/OnBinValueCallback;Lcom/adyen/checkout/card/OnBinLookupCallback;ILjava/lang/Object;)V
 }
 
 public final class com/adyen/checkout/card/CardConfiguration : com/adyen/checkout/core/components/internal/Configuration {

card/src/main/java/com/adyen/checkout/card/CardCallbackExt.kt

@@ -8,21 +8,13 @@
 
 package com.adyen.checkout.card
 
-import com.adyen.checkout.card.internal.CardCallbacks
 import com.adyen.checkout.core.components.CheckoutCallbacks
 
-fun CheckoutCallbacks.card(initBlock: CardCallbacks.() -> Unit) {
-    apply {
-        val callbacks = CardCallbacks().apply(initBlock)
-        callbacks.onBinValue?.let { addAdditionalCallback(it) }
-        callbacks.onBinLookup?.let { addAdditionalCallback(it) }
-    }
-}
-
-fun CardCallbacks.onBinValue(onBinValueCallback: OnBinValueCallback) {
-    onBinValue = onBinValueCallback
-}
-
-fun CardCallbacks.onBinLookup(onBinLookupCallback: OnBinLookupCallback) {
-    onBinLookup = onBinLookupCallback
+@JvmOverloads
+fun CheckoutCallbacks.card(
+    onBinValue: OnBinValueCallback? = null,
+    onBinLookup: OnBinLookupCallback? = null,
+) {
+    onBinValue?.let { addAdditionalCallback(it) }
+    onBinLookup?.let { addAdditionalCallback(it) }
 }

card/src/main/java/com/adyen/checkout/card/internal/CardCallbacks.kt

@@ -18,8 +18,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.adyen.checkout.card.BinLookupData
 import com.adyen.checkout.card.card
-import com.adyen.checkout.card.onBinLookup
-import com.adyen.checkout.card.onBinValue
 import com.adyen.checkout.core.action.data.Action
 import com.adyen.checkout.core.action.data.ActionComponentData
 import com.adyen.checkout.core.common.CheckoutContext
@@ -204,10 +202,10 @@ internal class V6ViewModel @Inject constructor(
                 onAdditionalDetails = ::onAdditionalDetails,
                 onError = ::onError,
             ) {
-                card {
-                    onBinValue(::onBinValue)
-                    onBinLookup(::onBinLookup)
-                }
+                card(
+                    onBinValue = ::onBinValue,
+                    onBinLookup = ::onBinLookup,
+                )
             },
             coroutineScope = viewModelScope,
         )