@usercentrics/react-native-sdk 2.2.2-RC1 → 2.5.1

package/CHANGELOG.md

@@ -0,0 +1,96 @@
+[Release Notes](https://docs.usercentrics.com/cmp_in_app_sdk/latest/about/history/)
+
+# 2.5.1
+
+## Resolved Issues
+
+    * TCF String solved issue with encoding to shorten the length of the string
+
+# 2.5.0
+
+## Features
+
+- **[UI]** Controller ID section was redesigned to have a better UX.
+- `CCPAData` exposes the encoded `uspString`.
+
+## Improvements
+
+- Improve stability and performance issues.
+
+## Resolved Issues
+
+- General bug fixes.
+- **[iOS]** Access to `rootViewController` depending on API version.
+
+# 2.4.0
+
+## Features
+
+- **[Customization]** You now have full control over the appearance of the First & Second Layer via our Admin Interface Style options and our Programmatic API. We have updated and extended our Programmatic API to simplify banner customization.
+- **[UI]** Legal links are now added to our the First Layer, and can be hidden or shown as desired via programmatic API.
+- **[CCPA]** Consent button can now be customized via the Admin Interface.
+
+## Improvements
+
+- Improve initialization flow for stability and avoid edge case crashes.
+
+## Resolved Issues
+
+- Solve stability issues and bug fixes.
+
+# 2.3.0
+
+## Features
+
+- **[API Update]** `shouldShowCMP` has been deprecated in favor of `shouldCollectConsent`. See [Initializing the SDK](https://docs.usercentrics.com/cmp_in_app_sdk/latest/getting_started/initialize/#initializing-the-sdk)
+- **[Banner API v2]** Banner API v1 is now discontinued and removed from the SDK. If you don't wish to upgrade, please stick to v2.0.3 to avoid unexpected behaviour. See the [alert in the "Banner API V1" tab](https://docs.usercentrics.com/cmp_in_app_sdk/latest/collect_consent/present_cmp/)
+- **[Banner API v2]** BannerSettings now requires a BannerFont object to pass a Bold and Regular font separately to apply for both layers. See [Banner Settings](https://docs.usercentrics.com/cmp_in_app_sdk/latest/collect_consent/customize_cmp/#banner-style-settings)
+- **[Demo App]** You can now find a demo app in our documentation to test out your configuration before writing a single line of code. See [Sample Apps](https://docs.usercentrics.com/cmp_in_app_sdk/latest/samples/ios-android-demos/).
+
+## Improvements
+
+- Updates to TCF 2.0 framework.
+
+## Resolved Issues
+
+- Issue with position of logo on Second Layer is now solved.
+- UI/UX improvements and fixes.
+
+# 2.2.1
+
+## Features
+
+- **[Banner API v2]** A complete revamp of our banner API will enable you to have high customisation and versatility to build a end-user friendly consent banner. We can't wait for you to give it a try. For more details, see: Presenting the Banner.
+    - Add a Header Image to your banner.
+    - Have full control over the layour of your action buttons with Column, Row or Grid configurations.
+    - Launch the second layer directly.
+    - Landscape Mode support.
+    - You can now add a "More Information" link to your banner message to forward users to the 2nd Layer. Appearance > Settings > More Information Link in Banner Message. Then you will be able to add this link in the banner message text editor.
+- **[Usability]** Collect consent only at a category level. Option available in your Admin Interface: Configure > Legal Specifications > Settings > Category Consent.
+- **[CNIL]** "Continue wthout Accepting" feature is now supported. (French regulation)
+- **[Fonts]** Admin Interface fonts are now deprecated for App. To enable custom fonts, please inject the font via banner API.
+
+## Improvements
+
+- **[API]** Expose user's consent history.
+- **[TCF 2.0]** Adding support to actively inform users when vendors are sharing data outside a region.
+- **[CCPA]** Improve API to facilitate compliance with new Banner API.
+
+## Resolved Issues
+- **[TCF 2.0]** Minor design upgrades to improve usability.
+- **[iOS]** Edge case with RestoreUserSession failing is now solved.
+- **[iOS]** Issue with local and remote images losing quality is now solved.
+- UI/UX improvements and fixes.
+
+# 2.0.3
+
+- Minor fix on UI related to consent toggles.
+- Corner radius on iOS.
+
+# 2.0.2
+
+- Custom UI API.
+
+# 2.0.1
+
+- Initial version of the library.

package/android/build.gradle

@@ -1,4 +1,4 @@
-def usercentrics_version = "2.2.1"
+def usercentrics_version = "2.5.1"
 version usercentrics_version
 
 buildscript {

package/android/src/androidTest/java/com/usercentrics/reactnativemodule/RNUsercentricsModuleTest.kt

@@ -2,7 +2,10 @@ package com.usercentrics.reactnativemodule
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import com.facebook.react.bridge.*
+import com.facebook.react.bridge.JavaOnlyMap
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.WritableArray
+import com.facebook.react.bridge.WritableMap
 import com.facebook.soloader.SoLoader
 import com.usercentrics.reactnativemodule.api.FakeUsercentricsProxy
 import com.usercentrics.reactnativemodule.fake.FakePromise
@@ -12,15 +15,16 @@ import com.usercentrics.reactnativeusercentrics.extensions.serialize
 import com.usercentrics.reactnativeusercentrics.extensions.toWritableMap
 import com.usercentrics.sdk.*
 import com.usercentrics.sdk.errors.UsercentricsError
+import com.usercentrics.sdk.models.common.NetworkMode
 import com.usercentrics.sdk.models.common.UsercentricsLoggerLevel
 import com.usercentrics.sdk.models.common.UsercentricsVariant
 import com.usercentrics.sdk.models.settings.UsercentricsConsentType
 import com.usercentrics.sdk.services.tcf.TCFDecisionUILayer
+import com.usercentrics.sdk.services.tcf.interfaces.TCFData
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertThrows
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -34,6 +38,7 @@ class RNUsercentricsModuleTest {
             putInt("loggerlevel", 0)
             putInt("timeoutMillis", 1000)
             putString("version", "1.2.3")
+            putInt("networkMode", 1)
         }
 
         private val usercentricsConsentHistoryEntries = listOf(
@@ -45,7 +50,7 @@ class RNUsercentricsModuleTest {
         )
 
         private val usercentricsReadyStatus = UsercentricsReadyStatus(
-            shouldShowCMP = false,
+            shouldCollectConsent = false,
             consents = listOf(
                 UsercentricsServiceConsent(
                     templateId = "ocv9HNX_g",
@@ -58,37 +63,6 @@ class RNUsercentricsModuleTest {
                 )
             )
         )
-
-        private val usercentricsUIOptions = JavaOnlyMap().apply {
-            putBoolean("showCloseButton", false)
-            putMap("customLogo", JavaOnlyMap().apply {
-                putString("logoName", "logo.png")
-                putString(
-                    "logoPath",
-                    "http://10.0.2.2:8081/assets/assets/images/logo.png"
-                )
-            })
-            putMap("customFont", JavaOnlyMap().apply {
-                putString("fontName", "Lora")
-                putInt("fontSize", 14)
-            })
-        }
-
-        private val usercentricsConsentUserResponse = UsercentricsConsentUserResponse(
-            consents = listOf(
-                UsercentricsServiceConsent(
-                    templateId = "ocv9HNX_g",
-                    status = false,
-                    dataProcessor = "Facebook SDK",
-                    type = UsercentricsConsentType.EXPLICIT,
-                    version = "1.0.1",
-                    isEssential = false,
-                    history = usercentricsConsentHistoryEntries
-                )
-            ),
-            controllerId = "8620135313b043696b806868b20da905886a3a2598ddddc2b52973f9807d6b45",
-            userInteraction = UsercentricsUserInteraction.ACCEPT_ALL
-        )
     }
 
     @Before
@@ -123,6 +97,7 @@ class RNUsercentricsModuleTest {
         )
         assertEquals(1000L, usercentricsProxy.initializeOptionsArgument?.timeoutMillis)
         assertEquals("1.2.3", usercentricsProxy.initializeOptionsArgument?.version)
+        assertEquals(NetworkMode.EU, usercentricsProxy.initializeOptionsArgument?.networkMode)
     }
 
     @Test
@@ -148,7 +123,7 @@ class RNUsercentricsModuleTest {
         val consent = result.getArray("consents")?.getMap(0)!!
 
         assertEquals(1, usercentricsProxy.isReadyCount)
-        assertEquals(false, result.getBoolean("shouldShowCMP"))
+        assertEquals(false, result.getBoolean("shouldCollectConsent"))
         assertEquals(false, consent.getBoolean("status"))
         assertEquals("ocv9HNX_g", consent.getString("templateId"))
         assertEquals("Facebook SDK", consent.getString("dataProcessor"))
@@ -191,7 +166,7 @@ class RNUsercentricsModuleTest {
         val result = promise.resolveValue as WritableMap
         val consent = result.getArray("consents")?.getMap(0)!!
 
-        assertEquals(false, result.getBoolean("shouldShowCMP"))
+        assertEquals(false, result.getBoolean("shouldCollectConsent"))
         assertEquals(false, consent.getBoolean("status"))
         assertEquals("ocv9HNX_g", consent.getString("templateId"))
         assertEquals("Facebook SDK", consent.getString("dataProcessor"))
@@ -233,98 +208,6 @@ class RNUsercentricsModuleTest {
         assertEquals("abc", promise.resolveValue)
     }
 
-    @Test
-    fun testGetTCString() {
-        val usercentricsSDK = mockk<UsercentricsSDK>()
-        every { usercentricsSDK.getTCString() }.returns("abc")
-        val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
-        val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
-        val promise = FakePromise()
-
-        module.getTCFString(promise)
-
-        verify(exactly = 1) { usercentricsSDK.getTCString() }
-        assertEquals("abc", promise.resolveValue)
-    }
-
-    @Test
-    fun testShowCMP() {
-        val usercentricsProxy = FakeUsercentricsProxy()
-        usercentricsProxy.createIntentValue = mockk(relaxed = true)
-
-        val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
-        val promise = FakePromise()
-
-        module.showCMP(usercentricsUIOptions, promise)
-
-        val responseUsercentricsOptions = usercentricsProxy.usercentricsOptions!!
-        val customLogoURL =
-            (responseUsercentricsOptions.customLogo as UsercentricsImage.ImageUrl).imageUrl
-
-        assertEquals(false, responseUsercentricsOptions.showCloseButton)
-        assertEquals(
-            "http://10.0.2.2:8081/assets/assets/images/logo.png",
-            customLogoURL
-        )
-    }
-
-    @Test
-    fun testOnActivityResultWithOtherCode() {
-        val usercentricsProxy = FakeUsercentricsProxy()
-        val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
-
-        val otherRequestCode = 123
-        val consumed = module.parseActivityResult(otherRequestCode, 123, null)
-
-        assertEquals(false, consumed)
-    }
-
-    @Test
-    fun testOnActivityResultWithNoPendingResult() {
-        val usercentricsProxy = FakeUsercentricsProxy()
-        val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
-
-        assertThrows(AssertionError::class.java) {
-            module.parseActivityResult(81420, 123, null)
-        }
-    }
-
-    @Test
-    fun testOnActivityResultWithPendingResult() {
-        val resultCode = 123
-        val usercentricsProxy = FakeUsercentricsProxy()
-        usercentricsProxy.createIntentValue = mockk(relaxed = true)
-        usercentricsProxy.parseResultValue = usercentricsConsentUserResponse
-
-        val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
-
-        val promise = FakePromise()
-        module.showCMP(usercentricsUIOptions, promise)
-
-        module.parseActivityResult(81420, resultCode, null)
-
-        assertEquals(resultCode, usercentricsProxy.parseResultResultCodeArgument)
-
-        val result = promise.resolveValue as WritableMap
-        val consent = result.getArray("consents")?.getMap(0)!!
-
-        assertEquals(
-            "8620135313b043696b806868b20da905886a3a2598ddddc2b52973f9807d6b45",
-            result.getString("controllerId")
-        )
-        assertEquals(0, result.getInt("userInteraction"))
-        assertEquals(false, consent.getBoolean("status"))
-        assertEquals("ocv9HNX_g", consent.getString("templateId"))
-        assertEquals("Facebook SDK", consent.getString("dataProcessor"))
-        assertEquals(0, consent.getInt("type"))
-        assertEquals("1.0.1", consent.getString("version"))
-    }
-
     @Test
     fun testGetConsents() {
         val usercentricsSDK = mockk<UsercentricsSDK>()
@@ -412,7 +295,9 @@ class RNUsercentricsModuleTest {
     @Test
     fun testGetTCFData() {
         val usercentricsSDK = mockk<UsercentricsSDK>()
-        every { usercentricsSDK.getTCFData() }.returns(GetTCFDataMock.fake)
+        every { usercentricsSDK.getTCFData(any()) }.answers {
+            firstArg<(TCFData) -> Unit>().invoke(GetTCFDataMock.fake)
+        }
 
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
@@ -423,7 +308,7 @@ class RNUsercentricsModuleTest {
 
         val result = promise.resolveValue
 
-        verify(exactly = 1) { usercentricsSDK.getTCFData() }
+        verify(exactly = 1) { usercentricsSDK.getTCFData(any()) }
         assertEquals(GetTCFDataMock.expected.toWritableMap(), result)
     }
 
@@ -669,7 +554,6 @@ class RNUsercentricsModuleTest {
             GetConsentsMock.fakeWithData
         )
 
-
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
         val module = RNUsercentricsModule(contextMock, usercentricsProxy)
@@ -696,4 +580,4 @@ class RNUsercentricsModuleTest {
 
         assertEquals(1, usercentricsProxy.resetCount)
     }
-}
+}

package/android/src/androidTest/java/com/usercentrics/reactnativemodule/api/FakeUsercentricsProxy.kt

@@ -42,26 +42,6 @@ internal class FakeUsercentricsProxy(
         }
     }
 
-    var createIntentValue: Intent? = null
-    var usercentricsOptions: UsercentricsUISettings? = null
-        private set
-
-    override fun createIntent(
-        context: Context,
-        usercentricsOptions: UsercentricsUISettings
-    ): Intent {
-        this.usercentricsOptions = usercentricsOptions
-        return createIntentValue!!
-    }
-
-    var parseResultResultCodeArgument: Int = 0
-        private set
-    var parseResultValue: UsercentricsConsentUserResponse? = null
-    override fun parseResult(resultCode: Int, data: Intent?): UsercentricsConsentUserResponse? {
-        this.parseResultResultCodeArgument = resultCode
-        return parseResultValue
-    }
-
     var resetCount: Int = 0
         private set
 
@@ -73,19 +53,12 @@ internal class FakeUsercentricsProxy(
     var showFirstLayerBannerSettings: BannerSettings? = null
     var showFirstLayerStyle: FirstLayerStyleSettings? = null
 
-    override fun showFirstLayer(
-        activity: Activity,
-        layout: UsercentricsLayout,
-        bannerSettings: BannerSettings?,
-        firstLayerStyleSettings: FirstLayerStyleSettings?,
-        promise: Promise
-    ) {
+    override fun showFirstLayer(activity: Activity, layout: UsercentricsLayout, bannerSettings: BannerSettings?, promise: Promise) {
         this.showFirstLayerLayout = layout
         this.showFirstLayerBannerSettings = bannerSettings
-        this.showFirstLayerStyle = firstLayerStyleSettings
+        this.showFirstLayerStyle = bannerSettings?.firstLayerSettings
     }
 
-    override fun showSecondLayer() {
-
+    override fun showSecondLayer(activity: Activity, bannerSettings: BannerSettings?, promise: Promise) {
     }
-}
+}

package/android/src/androidTest/java/com/usercentrics/reactnativemodule/mock/GetTCFDataMock.kt

@@ -95,6 +95,7 @@ internal class GetTCFDataMock {
                     dataSharedOutsideEU = false
                 )
             ),
+            tcString = "abc"
         )
 
         // From the debugger
@@ -186,6 +187,7 @@ internal class GetTCFDataMock {
                     "dataSharedOutsideEU" to false
                 ),
             ),
+            "tcString" to "abc"
         )
     }
-}
+}

package/android/src/androidTest/java/com/usercentrics/reactnativemodule/mock/GetUSPDataMock.kt

@@ -13,6 +13,7 @@ internal class GetUSPDataMock {
 
         // From the debugger
         val expected = mapOf(
+            "uspString" to "1YN-",
             "version" to 1,
             "noticeGiven" to true,
             "optedOut" to false,

package/android/src/main/java/com/usercentrics/reactnativeusercentrics/RNUsercentricsModule.kt

@@ -1,15 +1,10 @@
 package com.usercentrics.reactnativeusercentrics
 
-import android.app.Activity
-import android.content.Intent
 import com.facebook.react.bridge.*
 import com.usercentrics.reactnativeusercentrics.api.UsercentricsProxy
 import com.usercentrics.reactnativeusercentrics.extensions.*
-import com.usercentrics.sdk.UsercentricsBanner
-import com.usercentrics.sdk.UsercentricsLayout
 import com.usercentrics.sdk.models.settings.UsercentricsConsentType
 import com.usercentrics.sdk.services.tcf.TCFDecisionUILayer
-import java.lang.Exception
 
 internal class RNUsercentricsModule(
     reactContext: ReactApplicationContext,
@@ -19,39 +14,10 @@ internal class RNUsercentricsModule(
 
     override fun getName() = "RNUsercentricsModule"
 
-    private var pendingPromise: Promise? = null
-    private val listener: ActivityEventListener = object : BaseActivityEventListener() {
-        override fun onActivityResult(
-            activity: Activity?,
-            requestCode: Int,
-            resultCode: Int,
-            data: Intent?
-        ) {
-            parseActivityResult(requestCode, resultCode, data)
-        }
-    }
-
-    init {
-        reactApplicationContext.addActivityEventListener(listener)
-    }
-
-    companion object {
-        private const val showCMPRequestCode = 81420
-    }
-
     @ReactMethod
     fun configure(options: ReadableMap) {
-        var alreadyConfigured = false
-        usercentricsProxy.isReady({
-            alreadyConfigured = true
-        }, {
-            alreadyConfigured = true
-        })
-
-        if (!alreadyConfigured) {
-            val usercentricsOptions = options.usercentricsOptionsFromMap() ?: return
-            usercentricsProxy.initialize(reactApplicationContext, usercentricsOptions)
-        }
+        val usercentricsOptions = options.usercentricsOptionsFromMap() ?: return
+        usercentricsProxy.initialize(reactApplicationContext, usercentricsOptions)
     }
 
     @ReactMethod
@@ -63,15 +29,6 @@ internal class RNUsercentricsModule(
         })
     }
 
-    @ReactMethod
-    fun showCMP(options: ReadableMap, promise: Promise) {
-        val usercentricsOptions = options.usercentricsUISettingsFromMap(currentActivity!!.assets)
-        this.pendingPromise = promise
-
-        val intent = usercentricsProxy.createIntent(reactApplicationContext, usercentricsOptions)
-        currentActivity?.startActivityForResult(intent, showCMPRequestCode)
-    }
-
     @ReactMethod
     fun showFirstLayer(options: ReadableMap, promise: Promise) {
         UiThreadUtil.runOnUiThread {
@@ -81,16 +38,7 @@ internal class RNUsercentricsModule(
                 val layout = options.getString("layout")!!.usercentricsLayoutFromEnumString()
                 val bannerSettings =
                     options.getMap("bannerSettings")?.bannerSettingsFromMap(assetManager)
-                val styleSettings =
-                    options.getMap("styleSettings")?.firstLayerStyleSettingsFromMap(assetManager)
-
-                usercentricsProxy.showFirstLayer(
-                    currentActivity!!,
-                    layout,
-                    bannerSettings,
-                    styleSettings,
-                    promise
-                )
+                usercentricsProxy.showFirstLayer(currentActivity!!, layout, bannerSettings, promise)
 
             } catch (e: Exception) {
                 promise.reject(e)
@@ -106,33 +54,13 @@ internal class RNUsercentricsModule(
 
                 val bannerSettings =
                     options.getMap("bannerSettings")?.bannerSettingsFromMap(assetManager)
-                val showCloseButton = options.getBoolean("showCloseButton")
-
-
-                UsercentricsBanner(currentActivity!!, bannerSettings).showSecondLayer(
-                    showCloseButton
-                ) {
-                    promise.resolve(it?.toWritableMap())
-                }
-
+                usercentricsProxy.showSecondLayer(currentActivity!!, bannerSettings, promise)
             } catch (e: Exception) {
                 promise.reject(e)
             }
         }
     }
 
-    internal fun parseActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
-        if (requestCode != showCMPRequestCode) return false
-        assert(pendingPromise != null)
-
-        val response = usercentricsProxy.parseResult(resultCode, data)?.toWritableMap()
-
-        pendingPromise?.resolve(response)
-        pendingPromise = null
-
-        return true
-    }
-
     @ReactMethod
     fun restoreUserSession(controllerId: String, promise: Promise) {
         usercentricsProxy.instance.restoreUserSession(controllerId, {
@@ -142,11 +70,6 @@ internal class RNUsercentricsModule(
         })
     }
 
-    @ReactMethod
-    fun getTCFString(promise: Promise) {
-        promise.resolve(usercentricsProxy.instance.getTCString())
-    }
-
     @ReactMethod
     fun getControllerId(promise: Promise) {
         promise.resolve(usercentricsProxy.instance.getControllerId())
@@ -169,7 +92,9 @@ internal class RNUsercentricsModule(
 
     @ReactMethod
     fun getTCFData(promise: Promise) {
-        promise.resolve(usercentricsProxy.instance.getTCFData().serialize())
+        usercentricsProxy.instance.getTCFData {
+            promise.resolve(it.serialize())
+        }
     }
 
     @ReactMethod
@@ -271,4 +196,4 @@ internal class RNUsercentricsModule(
     fun reset() {
         usercentricsProxy.reset()
     }
-}
+}

package/android/src/main/java/com/usercentrics/reactnativeusercentrics/api/UsercentricsProxy.kt

@@ -2,45 +2,19 @@ package com.usercentrics.reactnativeusercentrics.api
 
 import android.app.Activity
 import android.content.Context
-import android.content.Intent
-import android.util.Log
 import com.facebook.react.bridge.Promise
-import com.facebook.react.bridge.ReadableMap
-import com.usercentrics.reactnativeusercentrics.extensions.bannerSettingsFromMap
-import com.usercentrics.reactnativeusercentrics.extensions.firstLayerStyleSettingsFromMap
 import com.usercentrics.reactnativeusercentrics.extensions.toWritableMap
-import com.usercentrics.reactnativeusercentrics.extensions.usercentricsLayoutFromEnumString
 import com.usercentrics.sdk.*
 import com.usercentrics.sdk.errors.UsercentricsError
-import java.lang.Exception
 
 interface UsercentricsProxy {
+
     val instance: UsercentricsSDK
 
     fun initialize(context: Context, options: UsercentricsOptions)
-
-    fun isReady(
-        onSuccess: (UsercentricsReadyStatus) -> Unit,
-        onFailure: (UsercentricsError) -> Unit
-    )
-
-    fun createIntent(
-        context: Context,
-        usercentricsOptions: UsercentricsUISettings
-    ): Intent
-
-    fun parseResult(resultCode: Int, data: Intent?): UsercentricsConsentUserResponse?
-
-    fun showFirstLayer(
-        activity: Activity,
-        layout: UsercentricsLayout,
-        bannerSettings: BannerSettings?,
-        firstLayerStyleSettings: FirstLayerStyleSettings?,
-        promise: Promise
-    )
-
-    fun showSecondLayer()
-
+    fun isReady(onSuccess: (UsercentricsReadyStatus) -> Unit, onFailure: (UsercentricsError) -> Unit)
+    fun showFirstLayer(activity: Activity, layout: UsercentricsLayout, bannerSettings: BannerSettings?, promise: Promise)
+    fun showSecondLayer(activity: Activity, bannerSettings: BannerSettings?, promise: Promise)
     fun reset()
 }
 
@@ -57,45 +31,19 @@ internal class UsercentricsProxyImpl : UsercentricsProxy {
         }
     }
 
-    override fun isReady(
-        onSuccess: (UsercentricsReadyStatus) -> Unit,
-        onFailure: (UsercentricsError) -> Unit
-    ) = Usercentrics.isReady(onSuccess, onFailure)
-
-    override fun createIntent(
-        context: Context,
-        usercentricsOptions: UsercentricsUISettings
-    ): Intent {
-        return UsercentricsActivityContract().createIntent(
-            context,
-            usercentricsOptions
-        )
-    }
-
-    override fun parseResult(resultCode: Int, data: Intent?): UsercentricsConsentUserResponse? {
-        return UsercentricsActivityContract()
-            .parseResult(resultCode, data)
-    }
+    override fun isReady(onSuccess: (UsercentricsReadyStatus) -> Unit, onFailure: (UsercentricsError) -> Unit) = Usercentrics.isReady(onSuccess, onFailure)
 
-    override fun showFirstLayer(
-        activity: Activity,
-        layout: UsercentricsLayout,
-        bannerSettings: BannerSettings?,
-        firstLayerStyleSettings: FirstLayerStyleSettings?,
-        promise: Promise
-    ) {
-        UsercentricsBanner(activity, bannerSettings).showFirstLayer(
-            layout,
-            firstLayerStyleSettings
-        ) {
+    override fun showFirstLayer(activity: Activity, layout: UsercentricsLayout, bannerSettings: BannerSettings?, promise: Promise) {
+        UsercentricsBanner(activity, bannerSettings).showFirstLayer(layout) {
             promise.resolve(it?.toWritableMap())
         }
     }
 
-    override fun showSecondLayer() {
-
+    override fun showSecondLayer(activity: Activity, bannerSettings: BannerSettings?, promise: Promise) {
+        UsercentricsBanner(activity, bannerSettings).showSecondLayer {
+            promise.resolve(it?.toWritableMap())
+        }
     }
 
     override fun reset() = Usercentrics.reset()
-
-}
+}