react-native-firework-sdk 2.17.0 → 2.17.1

package/android/build.gradle

@@ -96,7 +96,7 @@ repositories {
   google()
 
   maven {
-    setUrl("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+    setUrl("https://central.sonatype.com/repository/maven-snapshots/")
     mavenContent {
       snapshotsOnly()
     }

package/android/gradle.properties

@@ -6,4 +6,4 @@ FireworkSDK_targetSdkVersion=33
 FireworkSDK_compileSdkVersion=33
 FireworkSDK_kotlinVersion=1.8.22
 FireworkSDK_fwPlayerLaunchMode=singleTask
-FireworkSDK_fwNativeVersion=6.24.0
+FireworkSDK_fwNativeVersion=6.24.1

package/android/src/main/java/com/fireworksdk/bridge/components/storyblock/StoryBlockContainer.kt

@@ -0,0 +1,13 @@
+package com.fireworksdk.bridge.components.storyblock
+
+import com.fireworksdk.bridge.models.FWVideoFeedPropsModel
+
+/**
+ * Interface for StoryBlock containers to provide a common API
+ * for both FrameLayout and FragmentContainerView implementations
+ */
+interface StoryBlockContainer {
+    var storyBlockFragment: StoryBlockFragment?
+    var videoFeedPropsModel: FWVideoFeedPropsModel
+    fun destroy()
+}

package/android/src/main/java/com/fireworksdk/bridge/components/storyblock/StoryBlockContainerView.kt

@@ -0,0 +1,103 @@
+package com.fireworksdk.bridge.components.storyblock
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.FrameLayout
+import androidx.fragment.app.FragmentActivity
+import com.fireworksdk.bridge.models.FWVideoFeedPropsModel
+import com.fireworksdk.bridge.utils.FWLogUtils
+
+/**
+ * StoryBlockContainerView provides safe Fragment management with automatic lifecycle handling.
+ * This eliminates the need for manual Fragment transaction management and reduces crash risks.
+ */
+class StoryBlockContainerView(
+    context: Context,
+    attrs: AttributeSet?
+) : FrameLayout(context, attrs), StoryBlockContainer {
+
+    override var storyBlockFragment: StoryBlockFragment? = null
+    override var videoFeedPropsModel: FWVideoFeedPropsModel = FWVideoFeedPropsModel()
+
+    private var isFragmentAttached = false
+    private var pendingFragment: StoryBlockFragment? = null
+
+    constructor(context: Context) : this(context, null)
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        // Try to attach pending fragment when view is attached
+        pendingFragment?.let { fragment ->
+            attachFragmentSafely(fragment)
+            pendingFragment = null
+        }
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        // Fragment will be automatically detached by FragmentManager
+        isFragmentAttached = false
+    }
+
+    /**
+     * Safely attach fragment to this container
+     */
+    fun attachFragmentSafely(fragment: StoryBlockFragment) {
+        if (isFragmentAttached || fragment.isAdded) {
+            return
+        }
+
+        val activity = context as? FragmentActivity ?: run {
+            FWLogUtils.e { "Context is not FragmentActivity, cannot attach fragment" }
+            return
+        }
+        
+        if (activity.isFinishing || activity.isDestroyed) {
+            FWLogUtils.w { "Activity is finishing or destroyed, cannot attach fragment" }
+            return
+        }
+
+        try {
+            val fragmentManager = activity.supportFragmentManager
+            fragmentManager.beginTransaction()
+                .replace(id, fragment, id.toString())
+                .commitAllowingStateLoss()
+            
+            // Delay state update to ensure transaction is committed
+            post {
+                isFragmentAttached = fragment.isAdded
+                if (isFragmentAttached) {
+                    FWLogUtils.d { "Fragment attached successfully to container $id" }
+                } else {
+                    FWLogUtils.w { "Fragment attachment may have failed, fragment.isAdded = false" }
+                }
+            }
+        } catch (e: Exception) {
+            FWLogUtils.e { "Failed to attach fragment: ${e.message}" }
+            // Store fragment for later attachment
+            pendingFragment = fragment
+        }
+    }
+
+    /**
+     * Set fragment to be attached when container is ready
+     */
+    fun setFragment(fragment: StoryBlockFragment) {
+        storyBlockFragment = fragment
+        if (isAttachedToWindow) {
+            attachFragmentSafely(fragment)
+        } else {
+            pendingFragment = fragment
+        }
+    }
+
+    /**
+     * Clean up resources when the view is destroyed
+     */
+    override fun destroy() {
+        // Fragment will be automatically cleaned up by FragmentManager
+        isFragmentAttached = false
+        pendingFragment = null
+        storyBlockFragment = null
+    }
+}

package/android/src/main/java/com/fireworksdk/bridge/components/storyblock/StoryBlockFragment.kt

@@ -109,8 +109,17 @@ class StoryBlockFragment : FWBaseFragment() {
 
 
   override fun onDestroyView() {
+    // clean resource
     fwStoryBlockView?.destroy()
+    fwStoryBlockView = null
+    loaderContainer = null
     _binding = null
+
+    // clean listener
+    feedLoadListener = null
+    errorListener = null
+    shoppingOverlayStateListener = null
+    createViewCallback = null
     super.onDestroyView()
   }
 

package/android/src/main/java/com/fireworksdk/bridge/components/storyblock/StoryBlockFrameLayout.kt

@@ -5,15 +5,16 @@ import android.util.AttributeSet
 import android.widget.FrameLayout
 import com.fireworksdk.bridge.models.FWVideoFeedPropsModel
 
+@Deprecated("Replace by StoryBlockContainerView")
 class StoryBlockFrameLayout(
   context: Context,
   attrs: AttributeSet?
-) : FrameLayout(context, attrs) {
+) : FrameLayout(context, attrs), StoryBlockContainer {
 
-  var storyBlockFragment: StoryBlockFragment? = null
-  var videoFeedPropsModel: FWVideoFeedPropsModel = FWVideoFeedPropsModel()
+  override var storyBlockFragment: StoryBlockFragment? = null
+  override var videoFeedPropsModel: FWVideoFeedPropsModel = FWVideoFeedPropsModel()
 
   constructor(context: Context) : this(context, null)
 
-  fun destroy() {}
+  override fun destroy() {}
 }

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

@@ -0,0 +1,21 @@
+package com.fireworksdk.bridge.models
+
+import org.json.JSONObject
+
+object FWChatConfigModelDeserializer {
+
+  private const val TEXT_COLOR_KEY = "textColor"
+  private const val TEXT_SHADOW_KEY = "textShadow"
+
+  fun deserialize(responseJson: JSONObject?): FWVideoPlayerConfigModel.FWChatStyleModel? {
+    responseJson ?: return null
+
+    val textColor = if (responseJson.has(TEXT_COLOR_KEY)) responseJson.optString(TEXT_COLOR_KEY) else null
+    val textShadow = FWTextShadowModelDeserializer.deserialize(responseJson.optJSONObject(TEXT_SHADOW_KEY))
+
+    return FWVideoPlayerConfigModel.FWChatStyleModel(
+      textColor = textColor,
+      textShadow = textShadow,
+    )
+  }
+}

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

@@ -0,0 +1,3 @@
+package com.fireworksdk.bridge.models
+
+data class FWControlsInsetModel(val top: Int? = null)

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

@@ -0,0 +1,15 @@
+package com.fireworksdk.bridge.models
+
+import org.json.JSONObject
+
+object FWControlsInsetModelDeserializer {
+  private const val TOP = "top"
+
+  fun deserialize(jsonObject: JSONObject?): FWControlsInsetModel? {
+    jsonObject ?: return null
+
+    return FWControlsInsetModel(
+      top = jsonObject.optInt(TOP, 0),
+    )
+  }
+}

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

@@ -0,0 +1,17 @@
+package com.fireworksdk.bridge.models
+
+import org.json.JSONObject
+
+object FWControlsInsetModelSerializer {
+
+  private const val TOP = "top"
+
+  fun serialize(model: FWControlsInsetModel?): JSONObject? {
+    model ?: return null
+
+    val jsonObject = JSONObject()
+    model.top?.let { jsonObject.put(TOP, it) }
+
+    return jsonObject
+  }
+}

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

@@ -4,5 +4,6 @@ data class FWLiveStreamEventDetailsModel(
   val id: String? = null,
   val feedId: String? = null,
   val videoType: String? = null,
-  val liveStreamStatus: String? = null
+  val liveStreamStatus: String? = null,
+  val playbackDetails: FWVideoPlaybackDetails? = null,
 )

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

@@ -15,6 +15,7 @@ data class FWProductInfoViewConfiguration(
     val backgroundColor: String? = null,
     val textColor: String? = null,
     val fontSize: Int? = null,
+    val fontInfo: FWFontInfoModel? = null,
   )
 
   data class LinkButtonConfiguration(
@@ -24,12 +25,38 @@ data class FWProductInfoViewConfiguration(
   data class ProductCardConfiguration(
     val ctaButtonText: FWProductCardCtaButtonTextValue? = null,
     val theme: FWProductCardTheme? = null,
-    val cornerRadius: Int? = null,
+    val cornerRadius: Double? = null,
     val priceConfiguration: ProductCardPriceConfiguration? = null,
     val isCtaButtonHidden: Boolean? = null,
+    val ctaButtonStyle: ProductCardCTAButtonStyle? = null,
+    val width: Double? = null,
+    val height: Double? = null,
+    val backgroundColor: String? = null,
+    val iconConfiguration: ProductCardIconConfiguration? = null,
+    val nameLabel: ProductCardLabelConfiguration? = null,
   )
 
   data class ProductCardPriceConfiguration(
     val isHidden: Boolean? = null,
+    val isPriceFirst: Boolean? = null,
+    val priceLabel: ProductCardLabelConfiguration? = null,
+    val originalPriceLabel: ProductCardLabelConfiguration? = null,
+  )
+
+  data class ProductCardCTAButtonStyle(
+    val textColor: String? = null,
+    val fontSize: Int? = null,
+    val fontInfo: FWFontInfoModel? = null,
+  )
+
+  data class ProductCardLabelConfiguration(
+    val textColor: String? = null,
+    val fontSize: Int? = null,
+    val numberOfLines: Int? = null,
+    val fontInfo: FWFontInfoModel? = null,
+  )
+
+  data class ProductCardIconConfiguration(
+    val cornerRadius: Double? = null,
   )
 }

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

@@ -15,6 +15,7 @@ object FWProductInfoViewConfigurationDeserializer {
   private const val BACKGROUND_COLOR_KEY = "backgroundColor"
   private const val TEXT_COLOR_KEY = "textColor"
   private const val FONT_SIZE_KEY = "fontSize"
+  private const val ANDROID_FONT_INFO_KEY = "androidFontInfo"
 
   private const val IS_HIDDEN_KEY = "isHidden"
 
@@ -23,6 +24,19 @@ object FWProductInfoViewConfigurationDeserializer {
   private const val CORNER_RADIUS_KEY = "cornerRadius"
   private const val PRICE_CONFIGURATION_KEY = "priceConfiguration"
   private const val IS_CTA_BUTTON_HIDDEN_KEY = "isCtaButtonHidden"
+  private const val CTA_BUTTON_STYLE_KEY = "ctaButtonStyle"
+  private const val WIDTH_KEY = "width"
+  private const val HEIGHT_KEY = "height"
+  private const val ICON_CONFIGURATION_KEY = "iconConfiguration"
+  private const val NAME_LABEL_KEY = "nameLabel"
+
+  // Price configuration keys
+  private const val IS_PRICE_FIRST_KEY = "isPriceFirst"
+  private const val PRICE_LABEL_KEY = "priceLabel"
+  private const val ORIGINAL_PRICE_LABEL_KEY = "originalPriceLabel"
+
+  // Label configuration keys
+  private const val NUMBER_OF_LINES_KEY = "numberOfLines"
 
   fun deserialize(responseJson: JSONObject?): FWProductInfoViewConfiguration? {
     responseJson ?: return null
@@ -45,12 +59,14 @@ object FWProductInfoViewConfigurationDeserializer {
     val backgroundColor = if (ctaButtonConfiguration.has(BACKGROUND_COLOR_KEY)) ctaButtonConfiguration.optString(BACKGROUND_COLOR_KEY) else null
     val textColor = if (ctaButtonConfiguration.has(TEXT_COLOR_KEY)) ctaButtonConfiguration.optString(TEXT_COLOR_KEY) else null
     val fontSize = if (ctaButtonConfiguration.has(FONT_SIZE_KEY)) ctaButtonConfiguration.optInt(FONT_SIZE_KEY) else null
+    val fontInfo = FWFontInfoModelDeserializer.deserialize(ctaButtonConfiguration.optJSONObject(ANDROID_FONT_INFO_KEY))
 
     return FWProductInfoViewConfiguration.CtaButtonConfiguration(
       text = FWCtaButtonTextValue.deserialize(textString),
       backgroundColor = backgroundColor,
       textColor = textColor,
       fontSize = fontSize,
+      fontInfo = fontInfo,
     )
   }
 
@@ -69,9 +85,15 @@ object FWProductInfoViewConfigurationDeserializer {
 
     val ctaButtonTextString = if (productCardConfigJson.has(CTA_BUTTON_TEXT_KEY)) productCardConfigJson.optString(CTA_BUTTON_TEXT_KEY) else null
     val themeString = if (productCardConfigJson.has(THEME_KEY)) productCardConfigJson.optString(THEME_KEY) else null
-    val cornerRadius = if (productCardConfigJson.has(CORNER_RADIUS_KEY)) productCardConfigJson.optInt(CORNER_RADIUS_KEY) else null
+    val cornerRadius = if (productCardConfigJson.has(CORNER_RADIUS_KEY)) productCardConfigJson.optDouble(CORNER_RADIUS_KEY) else null
     val priceConfiguration = deserializeProductCardPriceConfiguration(productCardConfigJson.optJSONObject(PRICE_CONFIGURATION_KEY))
     val isCtaButtonHidden = if (productCardConfigJson.has(IS_CTA_BUTTON_HIDDEN_KEY)) productCardConfigJson.optBoolean(IS_CTA_BUTTON_HIDDEN_KEY) else null
+    val ctaButtonStyle = deserializeProductCardCTAButtonStyle(productCardConfigJson.optJSONObject(CTA_BUTTON_STYLE_KEY))
+    val width = if (productCardConfigJson.has(WIDTH_KEY)) productCardConfigJson.optDouble(WIDTH_KEY) else null
+    val height = if (productCardConfigJson.has(HEIGHT_KEY)) productCardConfigJson.optDouble(HEIGHT_KEY) else null
+    val backgroundColor = if (productCardConfigJson.has(BACKGROUND_COLOR_KEY)) productCardConfigJson.optString(BACKGROUND_COLOR_KEY) else null
+    val iconConfiguration = deserializeProductCardIconConfiguration(productCardConfigJson.optJSONObject(ICON_CONFIGURATION_KEY))
+    val nameLabel = deserializeProductCardLabelConfiguration(productCardConfigJson.optJSONObject(NAME_LABEL_KEY))
 
     return FWProductInfoViewConfiguration.ProductCardConfiguration(
       ctaButtonText = FWProductCardCtaButtonTextValue.deserialize(ctaButtonTextString),
@@ -79,15 +101,64 @@ object FWProductInfoViewConfigurationDeserializer {
       cornerRadius = cornerRadius,
       priceConfiguration = priceConfiguration,
       isCtaButtonHidden = isCtaButtonHidden,
+      ctaButtonStyle = ctaButtonStyle,
+      width = width,
+      height = height,
+      backgroundColor = backgroundColor,
+      iconConfiguration = iconConfiguration,
+      nameLabel = nameLabel,
     )
   }
 
   private fun deserializeProductCardPriceConfiguration(productCardPriceConfigurationJson: JSONObject?): FWProductInfoViewConfiguration.ProductCardPriceConfiguration {
     productCardPriceConfigurationJson ?: return FWProductInfoViewConfiguration.ProductCardPriceConfiguration()
     val isHidden = if (productCardPriceConfigurationJson.has(IS_HIDDEN_KEY)) productCardPriceConfigurationJson.optBoolean(IS_HIDDEN_KEY) else null
+    val isPriceFirst = if (productCardPriceConfigurationJson.has(IS_PRICE_FIRST_KEY)) productCardPriceConfigurationJson.optBoolean(IS_PRICE_FIRST_KEY) else null
+    val priceLabel = deserializeProductCardLabelConfiguration(productCardPriceConfigurationJson.optJSONObject(PRICE_LABEL_KEY))
+    val originalPriceLabel = deserializeProductCardLabelConfiguration(productCardPriceConfigurationJson.optJSONObject(ORIGINAL_PRICE_LABEL_KEY))
 
     return FWProductInfoViewConfiguration.ProductCardPriceConfiguration(
       isHidden = isHidden,
+      isPriceFirst = isPriceFirst,
+      priceLabel = priceLabel,
+      originalPriceLabel = originalPriceLabel,
+    )
+  }
+
+  private fun deserializeProductCardCTAButtonStyle(ctaButtonStyleJson: JSONObject?): FWProductInfoViewConfiguration.ProductCardCTAButtonStyle {
+    ctaButtonStyleJson ?: return FWProductInfoViewConfiguration.ProductCardCTAButtonStyle()
+    val textColor = if (ctaButtonStyleJson.has(TEXT_COLOR_KEY)) ctaButtonStyleJson.optString(TEXT_COLOR_KEY) else null
+    val fontSize = if (ctaButtonStyleJson.has(FONT_SIZE_KEY)) ctaButtonStyleJson.optInt(FONT_SIZE_KEY) else null
+    val fontInfo = FWFontInfoModelDeserializer.deserialize(ctaButtonStyleJson.optJSONObject(ANDROID_FONT_INFO_KEY))
+
+    return FWProductInfoViewConfiguration.ProductCardCTAButtonStyle(
+      textColor = textColor,
+      fontSize = fontSize,
+      fontInfo = fontInfo,
+    )
+  }
+
+  private fun deserializeProductCardLabelConfiguration(labelConfigJson: JSONObject?): FWProductInfoViewConfiguration.ProductCardLabelConfiguration {
+    labelConfigJson ?: return FWProductInfoViewConfiguration.ProductCardLabelConfiguration()
+    val textColor = if (labelConfigJson.has(TEXT_COLOR_KEY)) labelConfigJson.optString(TEXT_COLOR_KEY) else null
+    val fontSize = if (labelConfigJson.has(FONT_SIZE_KEY)) labelConfigJson.optInt(FONT_SIZE_KEY) else null
+    val numberOfLines = if (labelConfigJson.has(NUMBER_OF_LINES_KEY)) labelConfigJson.optInt(NUMBER_OF_LINES_KEY) else null
+    val fontInfo = FWFontInfoModelDeserializer.deserialize(labelConfigJson.optJSONObject(ANDROID_FONT_INFO_KEY))
+
+    return FWProductInfoViewConfiguration.ProductCardLabelConfiguration(
+      textColor = textColor,
+      fontSize = fontSize,
+      numberOfLines = numberOfLines,
+      fontInfo = fontInfo,
+    )
+  }
+
+  private fun deserializeProductCardIconConfiguration(iconConfigJson: JSONObject?): FWProductInfoViewConfiguration.ProductCardIconConfiguration {
+    iconConfigJson ?: return FWProductInfoViewConfiguration.ProductCardIconConfiguration()
+    val cornerRadius = if (iconConfigJson.has(CORNER_RADIUS_KEY)) iconConfigJson.optDouble(CORNER_RADIUS_KEY) else null
+
+    return FWProductInfoViewConfiguration.ProductCardIconConfiguration(
+      cornerRadius = cornerRadius,
     )
   }
 }

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

@@ -1,7 +1,7 @@
 package com.fireworksdk.bridge.models
 
 data class FWShoppingCustomCta(
-  val url: String,
-  val titleKey: String,
-  val title: String,
+  val url: String?,
+  val titleKey: String?,
+  val title: String?,
 )

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

@@ -0,0 +1,30 @@
+package com.fireworksdk.bridge.models
+
+import org.json.JSONObject
+
+object FWTextShadowModelDeserializer {
+
+  private const val OPACITY_KEY = "opacity"
+  private const val COLOR_KEY = "color"
+  private const val OFFSET_X_KEY = "offsetX"
+  private const val OFFSET_Y_KEY = "offsetY"
+  private const val RADIUS_KEY = "radius"
+
+  fun deserialize(responseJson: JSONObject?): FWVideoPlayerConfigModel.FWTextShadowModel? {
+    responseJson ?: return null
+
+    val opacity = if (responseJson.has(OPACITY_KEY)) responseJson.optDouble(OPACITY_KEY) else null
+    val color = if (responseJson.has(COLOR_KEY)) responseJson.optString(COLOR_KEY) else null
+    val offsetX = if (responseJson.has(OFFSET_X_KEY)) responseJson.optDouble(OFFSET_X_KEY) else null
+    val offsetY = if (responseJson.has(OFFSET_Y_KEY)) responseJson.optDouble(OFFSET_Y_KEY) else null
+    val radius = if (responseJson.has(RADIUS_KEY)) responseJson.optDouble(RADIUS_KEY) else null
+
+    return FWVideoPlayerConfigModel.FWTextShadowModel(
+      opacity = opacity,
+      color = color,
+      offsetX = offsetX,
+      offsetY = offsetY,
+      radius = radius,
+    )
+  }
+}

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

@@ -6,4 +6,7 @@ data class FWTrackPurchaseModel(
   val currencyCode: String? = null,
   val countryCode: String? = null,
   val additionalInfo: Map<String, String>? = null,
+  val shippingPrice: Double? = null,
+  val subtotal: Double? = null,
+  val products: List<FWTrackPurchaseProduct>? = null,
 )

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

@@ -8,6 +8,9 @@ object FWTrackPurchaseModelDeserializer {
   private const val VALUE_KEY = "value"
   private const val CURRENCY_CODE_KEY = "currencyCode"
   private const val COUNTRY_KEY = "countryCode"
+  private const val SHIPPING_PRICE_KEY = "shippingPrice"
+  private const val SUB_TOTAL_KEY = "subtotal"
+  private const val PRODUCTS_KEY = "products"
   private const val ADDITIONAL_INFO_KEY = "additionalInfo"
 
 
@@ -17,7 +20,15 @@ object FWTrackPurchaseModelDeserializer {
     val value = if (responseJson.has(VALUE_KEY)) responseJson.optDouble(VALUE_KEY) else null
     val currencyCode = if (responseJson.has(CURRENCY_CODE_KEY)) responseJson.optString(CURRENCY_CODE_KEY) else null
     val countryCode = if (responseJson.has(COUNTRY_KEY)) responseJson.optString(COUNTRY_KEY) else null
+    val shoppingPrice = if (responseJson.has(SHIPPING_PRICE_KEY)) responseJson.optDouble(SHIPPING_PRICE_KEY) else null
+    val subtotal = if (responseJson.has(SUB_TOTAL_KEY)) responseJson.optDouble(SUB_TOTAL_KEY) else null
     val additionalInfoObject = if (responseJson.has(ADDITIONAL_INFO_KEY)) responseJson.optJSONObject(ADDITIONAL_INFO_KEY) else null
+    val productsObject = if (responseJson.has(PRODUCTS_KEY)) responseJson.optJSONArray(PRODUCTS_KEY) else null
+
+    var products: List<FWTrackPurchaseProduct>? = null
+    if (productsObject != null) {
+      products = FWTrackPurchaseProductDeserializer.deserializeArray(productsObject)
+    }
 
     var additionalInfo: Map<String, String>? = null
 
@@ -39,6 +50,9 @@ object FWTrackPurchaseModelDeserializer {
       currencyCode = currencyCode,
       countryCode = countryCode,
       additionalInfo = additionalInfo,
+      shippingPrice = shoppingPrice,
+      subtotal = subtotal,
+      products = products,
     )
   }
 

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

@@ -9,6 +9,9 @@ object FWTrackPurchaseModelSerializer {
   private const val CURRENCY_CODE_KEY = "currencyCode"
   private const val COUNTRY_KEY = "countryCode"
   private const val ADDITIONAL_INFO_KEY = "additionalInfo"
+  private const val SHIPPING_PRICE_KEY = "shippingPrice"
+  private const val SUB_TOTAL_KEY = "subtotal"
+  private const val PRODUCTS_KEY = "products"
 
   fun serialize(model: FWTrackPurchaseModel?): JSONObject? {
     model ?: return null
@@ -17,7 +20,10 @@ object FWTrackPurchaseModelSerializer {
     jsonObject.put(VALUE_KEY, model.value)
     jsonObject.put(CURRENCY_CODE_KEY, model.currencyCode)
     jsonObject.put(COUNTRY_KEY, model.countryCode)
-
+    jsonObject.put(SHIPPING_PRICE_KEY, model.shippingPrice)
+    jsonObject.put(SUB_TOTAL_KEY, model.subtotal)
+    jsonObject.put(PRODUCTS_KEY, FWTrackPurchaseProductSerializer.serializeArray(model.products))
+    
     if (model.additionalInfo != null) {
       val additionalInfoJsonObject = JSONObject()
       val keys = model.additionalInfo.keys

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

@@ -0,0 +1,7 @@
+package com.fireworksdk.bridge.models
+
+data class FWTrackPurchaseProduct(
+  val extProductId: String? = null,
+  val price: Double? = null,
+  val quantity: Int? = null,
+)

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

@@ -0,0 +1,36 @@
+package com.fireworksdk.bridge.models
+
+import org.json.JSONArray
+import org.json.JSONObject
+
+object FWTrackPurchaseProductDeserializer {
+
+  private const val EXT_PRODUCT_ID_KEY = "extProductId"
+  private const val PRICE_KEY = "price"
+  private const val QUANTITY_KEY = "quantity"
+
+  fun deserializeArray(productJsonArray: JSONArray?): List<FWTrackPurchaseProduct>? {
+    productJsonArray ?: return null
+    val list = mutableListOf<FWTrackPurchaseProduct>()
+    (0 until productJsonArray.length()).forEach {
+      val value = productJsonArray.getJSONObject(it)
+      val item = deserialize(value)
+      item?.let { product -> list.add(product) }
+    }
+    return list
+  }
+
+  fun deserialize(responseJson: JSONObject?): FWTrackPurchaseProduct? {
+    responseJson ?: return null
+
+    val extProductId = if (responseJson.has(EXT_PRODUCT_ID_KEY)) responseJson.optString(EXT_PRODUCT_ID_KEY) else null
+    val price = if (responseJson.has(PRICE_KEY)) responseJson.optDouble(PRICE_KEY) else null
+    val quantity = if (responseJson.has(QUANTITY_KEY)) responseJson.optInt(QUANTITY_KEY) else null
+
+    return FWTrackPurchaseProduct(
+      extProductId = extProductId,
+      price = price,
+      quantity = quantity,
+    )
+  }
+}

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

@@ -0,0 +1,29 @@
+package com.fireworksdk.bridge.models
+
+import org.json.JSONArray
+import org.json.JSONObject
+
+object FWTrackPurchaseProductSerializer {
+
+  private const val EXT_PRODUCT_ID_KEY = "extProductId"
+  private const val PRICE_KEY = "price"
+  private const val QUANTITY_KEY = "quantity"
+
+  fun serializeArray(model: List<FWTrackPurchaseProduct>?): JSONArray? {
+    model ?: return null
+    val jsonArray = JSONArray()
+    for (item in model) {
+      jsonArray.put(serialize(item))
+    }
+    return jsonArray
+  }
+
+  fun serialize(model: FWTrackPurchaseProduct?): JSONObject? {
+    model ?: return null
+    val jsonObject = JSONObject()
+    jsonObject.put(EXT_PRODUCT_ID_KEY, model.extProductId)
+    jsonObject.put(PRICE_KEY, model.price)
+    jsonObject.put(QUANTITY_KEY, model.quantity)
+    return jsonObject
+  }
+}

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

@@ -27,7 +27,10 @@ data class FWVideoPlayerConfigModel(
   val showFullScreenIcon: Boolean? = null,
   val enableAutoPlay: Boolean? = null,
   val enableAutoPause: Boolean? = null,
-  val enableSmallSizeInCompact: Boolean? = null
+  val enableSmallSizeInCompact: Boolean? = null,
+  val chatStyle: FWChatStyleModel? = null,
+  val shouldExtendMediaOutsideSafeArea: Boolean? = null,
+  val additionalControlsInset: FWControlsInsetModel? = null,
 ) {
 
   data class FWCtaButtonStyleModel(
@@ -41,4 +44,17 @@ data class FWVideoPlayerConfigModel(
     val type: FWCtaDelayType? = null,
     val value: Double? = null,
   )
+
+  data class FWChatStyleModel(
+    val textColor: String? = null,
+    val textShadow: FWTextShadowModel? = null,
+  )
+
+  data class FWTextShadowModel(
+    val opacity: Double? = null,
+    val color: String? = null,
+    val offsetX: Double? = null,
+    val offsetY: Double? = null,
+    val radius: Double? = null,
+  )
 }