react-native-firework-sdk 1.2.0-beta.8 → 1.2.1

package/android/build.gradle

@@ -168,7 +168,7 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
 
   // optional 1: firework sdk release verison
-  def firework_sdk_version = 'v5.12.0'
+  def firework_sdk_version = 'v5.12.2'
   implementation "com.github.loopsocial:firework_sdk:$firework_sdk_version"
 
   // optional 2: firework sdk local version,

package/android/src/main/AndroidManifest.xml

@@ -7,18 +7,10 @@
     <activity
       android:name="com.loopnow.fireworklibrary.PlaybackActivity"
       />
-    <activity
-      android:name="com.fireworksdk.bridge.reactnative.pages.FWVideoShoppingCartActivity"
-      android:theme="@style/Theme.AppCompat.Light.NoActionBar"
-      />
     <activity
       android:name="com.fireworksdk.bridge.reactnative.pages.FWContainerActivity"
       android:theme="@style/Theme.AppCompat.Light.NoActionBar"
       />
-    <activity
-      android:name="com.fireworksdk.bridge.reactnative.pages.FWCustomCTALinkContentContainerActivity"
-      android:theme="@style/Theme.AppCompat.Light.NoActionBar"
-      />
     <provider
       android:authorities="com.fireworksdk.bridge.reactnative"
       android:name=".reactnative.FWInitializationProvider"

package/android/src/main/java/com/fireworksdk/bridge/components/videofeed/FWVideoFeed.kt

@@ -155,7 +155,7 @@ class FWVideoFeed(
     }
 
     // set Feed Configuration
-    FWVideoPlayerUtils.setVideoFeedConfig(videoFeedView, videoFeedConfiguration)
+    FWVideoPlayerUtils.setVideoFeedConfig(context, videoFeedView, videoFeedConfiguration)
     // set Player Configuration
     FWVideoPlayerUtils.setVideoPlayerConfig(videoPlayerConfiguration)
   }
@@ -188,7 +188,7 @@ class FWVideoFeed(
     }
 
     // set Feed Configuration
-    FWVideoPlayerUtils.setPlaylistGroupFeedConfig(playlistGroupFeedView, videoFeedConfiguration)
+    FWVideoPlayerUtils.setPlaylistGroupFeedConfig(context, playlistGroupFeedView, videoFeedConfiguration)
     // set Player Configuration
     FWVideoPlayerUtils.setVideoPlayerConfig(videoPlayerConfiguration)
   }

package/android/src/main/java/com/fireworksdk/bridge/models/FWVideoFeedConfigModel.kt

