Merge pull request #81 from Adyen/adjustAndroidPackageName

Adjust android package name
Adyen · Dec 18, 2023 · fad6a10 · fad6a10
2 parents bcdfecc + b404f1e
commit fad6a10
Show file tree

Hide file tree

Showing 58 changed files with 129 additions and 148 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: 'ktlint.gradle'
 
 android {
-    namespace = "com.adyen.adyen_checkout"
+    namespace = "com.adyen.checkout.flutter"
     compileSdk 34
 
     compileOptions {

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.adyen.adyen_checkout">
+    package="com.adyen.checkout.flutter">
 
     <application>
         <service android:name=".dropIn.session.SessionDropInService" />

diff --git a/...in/kotlin/com/adyen/adyen_checkout/components/card/session/CardSessionComponentFactory.kt b/...in/kotlin/com/adyen/adyen_checkout/components/card/session/CardSessionComponentFactory.kt
diff --git a/...yen/adyen_checkout/AdyenCheckoutPlugin.kt → ...n/checkout/flutter/AdyenCheckoutPlugin.kt b/...yen/adyen_checkout/AdyenCheckoutPlugin.kt → ...n/checkout/flutter/AdyenCheckoutPlugin.kt
@@ -1,4 +1,4 @@
-package com.adyen.adyen_checkout
+package com.adyen.checkout.flutter
 
 import CheckoutPlatformInterface
 import ComponentFlutterInterface
@@ -8,14 +8,14 @@ import DropInPlatformInterface
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
-import com.adyen.adyen_checkout.components.ComponentPlatformApi
-import com.adyen.adyen_checkout.components.card.CardComponentFactory
-import com.adyen.adyen_checkout.components.card.CardComponentFactory.Companion.cardComponentAdvancedId
-import com.adyen.adyen_checkout.components.card.CardComponentFactory.Companion.cardComponentSessionId
-import com.adyen.adyen_checkout.dropIn.DropInPlatformApi
-import com.adyen.adyen_checkout.session.SessionHolder
-import com.adyen.adyen_checkout.utils.Constants.Companion.WRONG_FLUTTER_ACTIVITY_USAGE_ERROR_MESSAGE
 import com.adyen.checkout.dropin.DropIn
+import com.adyen.checkout.flutter.components.ComponentPlatformApi
+import com.adyen.checkout.flutter.components.card.CardComponentFactory
+import com.adyen.checkout.flutter.components.card.CardComponentFactory.Companion.cardComponentAdvancedId
+import com.adyen.checkout.flutter.components.card.CardComponentFactory.Companion.cardComponentSessionId
+import com.adyen.checkout.flutter.dropIn.DropInPlatformApi
+import com.adyen.checkout.flutter.session.SessionHolder
+import com.adyen.checkout.flutter.utils.Constants.Companion.WRONG_FLUTTER_ACTIVITY_USAGE_ERROR_MESSAGE
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.embedding.engine.plugins.FlutterPlugin.FlutterPluginBinding
 import io.flutter.embedding.engine.plugins.activity.ActivityAware

diff --git a/...yen/adyen_checkout/CheckoutPlatformApi.kt → ...n/checkout/flutter/CheckoutPlatformApi.kt b/...yen/adyen_checkout/CheckoutPlatformApi.kt → ...n/checkout/flutter/CheckoutPlatformApi.kt
@@ -1,4 +1,4 @@
-package com.adyen.adyen_checkout
+package com.adyen.checkout.flutter
 
 import CardComponentConfigurationDTO
 import CheckoutPlatformInterface
@@ -7,15 +7,15 @@ import SessionDTO
 import android.util.Log
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.lifecycleScope
-import com.adyen.adyen_checkout.session.SessionHolder
-import com.adyen.adyen_checkout.utils.ConfigurationMapper.mapToAnalyticsConfiguration
-import com.adyen.adyen_checkout.utils.ConfigurationMapper.mapToDropInConfiguration
-import com.adyen.adyen_checkout.utils.ConfigurationMapper.toNativeModel
 import com.adyen.checkout.components.core.OrderRequest
 import com.adyen.checkout.components.core.PaymentMethodsApiResponse
 import com.adyen.checkout.components.core.internal.Configuration
 import com.adyen.checkout.core.AdyenLogger
 import com.adyen.checkout.core.internal.util.Logger.NONE
+import com.adyen.checkout.flutter.session.SessionHolder
+import com.adyen.checkout.flutter.utils.ConfigurationMapper.mapToAnalyticsConfiguration
+import com.adyen.checkout.flutter.utils.ConfigurationMapper.mapToDropInConfiguration
+import com.adyen.checkout.flutter.utils.ConfigurationMapper.toNativeModel
 import com.adyen.checkout.redirect.RedirectComponent
 import com.adyen.checkout.sessions.core.CheckoutSessionProvider
 import com.adyen.checkout.sessions.core.CheckoutSessionResult

diff --git a/...n/com/adyen/adyen_checkout/PlatformApi.kt → ...com/adyen/checkout/flutter/PlatformApi.kt b/...n/com/adyen/adyen_checkout/PlatformApi.kt → ...com/adyen/checkout/flutter/PlatformApi.kt
diff --git a/...checkout/components/ComponentMessenger.kt → .../flutter/components/ComponentMessenger.kt b/...checkout/components/ComponentMessenger.kt → .../flutter/components/ComponentMessenger.kt
@@ -1,9 +1,9 @@
-package com.adyen.adyen_checkout.components
+package com.adyen.checkout.flutter.components
 
 import ErrorDTO
 import PaymentResultModelDTO
 import androidx.lifecycle.LiveData
-import com.adyen.adyen_checkout.utils.Event
+import com.adyen.checkout.flutter.utils.Event
 import org.json.JSONObject
 
 

diff --git a/...eckout/components/ComponentPlatformApi.kt → ...lutter/components/ComponentPlatformApi.kt b/...eckout/components/ComponentPlatformApi.kt → ...lutter/components/ComponentPlatformApi.kt
@@ -1,4 +1,4 @@
-package com.adyen.adyen_checkout.components
+package com.adyen.checkout.flutter.components
 
 import ComponentPlatformInterface
 import ErrorDTO

diff --git a/...eckout/components/ComponentWrapperView.kt → ...lutter/components/ComponentWrapperView.kt b/...eckout/components/ComponentWrapperView.kt → ...lutter/components/ComponentWrapperView.kt
@@ -1,4 +1,4 @@
-package com.adyen.adyen_checkout.components
+package com.adyen.checkout.flutter.components
 
 import ComponentCommunicationModel
 import ComponentCommunicationType
@@ -9,8 +9,8 @@ import android.widget.FrameLayout
 import androidx.activity.ComponentActivity
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.lifecycle.lifecycleScope
-import com.adyen.adyen_checkout.R
 import com.adyen.checkout.components.core.internal.Component
+import com.adyen.checkout.flutter.R
 import com.adyen.checkout.ui.core.AdyenComponentView
 import com.adyen.checkout.ui.core.internal.ui.ViewableComponent
 import com.google.android.material.button.MaterialButton

diff --git a/...kout/components/card/BaseCardComponent.kt → ...tter/components/card/BaseCardComponent.kt b/...kout/components/card/BaseCardComponent.kt → ...tter/components/card/BaseCardComponent.kt
@@ -1,4 +1,4 @@
-package com.adyen.adyen_checkout.components.card
+package com.adyen.checkout.flutter.components.card
 
 import CardComponentConfigurationDTO
 import ComponentFlutterInterface
@@ -14,15 +14,15 @@ import androidx.core.util.Consumer
 import androidx.core.view.children
 import androidx.core.view.doOnNextLayout
 import androidx.core.view.updateLayoutParams
-import com.adyen.adyen_checkout.R
-import com.adyen.adyen_checkout.components.ComponentActionMessenger
-import com.adyen.adyen_checkout.components.ComponentErrorMessenger
-import com.adyen.adyen_checkout.components.ComponentHeightMessenger
-import com.adyen.adyen_checkout.components.ComponentResultMessenger
-import com.adyen.adyen_checkout.components.ComponentWrapperView
-import com.adyen.adyen_checkout.utils.ConfigurationMapper.mapToAnalyticsConfiguration
-import com.adyen.adyen_checkout.utils.ConfigurationMapper.toNativeModel
 import com.adyen.checkout.card.CardComponent
+import com.adyen.checkout.flutter.R
+import com.adyen.checkout.flutter.components.ComponentActionMessenger
+import com.adyen.checkout.flutter.components.ComponentErrorMessenger
+import com.adyen.checkout.flutter.components.ComponentHeightMessenger
+import com.adyen.checkout.flutter.components.ComponentResultMessenger
+import com.adyen.checkout.flutter.components.ComponentWrapperView
+import com.adyen.checkout.flutter.utils.ConfigurationMapper.mapToAnalyticsConfiguration
+import com.adyen.checkout.flutter.utils.ConfigurationMapper.toNativeModel
 import com.adyen.checkout.redirect.RedirectComponent
 import com.adyen.checkout.ui.core.AdyenComponentView
 import io.flutter.plugin.platform.PlatformView

diff --git a/...t/components/card/CardComponentFactory.kt → ...r/components/card/CardComponentFactory.kt b/...t/components/card/CardComponentFactory.kt → ...r/components/card/CardComponentFactory.kt
@@ -1,11 +1,11 @@
-package com.adyen.adyen_checkout.components.card
+package com.adyen.checkout.flutter.components.card
 
 import ComponentFlutterInterface
 import android.content.Context
 import androidx.fragment.app.FragmentActivity
-import com.adyen.adyen_checkout.components.card.advanced.CardAdvancedComponent
-import com.adyen.adyen_checkout.components.card.session.CardSessionComponent
-import com.adyen.adyen_checkout.session.SessionHolder
+import com.adyen.checkout.flutter.components.card.advanced.CardAdvancedComponent
+import com.adyen.checkout.flutter.components.card.session.CardSessionComponent
+import com.adyen.checkout.flutter.session.SessionHolder
 import io.flutter.plugin.platform.PlatformView
 import io.flutter.plugin.platform.PlatformViewFactory
 

diff --git a/...nts/card/advanced/CardAdvancedCallback.kt → ...nts/card/advanced/CardAdvancedCallback.kt b/...nts/card/advanced/CardAdvancedCallback.kt → ...nts/card/advanced/CardAdvancedCallback.kt
@@ -1,14 +1,14 @@
-package com.adyen.adyen_checkout.components.card.advanced
+package com.adyen.checkout.flutter.components.card.advanced
 
 import ComponentCommunicationModel
 import ComponentCommunicationType
 import ComponentFlutterInterface
-import com.adyen.adyen_checkout.components.ComponentHeightMessenger
 import com.adyen.checkout.card.CardComponentState
 import com.adyen.checkout.components.core.ActionComponentData
 import com.adyen.checkout.components.core.ComponentCallback
 import com.adyen.checkout.components.core.ComponentError
 import com.adyen.checkout.components.core.PaymentComponentData
+import com.adyen.checkout.flutter.components.ComponentHeightMessenger
 
 class CardAdvancedCallback(private val componentFlutterApi: ComponentFlutterInterface) :
     ComponentCallback<CardComponentState> {

diff --git a/...ts/card/advanced/CardAdvancedComponent.kt → ...ts/card/advanced/CardAdvancedComponent.kt b/...ts/card/advanced/CardAdvancedComponent.kt → ...ts/card/advanced/CardAdvancedComponent.kt
@@ -1,4 +1,4 @@
-package com.adyen.adyen_checkout.components.card.advanced
+package com.adyen.checkout.flutter.components.card.advanced
 
 import ComponentCommunicationModel
 import ComponentCommunicationType
@@ -9,15 +9,15 @@ import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.core.view.doOnNextLayout
 import androidx.fragment.app.FragmentActivity
-import com.adyen.adyen_checkout.R
-import com.adyen.adyen_checkout.components.ComponentActionMessenger
-import com.adyen.adyen_checkout.components.ComponentErrorMessenger
-import com.adyen.adyen_checkout.components.ComponentResultMessenger
-import com.adyen.adyen_checkout.components.card.BaseCardComponent
 import com.adyen.checkout.card.CardComponent
 import com.adyen.checkout.components.core.PaymentMethod
 import com.adyen.checkout.components.core.StoredPaymentMethod
 import com.adyen.checkout.components.core.action.Action
+import com.adyen.checkout.flutter.R
+import com.adyen.checkout.flutter.components.ComponentActionMessenger
+import com.adyen.checkout.flutter.components.ComponentErrorMessenger
+import com.adyen.checkout.flutter.components.ComponentResultMessenger
+import com.adyen.checkout.flutter.components.card.BaseCardComponent
 import com.adyen.checkout.ui.core.AdyenComponentView
 import org.json.JSONObject
 import java.util.UUID

diff --git a/...nents/card/session/CardSessionCallback.kt → ...nents/card/session/CardSessionCallback.kt b/...nents/card/session/CardSessionCallback.kt → ...nents/card/session/CardSessionCallback.kt
@@ -1,14 +1,14 @@
-package com.adyen.adyen_checkout.components.card.session
+package com.adyen.checkout.flutter.components.card.session
 
 import ComponentCommunicationModel
 import ComponentCommunicationType
 import ComponentFlutterInterface
 import PaymentResultModelDTO
-import com.adyen.adyen_checkout.components.ComponentHeightMessenger
-import com.adyen.adyen_checkout.utils.ConfigurationMapper.mapToOrderResponseModel
 import com.adyen.checkout.card.CardComponentState
 import com.adyen.checkout.components.core.ComponentError
 import com.adyen.checkout.components.core.action.Action
+import com.adyen.checkout.flutter.components.ComponentHeightMessenger
+import com.adyen.checkout.flutter.utils.ConfigurationMapper.mapToOrderResponseModel
 import com.adyen.checkout.sessions.core.SessionComponentCallback
 import com.adyen.checkout.sessions.core.SessionPaymentResult
 

diff --git a/...ents/card/session/CardSessionComponent.kt → ...ents/card/session/CardSessionComponent.kt b/...ents/card/session/CardSessionComponent.kt → ...ents/card/session/CardSessionComponent.kt
@@ -1,4 +1,4 @@
-package com.adyen.adyen_checkout.components.card.session
+package com.adyen.checkout.flutter.components.card.session
 
 import ComponentFlutterInterface
 import android.content.Context
@@ -7,14 +7,14 @@ import android.view.ViewGroup
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.doOnNextLayout
 import androidx.fragment.app.FragmentActivity
-import com.adyen.adyen_checkout.R
-import com.adyen.adyen_checkout.components.card.BaseCardComponent
-import com.adyen.adyen_checkout.session.SessionHolder
 import com.adyen.checkout.card.CardComponent
 import com.adyen.checkout.components.core.Order
 import com.adyen.checkout.components.core.PaymentMethod
 import com.adyen.checkout.components.core.StoredPaymentMethod
 import com.adyen.checkout.components.core.action.Action
+import com.adyen.checkout.flutter.R
+import com.adyen.checkout.flutter.components.card.BaseCardComponent
+import com.adyen.checkout.flutter.session.SessionHolder
 import com.adyen.checkout.sessions.core.CheckoutSession
 import com.adyen.checkout.sessions.core.SessionSetupResponse
 import com.adyen.checkout.ui.core.AdyenComponentView

diff --git a/...dyen_checkout/dropIn/DropInPlatformApi.kt → ...ckout/flutter/dropIn/DropInPlatformApi.kt b/...dyen_checkout/dropIn/DropInPlatformApi.kt → ...ckout/flutter/dropIn/DropInPlatformApi.kt
@@ -1,4 +1,4 @@
-package com.adyen.adyen_checkout.dropIn
+package com.adyen.checkout.flutter.dropIn
 
 import DeletedStoredPaymentMethodResultDTO
 import DropInConfigurationDTO
@@ -14,18 +14,6 @@ import PlatformCommunicationType
 import androidx.activity.result.ActivityResultLauncher
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.lifecycleScope
-import com.adyen.adyen_checkout.dropIn.advanced.AdvancedDropInService
-import com.adyen.adyen_checkout.dropIn.advanced.DropInAdditionalDetailsPlatformMessenger
-import com.adyen.adyen_checkout.dropIn.advanced.DropInAdditionalDetailsResultMessenger
-import com.adyen.adyen_checkout.dropIn.advanced.DropInPaymentMethodDeletionPlatformMessenger
-import com.adyen.adyen_checkout.dropIn.advanced.DropInPaymentMethodDeletionResultMessenger
-import com.adyen.adyen_checkout.dropIn.advanced.DropInPaymentResultMessenger
-import com.adyen.adyen_checkout.dropIn.advanced.DropInServiceResultMessenger
-import com.adyen.adyen_checkout.dropIn.models.DropInType
-import com.adyen.adyen_checkout.dropIn.session.SessionDropInService
-import com.adyen.adyen_checkout.session.SessionHolder
-import com.adyen.adyen_checkout.utils.ConfigurationMapper.mapToDropInConfiguration
-import com.adyen.adyen_checkout.utils.ConfigurationMapper.mapToOrderResponseModel
 import com.adyen.checkout.components.core.Order
 import com.adyen.checkout.components.core.PaymentMethodsApiResponse
 import com.adyen.checkout.dropin.DropIn
@@ -35,6 +23,18 @@ import com.adyen.checkout.dropin.SessionDropInCallback
 import com.adyen.checkout.dropin.SessionDropInResult
 import com.adyen.checkout.dropin.internal.ui.model.DropInResultContractParams
 import com.adyen.checkout.dropin.internal.ui.model.SessionDropInResultContractParams
+import com.adyen.checkout.flutter.dropIn.advanced.AdvancedDropInService
+import com.adyen.checkout.flutter.dropIn.advanced.DropInAdditionalDetailsPlatformMessenger
+import com.adyen.checkout.flutter.dropIn.advanced.DropInAdditionalDetailsResultMessenger
+import com.adyen.checkout.flutter.dropIn.advanced.DropInPaymentMethodDeletionPlatformMessenger
+import com.adyen.checkout.flutter.dropIn.advanced.DropInPaymentMethodDeletionResultMessenger
+import com.adyen.checkout.flutter.dropIn.advanced.DropInPaymentResultMessenger
+import com.adyen.checkout.flutter.dropIn.advanced.DropInServiceResultMessenger
+import com.adyen.checkout.flutter.dropIn.model.DropInType
+import com.adyen.checkout.flutter.dropIn.session.SessionDropInService
+import com.adyen.checkout.flutter.session.SessionHolder
+import com.adyen.checkout.flutter.utils.ConfigurationMapper.mapToDropInConfiguration
+import com.adyen.checkout.flutter.utils.ConfigurationMapper.mapToOrderResponseModel
 import com.adyen.checkout.sessions.core.CheckoutSession
 import com.adyen.checkout.sessions.core.SessionSetupResponse
 import kotlinx.coroutines.Dispatchers

diff --git a/.../dropIn/advanced/AdvancedDropInService.kt → .../dropIn/advanced/AdvancedDropInService.kt b/.../dropIn/advanced/AdvancedDropInService.kt → .../dropIn/advanced/AdvancedDropInService.kt
@@ -1,4 +1,4 @@
-package com.adyen.adyen_checkout.dropIn.advanced
+package com.adyen.checkout.flutter.dropIn.advanced
 
 import DeletedStoredPaymentMethodResultDTO
 import ErrorDTO
@@ -9,8 +9,6 @@ import android.os.IBinder
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ServiceLifecycleDispatcher
-import com.adyen.adyen_checkout.dropIn.models.DropInStoredPaymentMethodDeletionModel
-import com.adyen.adyen_checkout.dropIn.models.DropInType
 import com.adyen.checkout.components.core.ActionComponentData
 import com.adyen.checkout.components.core.PaymentComponentData
 import com.adyen.checkout.components.core.PaymentComponentState
@@ -20,6 +18,8 @@ import com.adyen.checkout.dropin.DropInService
 import com.adyen.checkout.dropin.DropInServiceResult
 import com.adyen.checkout.dropin.ErrorDialog
 import com.adyen.checkout.dropin.RecurringDropInServiceResult
+import com.adyen.checkout.flutter.dropIn.model.DropInStoredPaymentMethodDeletionModel
+import com.adyen.checkout.flutter.dropIn.model.DropInType
 import org.json.JSONObject
 
 class AdvancedDropInService : DropInService(), LifecycleOwner {

diff --git a/.../advanced/DropInServiceResultMessenger.kt → .../advanced/DropInServiceResultMessenger.kt b/.../advanced/DropInServiceResultMessenger.kt → .../advanced/DropInServiceResultMessenger.kt
@@ -1,10 +1,10 @@
-package com.adyen.adyen_checkout.dropIn.advanced
+package com.adyen.checkout.flutter.dropIn.advanced
 
 import DeletedStoredPaymentMethodResultDTO
 import PaymentEventDTO
 import androidx.lifecycle.LiveData
-import com.adyen.adyen_checkout.dropIn.models.DropInStoredPaymentMethodDeletionModel
-import com.adyen.adyen_checkout.utils.Event
+import com.adyen.checkout.flutter.dropIn.model.DropInStoredPaymentMethodDeletionModel
+import com.adyen.checkout.flutter.utils.Event
 import org.json.JSONObject
 
 class DropInServiceResultMessenger : LiveData<Event<JSONObject>>() {

diff --git a/...DropInStoredPaymentMethodDeletionModel.kt → ...DropInStoredPaymentMethodDeletionModel.kt b/...DropInStoredPaymentMethodDeletionModel.kt → ...DropInStoredPaymentMethodDeletionModel.kt
@@ -1,4 +1,4 @@
-package com.adyen.adyen_checkout.dropIn.models
+package com.adyen.checkout.flutter.dropIn.model
 
 data class DropInStoredPaymentMethodDeletionModel(
     val storedPaymentMethodId: String,

diff --git a/...dyen_checkout/dropIn/models/DropInType.kt → ...eckout/flutter/dropIn/model/DropInType.kt b/...dyen_checkout/dropIn/models/DropInType.kt → ...eckout/flutter/dropIn/model/DropInType.kt
@@ -1,4 +1,4 @@
-package com.adyen.adyen_checkout.dropIn.models
+package com.adyen.checkout.flutter.dropIn.model
 
 enum class DropInType {
     SESSION,

diff --git a/...ut/dropIn/session/SessionDropInService.kt → ...er/dropIn/session/SessionDropInService.kt b/...ut/dropIn/session/SessionDropInService.kt → ...er/dropIn/session/SessionDropInService.kt
@@ -1,19 +1,19 @@
-package com.adyen.adyen_checkout.dropIn.session
+package com.adyen.checkout.flutter.dropIn.session
 
 import DeletedStoredPaymentMethodResultDTO
 import android.content.Intent
 import android.os.IBinder
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ServiceLifecycleDispatcher
-import com.adyen.adyen_checkout.dropIn.advanced.DropInPaymentMethodDeletionPlatformMessenger
-import com.adyen.adyen_checkout.dropIn.advanced.DropInPaymentMethodDeletionResultMessenger
-import com.adyen.adyen_checkout.dropIn.models.DropInStoredPaymentMethodDeletionModel
-import com.adyen.adyen_checkout.dropIn.models.DropInType
 import com.adyen.checkout.components.core.StoredPaymentMethod
 import com.adyen.checkout.dropin.ErrorDialog
 import com.adyen.checkout.dropin.RecurringDropInServiceResult
 import com.adyen.checkout.dropin.SessionDropInService
+import com.adyen.checkout.flutter.dropIn.advanced.DropInPaymentMethodDeletionPlatformMessenger
+import com.adyen.checkout.flutter.dropIn.advanced.DropInPaymentMethodDeletionResultMessenger
+import com.adyen.checkout.flutter.dropIn.model.DropInStoredPaymentMethodDeletionModel
+import com.adyen.checkout.flutter.dropIn.model.DropInType
 
 class SessionDropInService : SessionDropInService(), LifecycleOwner {
     private val dispatcher = ServiceLifecycleDispatcher(this)

diff --git a/...n/adyen_checkout/session/SessionHolder.kt → ...checkout/flutter/session/SessionHolder.kt b/...n/adyen_checkout/session/SessionHolder.kt → ...checkout/flutter/session/SessionHolder.kt
@@ -1,4 +1,4 @@
-package com.adyen.adyen_checkout.session
+package com.adyen.checkout.flutter.session
 
 import org.json.JSONObject
 

diff --git a/...yen_checkout/utils/ConfigurationMapper.kt → ...kout/flutter/utils/ConfigurationMapper.kt b/...yen_checkout/utils/ConfigurationMapper.kt → ...kout/flutter/utils/ConfigurationMapper.kt
@@ -1,4 +1,4 @@
-package com.adyen.adyen_checkout.utils
+package com.adyen.checkout.flutter.utils
 
 import AddressMode
 import AmountDTO

diff --git a/...m/adyen/adyen_checkout/utils/Constants.kt → ...adyen/checkout/flutter/utils/Constants.kt b/...m/adyen/adyen_checkout/utils/Constants.kt → ...adyen/checkout/flutter/utils/Constants.kt
@@ -1,4 +1,4 @@
-package com.adyen.adyen_checkout.utils
+package com.adyen.checkout.flutter.utils
 
 class Constants {
     companion object {

diff --git a/...n/com/adyen/adyen_checkout/utils/Event.kt → ...com/adyen/checkout/flutter/utils/Event.kt b/...n/com/adyen/adyen_checkout/utils/Event.kt → ...com/adyen/checkout/flutter/utils/Event.kt
@@ -1,4 +1,4 @@
-package com.adyen.adyen_checkout.utils
+package com.adyen.checkout.flutter.utils
 
 import androidx.annotation.Nullable