diff --git a/lib/src/components/apple_pay/model/apple_pay_component_configuration.dart b/lib/src/components/apple_pay/model/apple_pay_component_configuration.dart index 580e46b1..2a60cd97 100644 --- a/lib/src/components/apple_pay/model/apple_pay_component_configuration.dart +++ b/lib/src/components/apple_pay/model/apple_pay_component_configuration.dart @@ -2,8 +2,6 @@ import 'package:adyen_checkout/adyen_checkout.dart'; import 'package:adyen_checkout/src/common/model/base_configuration.dart'; final class ApplePayComponentConfiguration extends BaseConfiguration { - final ApplePayConfiguration applePayConfiguration; - ApplePayComponentConfiguration({ required super.environment, required super.clientKey, @@ -14,6 +12,8 @@ final class ApplePayComponentConfiguration extends BaseConfiguration { super.analyticsOptions, }); + final ApplePayConfiguration applePayConfiguration; + @override String toString() { return 'ApplePayComponentConfiguration(applePayConfiguration: $applePayConfiguration)'; diff --git a/lib/src/components/card/model/card_component_configuration.dart b/lib/src/components/card/model/card_component_configuration.dart index e97bb808..64a53d25 100644 --- a/lib/src/components/card/model/card_component_configuration.dart +++ b/lib/src/components/card/model/card_component_configuration.dart @@ -2,8 +2,6 @@ import 'package:adyen_checkout/src/common/model/base_configuration.dart'; import 'package:adyen_checkout/src/common/model/payment_method_configurations/card_configuration.dart'; final class CardComponentConfiguration extends BaseConfiguration { - final CardConfiguration cardConfiguration; - CardComponentConfiguration({ required super.environment, required super.clientKey, @@ -11,8 +9,10 @@ final class CardComponentConfiguration extends BaseConfiguration { super.amount, super.shopperLocale, super.analyticsOptions, - CardConfiguration? cardConfiguration, - }) : cardConfiguration = cardConfiguration ?? const CardConfiguration(); + this.cardConfiguration = const CardConfiguration(), + }); + + final CardConfiguration cardConfiguration; @override String toString() { diff --git a/lib/src/components/google_pay/model/google_pay_component_configuration.dart b/lib/src/components/google_pay/model/google_pay_component_configuration.dart index a7d1a70e..6d4c5d1c 100644 --- a/lib/src/components/google_pay/model/google_pay_component_configuration.dart +++ b/lib/src/components/google_pay/model/google_pay_component_configuration.dart @@ -2,8 +2,6 @@ import 'package:adyen_checkout/adyen_checkout.dart'; import 'package:adyen_checkout/src/common/model/base_configuration.dart'; final class GooglePayComponentConfiguration extends BaseConfiguration { - final GooglePayConfiguration googlePayConfiguration; - GooglePayComponentConfiguration({ required super.environment, required super.clientKey, @@ -14,6 +12,8 @@ final class GooglePayComponentConfiguration extends BaseConfiguration { super.analyticsOptions, }); + final GooglePayConfiguration googlePayConfiguration; + @override String toString() { return 'GooglePayComponentConfiguration(googlePayConfiguration: $googlePayConfiguration)'; diff --git a/lib/src/drop_in/model/drop_in_configuration.dart b/lib/src/drop_in/model/drop_in_configuration.dart index 63d5d68e..6ca1537c 100644 --- a/lib/src/drop_in/model/drop_in_configuration.dart +++ b/lib/src/drop_in/model/drop_in_configuration.dart @@ -7,15 +7,6 @@ import 'package:adyen_checkout/src/common/model/payment_method_configurations/go import 'package:adyen_checkout/src/common/model/payment_method_configurations/stored_payment_method_configuration.dart'; final class DropInConfiguration extends BaseConfiguration { - final CardConfiguration? cardConfiguration; - final ApplePayConfiguration? applePayConfiguration; - final GooglePayConfiguration? googlePayConfiguration; - final CashAppPayConfiguration? cashAppPayConfiguration; - final StoredPaymentMethodConfiguration? storedPaymentMethodConfiguration; - final bool skipListWhenSinglePaymentMethod; - final String? preselectedPaymentMethodTitle; - final Map? paymentMethodNames; - DropInConfiguration({ required super.environment, required super.clientKey, @@ -28,11 +19,20 @@ final class DropInConfiguration extends BaseConfiguration { this.cashAppPayConfiguration, this.storedPaymentMethodConfiguration, this.preselectedPaymentMethodTitle, - bool? skipListWhenSinglePaymentMethod, + this.skipListWhenSinglePaymentMethod = false, AnalyticsOptions? analyticsOptions, this.paymentMethodNames, - }) : skipListWhenSinglePaymentMethod = - skipListWhenSinglePaymentMethod ?? false; + }); + + final CardConfiguration? cardConfiguration; + final ApplePayConfiguration? applePayConfiguration; + final GooglePayConfiguration? googlePayConfiguration; + final CashAppPayConfiguration? cashAppPayConfiguration; + final StoredPaymentMethodConfiguration? storedPaymentMethodConfiguration; + final bool skipListWhenSinglePaymentMethod; + final String? preselectedPaymentMethodTitle; + final Map? paymentMethodNames; + @override String toString() {