Used AdyenCheckout singleton instead injecting it through constructor

Adyen · Dec 13, 2023 · 081affd · 081affd
1 parent 11e5be0
commit 081affd
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 44 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -50,15 +50,9 @@ class _MyAppState extends State<MyApp> {
   }
 
   void _initRepositories() {
-    _adyenDropInRepository = AdyenDropInRepository(
-      adyenCheckout: _adyenCheckout,
-      service: _service,
-    );
-
-    _adyenCardComponentRepository = AdyenCardComponentRepository(
-      adyenCheckout: _adyenCheckout,
-      service: _service,
-    );
+    _adyenDropInRepository = AdyenDropInRepository(service: _service);
+    _adyenCardComponentRepository =
+        AdyenCardComponentRepository(service: _service);
   }
 
   @override
@@ -86,10 +80,7 @@ class _MyAppState extends State<MyApp> {
 
   MaterialPageRoute<dynamic> _buildDropInRoute() {
     return MaterialPageRoute(
-      builder: (context) => DropInScreen(
-        repository: _adyenDropInRepository,
-        adyenCheckout: _adyenCheckout,
-      ),
+      builder: (context) => DropInScreen(repository: _adyenDropInRepository),
     );
   }
 

diff --git a/example/lib/repositories/adyen_base_repository.dart b/example/lib/repositories/adyen_base_repository.dart
@@ -7,18 +7,16 @@ import 'package:adyen_checkout_example/utils/payment_flow_outcome_handler.dart';
 
 class AdyenBaseRepository {
   AdyenBaseRepository({
-    required this.adyenCheckout,
     required this.service,
   });
 
-  final AdyenCheckout adyenCheckout;
   final Service service;
   final PaymentFlowOutcomeHandler paymentFlowOutcomeHandler =
       PaymentFlowOutcomeHandler();
 
   Future<String> determineBaseReturnUrl() async {
     if (Platform.isAndroid) {
-      return await adyenCheckout.getReturnUrl();
+      return await AdyenCheckout.instance.getReturnUrl();
     } else if (Platform.isIOS) {
       return Config.iOSReturnUrl;
     } else {

diff --git a/example/lib/repositories/adyen_card_component_repository.dart b/example/lib/repositories/adyen_card_component_repository.dart
@@ -11,7 +11,6 @@ import 'package:adyen_checkout_example/repositories/adyen_base_repository.dart';
 
 class AdyenCardComponentRepository extends AdyenBaseRepository {
   AdyenCardComponentRepository({
-    required super.adyenCheckout,
     required super.service,
   });
 

diff --git a/example/lib/repositories/adyen_drop_in_repository.dart b/example/lib/repositories/adyen_drop_in_repository.dart
@@ -13,10 +13,7 @@ import 'package:adyen_checkout_example/network/models/session_response_network_m
 import 'package:adyen_checkout_example/repositories/adyen_base_repository.dart';
 
 class AdyenDropInRepository extends AdyenBaseRepository {
-  AdyenDropInRepository({
-    required super.adyenCheckout,
-    required super.service,
-  });
+  AdyenDropInRepository({required super.service});
 
   //A session should not being created from the mobile application.
   //Please provide a CheckoutSession object from your own backend.
@@ -35,8 +32,8 @@ class AdyenDropInRepository extends AdyenBaseRepository {
             countryCode: Config.countryCode,
             shopperLocale: Config.shopperLocale,
             shopperReference: Config.shopperReference,
-            storePaymentMethodMode:
-                StorePaymentMethodMode.askForConsent.storePaymentMethodModeString,
+            storePaymentMethodMode: StorePaymentMethodMode
+                .askForConsent.storePaymentMethodModeString,
             recurringProcessingModel:
                 RecurringProcessingModel.cardOnFile.recurringModelString,
             shopperInteraction:

diff --git a/example/lib/screens/drop_in/drop_in_screen.dart b/example/lib/screens/drop_in/drop_in_screen.dart
@@ -9,11 +9,9 @@ import 'package:flutter/material.dart';
 class DropInScreen extends StatefulWidget {
   const DropInScreen({
     required this.repository,
-    required this.adyenCheckout,
     super.key,
   });
 
-  final AdyenCheckout adyenCheckout;
   final AdyenDropInRepository repository;
 
   @override
@@ -47,33 +45,38 @@ class _DropInScreenState extends State<DropInScreen> {
   }
 
   Future<void> startDropInSessions() async {
-    final SessionResponseNetworkModel sessionResponse =
-        await widget.repository.fetchSession();
-    final DropInConfiguration dropInConfiguration =
-        await _createDropInConfiguration();
-
-    final Session session = await widget.adyenCheckout.createSession(
-      sessionId: sessionResponse.id,
-      sessionData: sessionResponse.sessionData,
-      configuration: dropInConfiguration,
-    );
-
-    final PaymentResult paymentResult = await widget.adyenCheckout.startPayment(
-      paymentFlow: DropInSessionFlow(
-        dropInConfiguration: dropInConfiguration,
-        session: session,
-      ),
-    );
+    try {
+      final SessionResponseNetworkModel sessionResponse =
+          await widget.repository.fetchSession();
+      final DropInConfiguration dropInConfiguration =
+          await _createDropInConfiguration();
+
+      final Session session = await AdyenCheckout.instance.createSession(
+        sessionId: sessionResponse.id,
+        sessionData: sessionResponse.sessionData,
+        configuration: dropInConfiguration,
+      );
+
+      final PaymentResult paymentResult =
+          await AdyenCheckout.instance.startPayment(
+        paymentFlow: DropInSessionFlow(
+          dropInConfiguration: dropInConfiguration,
+          session: session,
+        ),
+      );
 
-    _showPaymentResultDialog(paymentResult);
+      _showPaymentResultDialog(paymentResult);
+    } catch (error) {
+      debugPrint(error.toString());
+    }
   }
 
   Future<void> startDropInAdvancedFlow() async {
     final paymentMethodsResponse =
         await widget.repository.fetchPaymentMethods();
     final dropInConfiguration = await _createDropInConfiguration();
 
-    final paymentResult = await widget.adyenCheckout.startPayment(
+    final paymentResult = await AdyenCheckout.instance.startPayment(
       paymentFlow: DropInAdvancedFlow(
         dropInConfiguration: dropInConfiguration,
         paymentMethodsResponse: paymentMethodsResponse,