Address review comments

Author: Mansi-mParticle

build.gradle

@@ -72,9 +72,9 @@ dependencies {
     testImplementation 'com.squareup.assertj:assertj-android:1.2.0'
     testImplementation ("io.mockk:mockk:1.13.4")
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
-    implementation 'androidx.compose.ui:ui:1.0.0'
-    implementation 'androidx.compose.material:material:1.0.0'
-    implementation 'androidx.compose.ui:ui-tooling:1.0.0'
+    compileOnly 'androidx.compose.ui:ui:1.0.0'
+    compileOnly 'androidx.compose.material:material:1.0.0'
+    compileOnly 'androidx.compose.ui:ui-tooling:1.0.0'
 }
 
 ktlint {

src/main/kotlin/com/mparticle/kits/RoktKit.kt

@@ -6,7 +6,6 @@ import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.graphics.Typeface
 import android.os.Build
-import androidx.compose.runtime.Composable
 import com.mparticle.BuildConfig
 import com.mparticle.MParticle
 import com.mparticle.MParticle.IdentityType
@@ -299,7 +298,7 @@ class RoktKit :
         deferredAttributes?.complete(finalAttributes)
     }
 
-    fun ComposableTest(
+    fun runComposableWithCallback(
         attributes: Map<String, String>,
         mpRoktEventCallback: MpRoktEventCallback?,
         onResult: (Map<String, String>, RoktCallback) -> Unit
@@ -407,13 +406,14 @@ class RoktKit :
     }
 
     companion object {
-        private var instance: RoktKit? = null
+        @Volatile
+        var instance: RoktKit? = null
+            private set
 
         fun register(kit: RoktKit) {
             instance = kit
         }
 
-        fun get(): RoktKit? = instance
         const val NAME = "Rokt"
         const val ROKT_ACCOUNT_ID = "accountId"
         const val MPID = "mpid"

src/main/kotlin/com/mparticle/kits/RoktLayout.kt

@@ -1,48 +1,38 @@
 package com.mparticle.kits
 
-import android.graphics.Typeface
-import androidx.annotation.NonNull
-import androidx.annotation.Nullable
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.wrapContentHeight
-import androidx.compose.foundation.layout.wrapContentWidth
-import androidx.compose.material.MaterialTheme.typography
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
 import com.mparticle.MpRoktEventCallback
-import com.mparticle.rokt.RoktConfig
-import com.mparticle.rokt.RoktEmbeddedView
 import com.rokt.roktsdk.Rokt
-import java.lang.ref.WeakReference
 
 @Composable
 fun RoktLayout(
     sdkTriggered: Boolean,
     viewName: String,
-    modifier: Modifier,
     attributes: Map<String, String>,
     location: String,
-    mpRoktEventCallback: MpRoktEventCallback?
+    modifier: Modifier = Modifier,
+    mpRoktEventCallback: MpRoktEventCallback? = null,
 ) {
-    val instance = RoktKit.get()
-
-    data class RoktResult(val attributes: Map<String, String>, val callback: Rokt.RoktCallback)
-
+    val instance = RoktKit.instance
     val resultMapState = remember { mutableStateOf<RoktResult?>(null) }
-    val trigger = remember { mutableStateOf(0) }
-    LaunchedEffect(trigger.value) {
-        instance?.ComposableTest(attributes, mpRoktEventCallback, { resultMap, callback ->
+    LaunchedEffect(Unit) {
+        instance?.runComposableWithCallback(attributes, mpRoktEventCallback, { resultMap, callback ->
             resultMapState.value = RoktResult(resultMap, callback)
         })
     }
 
     resultMapState.value?.let { resultMap ->
-        com.rokt.roktsdk.RoktLayout(sdkTriggered, viewName, modifier, resultMap.attributes, location)
+        com.rokt.roktsdk.RoktLayout(
+            sdkTriggered, viewName, modifier, resultMap.attributes, location,
+            onLoad = { resultMap.callback.onLoad() },
+            onShouldShowLoadingIndicator = { resultMap.callback.onShouldShowLoadingIndicator() },
+            onShouldHideLoadingIndicator = { resultMap.callback.onShouldHideLoadingIndicator() },
+            onUnload = { reason -> resultMap.callback.onUnload(reason) })
     }
-}
+}
+
+data class RoktResult(val attributes: Map<String, String>, val callback: Rokt.RoktCallback)