@@ -10,7 +10,8 @@ data class FWVideoFeedConfigModel(
   var title: FWTitleModel? = null,
   var titlePosition: String? = null,
   var playIcon: FWPlayIconModel? = null,
-  var showAdBadge: Boolean? = null
+  var showAdBadge: Boolean? = null,
+  var customLayoutName: String? = null
 ) : Parcelable {
 
   @Parcelize

package/android/src/main/java/com/fireworksdk/bridge/reactnative/models/FWNavigatorInterface.kt

@@ -1,9 +1,11 @@
 package com.fireworksdk.bridge.reactnative.models
 
 import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReadableMap
 
 interface FWNavigatorInterface {
 
-  fun pushNativeContainer(callbackId: String?, promise: Promise)
+  fun pushNativeContainer(props: ReadableMap?, promise: Promise)
   fun popNativeContainer(promise: Promise)
+  fun canPopNativeContainer(promise: Promise)
 }

package/android/src/main/java/com/fireworksdk/bridge/reactnative/models/FWVideoShoppingInterface.kt

@@ -1,5 +1,6 @@
 package com.fireworksdk.bridge.reactnative.models
 
+import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 
@@ -9,8 +10,7 @@ interface FWVideoShoppingInterface {
   fun updateVideoProducts(productArray: ReadableArray?, videoId: String?)
   fun updateProductViewConfig(config: ReadableMap?, callbackId: Int?)
   fun updateAddToCartStatus(res: String?, tip: String?, callbackId: Int?)
-  fun jumpToCartPage(callbackId: Int?)
-  fun exitCartPage()
+  fun jumpToCartPage(callbackId: Int?, props: ReadableMap?)
   fun setCartIconVisible(visible: Boolean?)
   fun setCartItemCount(count: Int?)
 }

package/android/src/main/java/com/fireworksdk/bridge/reactnative/models/FireworkSDKInterface.kt

@@ -10,6 +10,7 @@ interface FireworkSDKInterface {
   fun setShareBaseURL(url: String?, promise: Promise)
   fun setAdBadgeConfiguration(config: ReadableMap?, promise: Promise)
   fun setCustomCTAClickEnabled(value: Boolean?)
-  fun setCustomCTALinkContentRenderEnabled(value: Boolean?)
+  fun setCustomCTALinkContentPageRouteName(name: String?, promise: Promise)
+  fun setAppComponentName(name: String?, promise: Promise)
   fun setVideoPlaybackEventEnabled(value: Boolean?)
 }

package/android/src/main/java/com/fireworksdk/bridge/reactnative/module/FWNavigatorModule.kt

@@ -1,13 +1,11 @@
 package com.fireworksdk.bridge.reactnative.module
 
+import android.app.Activity
 import com.facebook.react.bridge.*
 import com.fireworksdk.bridge.reactnative.FWInitializationProvider
 import com.fireworksdk.bridge.reactnative.models.FWNavigatorInterface
-import com.fireworksdk.bridge.reactnative.pages.FWContainerActivity
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
-import com.fireworksdk.bridge.utils.FWDateUtils
 import com.fireworksdk.bridge.utils.FWLogUtils
-import java.util.*
 
 
 class FWNavigatorModule(
@@ -15,42 +13,39 @@ class FWNavigatorModule(
 ) : ReactContextBaseJavaModule(reactContext), FWNavigatorInterface {
 
   @ReactMethod
-  override fun pushNativeContainer(callbackId: String?, promise: Promise) {
-    FWLogUtils.d { "FWNavigatorModule pushNativeContainer: $callbackId" }
-    val activity = FWInitializationProvider.INSTANCE.resumedActivity
+  override fun pushNativeContainer(props: ReadableMap?, promise: Promise) {
+    FWEventUtils.pushNativeContainer(reactApplicationContext, props, promise)
+  }
 
+  @ReactMethod
+  override fun popNativeContainer(promise: Promise) {
+    FWLogUtils.d { "FWNavigatorModule popNativeContainer" }
+
+    val activity = FWInitializationProvider.INSTANCE.resumedActivity
     if (activity == null) {
       promise.resolve(false)
       return
     }
 
-    FWEventUtils.sendLogMessageEvent(reactApplicationContext, "[Android] Enter pushNativeContainer ${FWDateUtils.getDateString(Date())}")
+    if (isTaskRoot(activity)) {
+      promise.resolve(false)
+      return
+    }
 
     UiThreadUtil.runOnUiThread {
-
-      FWEventUtils.sendLogMessageEvent(reactApplicationContext, "[Android] Before Starting container activity ${FWDateUtils.getDateString(Date())}")
-
-      activity.startActivity(FWContainerActivity.createIntent(activity, callbackId))
-
-      FWEventUtils.sendLogMessageEvent(reactApplicationContext, "[Android] After Starting container activity ${FWDateUtils.getDateString(Date())}")
+      activity.finish()
     }
     promise.resolve(true)
   }
 
   @ReactMethod
-  override fun popNativeContainer(promise: Promise) {
-    FWLogUtils.d { "FWNavigatorModule popNativeContainer" }
-
+  override fun canPopNativeContainer(promise: Promise) {
     val activity = FWInitializationProvider.INSTANCE.resumedActivity
     if (activity == null) {
       promise.resolve(false)
       return
     }
-
-    UiThreadUtil.runOnUiThread {
-      activity.finish()
-    }
-    promise.resolve(true)
+    promise.resolve(!isTaskRoot(activity))
   }
 
   @ReactMethod
@@ -67,6 +62,13 @@ class FWNavigatorModule(
     promise.resolve(Arguments.createMap())
   }
 
+  private fun isTaskRoot(activity: Activity):Boolean {
+    if (activity.isTaskRoot) {
+      return true
+    }
+    return false
+  }
+
   override fun getName(): String {
     return "FWNavigatorModule"
   }

package/android/src/main/java/com/fireworksdk/bridge/reactnative/module/FWVideoShoppingModule.kt

@@ -3,17 +3,16 @@ package com.fireworksdk.bridge.reactnative.module
 import android.app.Activity
 import com.facebook.react.bridge.*
 import com.fasterxml.jackson.core.type.TypeReference
-import com.fireworksdk.bridge.reactnative.FWInitializationProvider
 import com.loopnow.fireworklibrary.baya.Baya
 import com.loopnow.fireworklibrary.baya.UpdateCartStatus
 import com.fireworksdk.bridge.reactnative.models.FWVideoShoppingInterface
 import com.fireworksdk.bridge.models.FWVideoShoppingProduct
-import com.fireworksdk.bridge.reactnative.pages.FWVideoShoppingCartActivity
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.fireworksdk.bridge.utils.FWJsonUtils
 import com.fireworksdk.bridge.utils.FWLogUtils
 import com.loopnow.fireworklibrary.data.Product
 import com.loopnow.fireworklibrary.utils.Util
+import kotlin.collections.HashMap
 
 
 class FWVideoShoppingModule(
@@ -112,26 +111,12 @@ class FWVideoShoppingModule(
   }
 
   @ReactMethod
-  override fun jumpToCartPage(callbackId: Int?) {
-    FWLogUtils.d { "FWVideoShoppingModule jumpToCartPage: $callbackId" }
+  override fun jumpToCartPage(callbackId: Int?, props: ReadableMap?) {
+    FWLogUtils.d { "FWVideoShoppingModule jumpToCartPage: $callbackId props: $props" }
     if (callbackId == null || cartClickHandler?.first != callbackId) {
       return
     }
-    val activity = FWInitializationProvider.INSTANCE.resumedActivity ?: return
-
-    UiThreadUtil.runOnUiThread {
-      activity.startActivity(FWVideoShoppingCartActivity.createIntent(activity))
-    }
-  }
-
-  @ReactMethod
-  override fun exitCartPage() {
-
-    val activity = FWInitializationProvider.INSTANCE.resumedActivity ?: return
-
-    UiThreadUtil.runOnUiThread {
-      activity.finish()
-    }
+    FWEventUtils.pushNativeContainer(reactApplicationContext, props, null)
   }
 
   @ReactMethod

package/android/src/main/java/com/fireworksdk/bridge/reactnative/module/FireworkSDKModule.kt

@@ -13,7 +13,7 @@ import com.facebook.react.bridge.ReactMethod
 import com.fireworksdk.bridge.models.FWAdBadgeConfigModel
 import com.fireworksdk.bridge.reactnative.FWInitializationProvider
 import com.fireworksdk.bridge.reactnative.models.FireworkSDKInterface
-import com.fireworksdk.bridge.reactnative.pages.FWCustomCTALinkContentContainerActivity
+import com.fireworksdk.bridge.reactnative.pages.FWContainerActivity
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.loopnow.fireworklibrary.*
 import java.util.*
@@ -104,11 +104,6 @@ class FireworkSDKModule(
     FWVideoPlayerUtils.customCTAClickEnabled = value?:false
   }
 
-  @ReactMethod
-  override fun setCustomCTALinkContentRenderEnabled(value: Boolean?) {
-    FWVideoPlayerUtils.customCTALinkContentRenderEnabled = value?:false
-  }
-
   @ReactMethod
   override fun setVideoPlaybackEventEnabled(value: Boolean?) {
     FWVideoPlayerUtils.videoPlaybackEventEnabled = value?:false
@@ -180,12 +175,19 @@ class FireworkSDKModule(
 
         FWEventUtils.sendCustomCTAClickEvent(reactApplicationContext, actionUrl)
 
-        if (FWVideoPlayerUtils.customCTALinkContentRenderEnabled) {
+        if (!appComponentName.isNullOrBlank() && !customCTALinkContentPageRouteName.isNullOrBlank()) {
           val activity = FWInitializationProvider.INSTANCE.resumedActivity
-          activity?.startActivity(FWCustomCTALinkContentContainerActivity.createIntent(activity, actionUrl))
+
+          activity?.startActivity(FWContainerActivity.createIntent(activity, appComponentName,
+            hashMapOf(
+              "initialRouteName" to customCTALinkContentPageRouteName,
+              "initialParams" to hashMapOf("url" to actionUrl)
+            )
+          ))
+          return true
         }
 
-        return FWVideoPlayerUtils.customCTAClickEnabled || FWVideoPlayerUtils.customCTALinkContentRenderEnabled
+        return FWVideoPlayerUtils.customCTAClickEnabled
       }
     }
   }
@@ -243,6 +245,18 @@ class FireworkSDKModule(
     })
   }
 
+  @ReactMethod
+  override fun setCustomCTALinkContentPageRouteName(name: String?, promise: Promise) {
+    customCTALinkContentPageRouteName = name
+    promise.resolve(Arguments.createMap())
+  }
+
+  @ReactMethod
+  override fun setAppComponentName(name: String?, promise: Promise) {
+    appComponentName = name
+    promise.resolve(Arguments.createMap())
+  }
+
   @ReactMethod
   fun addListener(eventName: String?, promise: Promise) {
     // Set up any upstream listeners or background tasks as necessary
@@ -261,4 +275,9 @@ class FireworkSDKModule(
     return "FireworkSDK"
   }
 
+  companion object {
+    var appComponentName: String? = null
+    var customCTALinkContentPageRouteName: String? = null
+  }
+
 }

package/android/src/main/java/com/fireworksdk/bridge/reactnative/pages/FWContainerActivity.kt

@@ -8,6 +8,8 @@ import androidx.fragment.app.Fragment
 import com.facebook.react.ReactFragment
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler
 import com.fireworksdk.bridge.R
+import com.fireworksdk.bridge.utils.FWBundleUtils
+
 
 class FWContainerActivity : AppCompatActivity(), DefaultHardwareBackBtnHandler {
 
@@ -15,11 +17,12 @@ class FWContainerActivity : AppCompatActivity(), DefaultHardwareBackBtnHandler {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.fw_bridge_fragment_container)
 
-    val callbackId = intent.getStringExtra(KEY_CALLBACK_ID)
+    val componentName = intent.getStringExtra(KEY_COMPONENT_NAME)
+    val params = intent.getSerializableExtra(KEY_PARAMS) as HashMap<String, Any?>?
 
     val reactNativeFragment: Fragment = ReactFragment.Builder()
-      .setComponentName(COMPONENT_NAME)
-      .setLaunchOptions(getLaunchOptions(callbackId))
+      .setComponentName(componentName)
+      .setLaunchOptions(FWBundleUtils.mapToBundle(params))
       .build()
 
     supportFragmentManager
@@ -28,20 +31,29 @@ class FWContainerActivity : AppCompatActivity(), DefaultHardwareBackBtnHandler {
       .commit()
   }
 
-  private fun getLaunchOptions(callbackId: String?) = Bundle().apply {
-    if (!callbackId.isNullOrEmpty()) {
-      putString(KEY_CALLBACK_ID, callbackId)
+//  https://github.com/facebook/react-native/issues/16026
+  private fun getLaunchOptions(params: HashMap<String, Any?>?) = Bundle().apply {
+    if (params != null) {
+      putBundle(KEY_PARAMS, FWBundleUtils.mapToBundle(params))
+
+//      val jsonString = FWJsonUtils.toJson(params)
+//      if (!jsonString.isNullOrBlank()) {
+//        val jsonObject = JSONObject(jsonString)
+//        val writableMap = FWDataUtils.convertJsonObjectToWritableMap(jsonObject)
+//        putSerializable(KEY_PARAMS, params)
+//      }
     }
   }
 
   companion object {
 
-    private const val KEY_CALLBACK_ID = "callbackId"
-    private const val COMPONENT_NAME = "FWNavigationContainer"
+    private const val KEY_PARAMS = "params"
+    private const val KEY_COMPONENT_NAME = "componentName"
 
-    fun createIntent(activity: Activity, callbackId: String?): Intent {
+    fun createIntent(activity: Activity, componentName: String?, params: HashMap<String, Any?>?): Intent {
       val intent = Intent(activity, FWContainerActivity::class.java)
-      intent.putExtra(KEY_CALLBACK_ID, callbackId)
+      intent.putExtra(KEY_COMPONENT_NAME, componentName)
+      intent.putExtra(KEY_PARAMS, params)
       intent.flags = Intent.FLAG_ACTIVITY_NO_ANIMATION
       activity.overridePendingTransition(0, 0)
       return intent

package/android/src/main/java/com/fireworksdk/bridge/reactnative/utils/FWDataUtils.kt

@@ -0,0 +1,119 @@
+package com.fireworksdk.bridge.reactnative.utils
+import com.facebook.react.bridge.*
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+
+
+object FWDataUtils {
+
+  @Throws(JSONException::class)
+  fun convertJsonObjectToWritableMap(jsonObject: JSONObject?): WritableMap? {
+    if (jsonObject == null) {
+      return null
+    }
+    val map: WritableMap = WritableNativeMap()
+    val iterator = jsonObject.keys()
+    while (iterator.hasNext()) {
+      val key = iterator.next()
+      when (val value = jsonObject[key]) {
+          is JSONObject -> {
+            map.putMap(key, convertJsonObjectToWritableMap(value))
+          }
+        is JSONArray -> {
+          map.putArray(key, convertJsonObjectToWritableArray(value))
+        }
+        is Boolean -> {
+          map.putBoolean(key, value)
+        }
+        is Int -> {
+          map.putInt(key, value)
+        }
+        is Double -> {
+          map.putDouble(key, value)
+        }
+        is String -> {
+          map.putString(key, value)
+        }
+        else -> {
+          map.putString(key, value.toString())
+        }
+      }
+    }
+    return map
+  }
+
+  @Throws(JSONException::class)
+  fun convertJsonObjectToWritableArray(jsonArray: JSONArray?): WritableArray? {
+    if (jsonArray == null) {
+      return null
+    }
+    val array: WritableArray = WritableNativeArray()
+    for (i in 0 until jsonArray.length()) {
+      when (val value = jsonArray[i]) {
+          is JSONObject -> {
+            array.pushMap(convertJsonObjectToWritableMap(value))
+          }
+        is JSONArray -> {
+          array.pushArray(convertJsonObjectToWritableArray(value))
+        }
+        is Boolean -> {
+          array.pushBoolean(value)
+        }
+        is Int -> {
+          array.pushInt(value)
+        }
+        is Double -> {
+          array.pushDouble(value)
+        }
+        is String -> {
+          array.pushString(value)
+        }
+        else -> {
+          array.pushString(value.toString())
+        }
+      }
+    }
+    return array
+  }
+
+  @Throws(JSONException::class)
+  fun convertReadableMapToJsonObject(readableMap: ReadableMap?): JSONObject? {
+    if (readableMap == null) {
+      return null
+    }
+    val `object` = JSONObject()
+    val iterator = readableMap.keySetIterator()
+    while (iterator.hasNextKey()) {
+      val key = iterator.nextKey()
+      when (readableMap.getType(key)) {
+        ReadableType.Null -> `object`.put(key, JSONObject.NULL)
+        ReadableType.Boolean -> `object`.put(key, readableMap.getBoolean(key))
+        ReadableType.Number -> `object`.put(key, readableMap.getDouble(key))
+        ReadableType.String -> `object`.put(key, readableMap.getString(key))
+        ReadableType.Map -> `object`.put(key, convertReadableMapToJsonObject(readableMap.getMap(key)))
+        ReadableType.Array -> `object`.put(key, convertReadableArrayToJsonObject(readableMap.getArray(key)))
+      }
+    }
+    return `object`
+  }
+
+  @Throws(JSONException::class)
+  fun convertReadableArrayToJsonObject(readableArray: ReadableArray?): JSONArray? {
+    if (readableArray == null) {
+      return null
+    }
+    val array = JSONArray()
+    for (i in 0 until readableArray.size()) {
+      when (readableArray.getType(i)) {
+        ReadableType.Null -> {}
+        ReadableType.Boolean -> array.put(readableArray.getBoolean(i))
+        ReadableType.Number -> array.put(readableArray.getDouble(i))
+        ReadableType.String -> array.put(readableArray.getString(i))
+        ReadableType.Map -> array.put(convertReadableMapToJsonObject(readableArray.getMap(i)))
+        ReadableType.Array -> array.put(convertReadableArrayToJsonObject(readableArray.getArray(i)))
+      }
+    }
+    return array
+  }
+}

package/android/src/main/java/com/fireworksdk/bridge/reactnative/utils/FWEventUtils.kt

@@ -1,17 +1,52 @@
 package com.fireworksdk.bridge.reactnative.utils
 
 import android.util.Log
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.bridge.WritableMap
+import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.facebook.react.uimanager.events.RCTEventEmitter
 import com.fireworksdk.bridge.models.*
+import com.fireworksdk.bridge.reactnative.FWInitializationProvider
+import com.fireworksdk.bridge.reactnative.module.FireworkSDKModule
+import com.fireworksdk.bridge.reactnative.pages.FWContainerActivity
+import com.fireworksdk.bridge.utils.FWDateUtils
 import com.fireworksdk.bridge.utils.FWLogUtils
 import com.loopnow.fireworklibrary.data.Product
+import java.util.*
 
 object FWEventUtils {
 
+  fun pushNativeContainer(reactContext: ReactContext, props: ReadableMap?, promise: Promise?) {
+    FWLogUtils.d { "FWNavigatorModule pushNativeContainer: $props" }
+    val activity = FWInitializationProvider.INSTANCE.resumedActivity
+
+    if (activity == null) {
+      promise?.resolve(false)
+      return
+    }
+
+    sendLogMessageEvent(reactContext, "[Android] Enter pushNativeContainer ${
+      FWDateUtils.getDateString(
+        Date()
+      )}")
+
+    UiThreadUtil.runOnUiThread {
+
+      sendLogMessageEvent(reactContext, "[Android] Before Starting container activity ${
+        FWDateUtils.getDateString(
+          Date()
+        )}")
+
+      activity.startActivity(FWContainerActivity.createIntent(activity, FireworkSDKModule.appComponentName, props?.toHashMap()))
+
+      sendLogMessageEvent(reactContext, "[Android] After Starting container activity ${
+        FWDateUtils.getDateString(
+          Date()
+        )}")
+    }
+
+    promise?.resolve(true)
+  }
+
   fun sendInitSuccessEvent(reactContext: ReactContext) {
     sendEvent(reactContext, FWEventName.SDKIni.rawValue, Arguments.createMap())
   }

package/android/src/main/java/com/fireworksdk/bridge/utils/FWBundleUtils.kt

@@ -0,0 +1,86 @@
+package com.fireworksdk.bridge.utils
+
+import android.os.Bundle
+import android.os.Parcelable
+
+
+object FWBundleUtils {
+
+  fun mapToBundle(map: Map<String, Any?>?): Bundle? {
+    if (map == null) {
+      return null
+    }
+    val bundle = Bundle()
+    for ((key, value) in map) {
+      if (value is Double) {
+        bundle.putDouble(key, value)
+      } else if (value is Int) {
+        bundle.putInt(key, value)
+      } else if (value is String) {
+        bundle.putString(key, value)
+      } else if (value is Boolean) {
+        bundle.putBoolean(key, value)
+      } else if (value is List<*>) {
+        val list = value as List<Any>
+        val first = list[0]
+        if (first == null || first is Double) {
+          bundle.putDoubleArray(key, listToDoubleArray(list))
+        } else if (first is Int) {
+          bundle.putIntArray(key, listToIntArray(list))
+        } else if (first is String) {
+          bundle.putStringArray(key, listToStringArray(list))
+        } else if (first is Map<*, *>) {
+          bundle.putParcelableArrayList(key, listToParcelableArrayList(list))
+        }
+      } else if (value is Map<*, *>) {
+        bundle.putBundle(key, mapToBundle(value as Map<String, Any>))
+      }
+    }
+    return bundle
+  }
+
+  private fun listToDoubleArray(list: List<Any>?): DoubleArray? {
+    if (list == null) {
+      return null
+    }
+    val doubles = DoubleArray(list.size)
+    for (i in list.indices) {
+      doubles[i] = list[i] as Double
+    }
+    return doubles
+  }
+
+  private fun listToIntArray(list: List<Any>?): IntArray? {
+    if (list == null) {
+      return null
+    }
+    val integers = IntArray(list.size)
+    for (i in list.indices) {
+      integers[i] = list[i] as Int
+    }
+    return integers
+  }
+
+  private fun listToStringArray(list: List<Any>?): Array<String?>? {
+    if (list == null) {
+      return null
+    }
+    val strings = arrayOfNulls<String>(list.size)
+    for (i in list.indices) {
+      strings[i] = list[i].toString()
+    }
+    return strings
+  }
+
+  private fun listToParcelableArrayList(list: List<Any>?): ArrayList<Parcelable?>? {
+    if (list == null) {
+      return null
+    }
+    val arrayList: ArrayList<Parcelable?> = ArrayList()
+    for (item in list) {
+      val map = item as Map<String, Any>
+      arrayList.add(mapToBundle(map))
+    }
+    return arrayList
+  }
+}

package/android/src/main/java/com/fireworksdk/bridge/utils/FWVideoPlayerUtils.kt

@@ -1,5 +1,6 @@
 package com.fireworksdk.bridge.utils
 
+import android.content.Context
 import android.graphics.Color
 import com.loopnow.fireworklibrary.VideoPlayerProperties
 import com.fireworksdk.bridge.constants.FWVideoPlayerConstant
@@ -16,7 +17,6 @@ import com.loopnow.fireworklibrary.views.VideoFeedView
 object FWVideoPlayerUtils {
 
   var customCTAClickEnabled: Boolean = false
-  var customCTALinkContentRenderEnabled: Boolean = false
   var videoPlaybackEventEnabled: Boolean = false
 
   private var hasAssignedLaunchAppWithMute = false
@@ -45,7 +45,11 @@ object FWVideoPlayerUtils {
     }
   }
 
-  fun setPlaylistGroupFeedConfig(feedView: PlaylistGroupFeedView?, config: FWVideoFeedConfigModel?) {
+  fun setPlaylistGroupFeedConfig(context: Context, feedView: PlaylistGroupFeedView?, config: FWVideoFeedConfigModel?) {
+    config?.customLayoutName?.let {
+      val layout = context.resources.getIdentifier(it, "layout", context.packageName)
+      feedView?.setCustomLayout(layout)
+    }
     val backgroundColor = config?.backgroundColor
     if (!backgroundColor.isNullOrBlank()) {
       feedView?.setBackgroundColor(Color.parseColor(backgroundColor))
@@ -63,7 +67,12 @@ object FWVideoPlayerUtils {
     VideoFeedProperties.displayAdLabel = config?.showAdBadge == true
   }
 
-  fun setVideoFeedConfig(feedView: VideoFeedView?, config: FWVideoFeedConfigModel?) {
+  fun setVideoFeedConfig(context: Context, feedView: VideoFeedView?, config: FWVideoFeedConfigModel?) {
+    config?.customLayoutName?.let {
+      val layout = context.resources.getIdentifier(it, "layout", context.packageName)
+      feedView?.setCustomLayout(layout)
+    }
+
     val backgroundColor = config?.backgroundColor
     if (!backgroundColor.isNullOrBlank()) {
       feedView?.setBackgroundColor(Color.parseColor(backgroundColor))

package/ios/Modules/FWNavigatorModule/FWNavigatorModule.m

@@ -13,5 +13,6 @@
 
 RCT_EXTERN_METHOD(pushNativeContainer:(NSDictionary *)props resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(popNativeContainer:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+RCT_EXTERN_METHOD(canPopNativeContainer:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 
 @end