react-native-firework-sdk 2.2.5 → 2.3.1

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

@@ -0,0 +1,22 @@
+package com.fireworksdk.bridge.models
+
+import com.fireworksdk.bridge.models.enums.FWBadgeTextType
+import org.json.JSONObject
+
+object FWAdBadgeConfigModelSerializer {
+
+  private const val BADGE_TEXT_TYPE_KEY = "badgeTextType"
+  private const val BACKGROUND_COLOR_KEY = "backgroundColor"
+  private const val TEXT_COLOR_KEY = "textColor"
+  private const val FONT_INFO_KEY = "androidFontInfo"
+
+  fun serialize(model: FWAdBadgeConfigModel?): JSONObject? {
+    model ?: return null
+    val jsonObject = JSONObject()
+    jsonObject.put(BADGE_TEXT_TYPE_KEY, FWBadgeTextType.serialize(model.badgeTextType))
+    jsonObject.put(BACKGROUND_COLOR_KEY, model.backgroundColor)
+    jsonObject.put(TEXT_COLOR_KEY, model.textColor)
+    jsonObject.put(FONT_INFO_KEY, FWFontInfoModelSerializer.serialize(model.fontInfo))
+    return jsonObject
+  }
+}

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

@@ -1,10 +1,8 @@
 package com.fireworksdk.bridge.models
 
-import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import com.fireworksdk.bridge.models.enums.FWSystemTypeface
 
-@Parcelize
 data class FWFontInfoModel(
   var isCustom: Boolean? = null,
-  var typefaceName: String? = null,
-) : Parcelable
+  var typefaceName: FWSystemTypeface? = null,
+)

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

@@ -1,5 +1,6 @@
 package com.fireworksdk.bridge.models
 
+import com.fireworksdk.bridge.models.enums.FWSystemTypeface
 import org.json.JSONObject
 
 object FWFontInfoModelDeserializer {
@@ -15,7 +16,7 @@ object FWFontInfoModelDeserializer {
 
     return FWFontInfoModel(
       isCustom = isCustom,
-      typefaceName = typefaceName,
+      typefaceName = if (!typefaceName.isNullOrBlank()) FWSystemTypeface.deserialize(typefaceName) else null,
     )
   }
 }

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

@@ -0,0 +1,18 @@
+package com.fireworksdk.bridge.models
+
+import com.fireworksdk.bridge.models.enums.FWSystemTypeface
+import org.json.JSONObject
+
+object FWFontInfoModelSerializer {
+
+  private const val IS_CUSTOM_KEY = "isCustom"
+  private const val TYPEFACE_NAME_KEY = "typefaceName"
+
+  fun serialize(model: FWFontInfoModel?): JSONObject? {
+    model ?: return null
+    val jsonObject = JSONObject()
+    jsonObject.put(IS_CUSTOM_KEY, model.isCustom)
+    jsonObject.put(TYPEFACE_NAME_KEY, FWSystemTypeface.serialize(model.typefaceName))
+    return jsonObject
+  }
+}

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

@@ -0,0 +1,8 @@
+package com.fireworksdk.bridge.models
+
+import com.fireworksdk.bridge.models.enums.FWGradientDrawableOrientation
+
+data class FWGradientDrawableModel(
+  val orientation: FWGradientDrawableOrientation? = null,
+  val colors: List<String>? = null,
+)

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

@@ -0,0 +1,35 @@
+package com.fireworksdk.bridge.models
+
+import com.fireworksdk.bridge.models.enums.FWGradientDrawableOrientation
+import org.json.JSONArray
+import org.json.JSONObject
+
+object FWGradientDrawableModelDeserializer {
+
+  private const val ORIENTATION_KEY = "orientation"
+  private const val COLORS_KEY = "colors"
+
+  fun deserialize(responseJson: JSONObject?): FWGradientDrawableModel? {
+    responseJson ?: return null
+
+    val orientation = if (responseJson.has(ORIENTATION_KEY)) responseJson.optString(ORIENTATION_KEY) else null
+    val colorsJsonArray = if (responseJson.has(COLORS_KEY)) responseJson.optJSONArray(COLORS_KEY) else null
+    val colors = deserializeColors(colorsJsonArray)
+
+    return FWGradientDrawableModel(
+      orientation = if (!orientation.isNullOrBlank()) FWGradientDrawableOrientation.deserialize(orientation) else null,
+      colors = colors,
+    )
+  }
+
+  private fun deserializeColors(colorsJsonArray: JSONArray?): List<String>? {
+    colorsJsonArray ?: return null
+
+    val list = mutableListOf<String>()
+    (0 until colorsJsonArray.length()).forEach {
+      val value = colorsJsonArray.getString(it)
+      list.add(value)
+    }
+    return list
+  }
+}

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

@@ -0,0 +1,27 @@
+package com.fireworksdk.bridge.models
+
+import com.fireworksdk.bridge.models.enums.FWGradientDrawableOrientation
+import org.json.JSONArray
+import org.json.JSONObject
+
+object FWGradientDrawableModelSerializer {
+
+  private const val ORIENTATION_KEY = "orientation"
+  private const val COLORS_KEY = "colors"
+
+  fun serialize(model: FWGradientDrawableModel?): JSONObject? {
+    model ?: return null
+    val jsonObject = JSONObject()
+    jsonObject.put(ORIENTATION_KEY, FWGradientDrawableOrientation.serialize(model.orientation))
+
+    if (!model.colors.isNullOrEmpty()) {
+      val colorJsonArray = JSONArray()
+      for (color in model.colors) {
+        colorJsonArray.put(color)
+      }
+      jsonObject.put(COLORS_KEY, colorJsonArray)
+    }
+
+    return jsonObject
+  }
+}

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

@@ -1,9 +1,5 @@
 package com.fireworksdk.bridge.models
 
-import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
-
-@Parcelize
 data class FWLiveStreamEventDetailsModel(
   val id: String? = null,
-) : Parcelable
+)

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

@@ -1,11 +1,7 @@
 package com.fireworksdk.bridge.models
 
-import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
-
-@Parcelize
 data class FWLiveStreamMessageDetailsModel(
   val messageId: String? = null,
   val username: String? = null,
   val text: String? = null,
-) : Parcelable
+)

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

@@ -1,30 +1,20 @@
 package com.fireworksdk.bridge.models
 
-import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import com.fireworksdk.bridge.models.enums.FWCtaButtonTextValue
 
-@Parcelize
 data class FWProductInfoViewConfiguration(
   val ctaButton: CtaButtonConfiguration? = null,
   val linkButton: LinkButtonConfiguration? = null,
-) : Parcelable {
+) {
 
-  @Parcelize
   data class CtaButtonConfiguration(
-    val text: TextValue? = null,
+    val text: FWCtaButtonTextValue? = null,
     val backgroundColor: String? = null,
     val textColor: String? = null,
     val fontSize: Int? = null,
-  ) : Parcelable {
+  )
 
-    enum class TextValue(val rawValue: String) {
-      AddToCart("addToCart"),
-      ShopNow("shopNow"),
-    }
-  }
-
-  @Parcelize
   data class LinkButtonConfiguration(
     val isHidden: Boolean? = null,
-  ) : Parcelable
+  )
 }

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

@@ -1,5 +1,6 @@
 package com.fireworksdk.bridge.models
 
+import com.fireworksdk.bridge.models.enums.FWCtaButtonTextValue
 import org.json.JSONObject
 
 object FWProductInfoViewConfigurationDeserializer {
@@ -34,16 +35,8 @@ object FWProductInfoViewConfigurationDeserializer {
     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
 
-    var text = FWProductInfoViewConfiguration.CtaButtonConfiguration.TextValue.AddToCart
-    when (textString) {
-      FWProductInfoViewConfiguration.CtaButtonConfiguration.TextValue.ShopNow.rawValue -> {
-        text = FWProductInfoViewConfiguration.CtaButtonConfiguration.TextValue.ShopNow
-      }
-      else -> {}
-    }
-
     return FWProductInfoViewConfiguration.CtaButtonConfiguration(
-      text = text,
+      text = FWCtaButtonTextValue.deserialize(textString ?: FWCtaButtonTextValue.AddToCart.rawValue),
       backgroundColor = backgroundColor,
       textColor = textColor,
       fontSize = fontSize,

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

@@ -0,0 +1,42 @@
+package com.fireworksdk.bridge.models
+
+import com.fireworksdk.bridge.models.enums.FWCtaButtonTextValue
+import org.json.JSONObject
+
+object FWProductInfoViewConfigurationSerializer {
+
+  private const val CTA_BUTTON = "ctaButton"
+  private const val LINK_BUTTON = "linkButton"
+
+  private const val TEXT_KEY = "text"
+  private const val BACKGROUND_COLOR_KEY = "backgroundColor"
+  private const val TEXT_COLOR_KEY = "textColor"
+  private const val FONT_SIZE_KEY = "fontSize"
+
+  private const val IS_HIDDEN_KEY = "isHidden"
+
+  fun serialize(model: FWProductInfoViewConfiguration?): JSONObject? {
+    model ?: return null
+    val jsonObject = JSONObject()
+    jsonObject.put(CTA_BUTTON, serializeCtaButtonConfiguration(model.ctaButton))
+    jsonObject.put(LINK_BUTTON, serializeLinkButtonConfiguration(model.linkButton))
+    return jsonObject
+  }
+
+  private fun serializeCtaButtonConfiguration(model: FWProductInfoViewConfiguration.CtaButtonConfiguration?): JSONObject? {
+    model ?: return null
+    val jsonObject = JSONObject()
+    jsonObject.put(TEXT_KEY, FWCtaButtonTextValue.serialize(model.text))
+    jsonObject.put(BACKGROUND_COLOR_KEY, model.backgroundColor)
+    jsonObject.put(TEXT_COLOR_KEY, model.textColor)
+    jsonObject.put(FONT_SIZE_KEY, model.fontSize)
+    return jsonObject
+  }
+
+  private fun serializeLinkButtonConfiguration(model: FWProductInfoViewConfiguration.LinkButtonConfiguration?): JSONObject? {
+    model ?: return null
+    val jsonObject = JSONObject()
+    jsonObject.put(IS_HIDDEN_KEY, model.isHidden)
+    return jsonObject
+  }
+}

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

@@ -1,11 +1,9 @@
 package com.fireworksdk.bridge.models
 
-import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import com.fireworksdk.bridge.models.enums.FWPlayerLaunchBehavior
 
-@Parcelize
 data class FWSDKInitOptionsModel(
   val userId: String? = null,
   val shareBaseURL: String? = null,
-  val videoLaunchBehavior: String? = null,
-) : Parcelable
+  val videoLaunchBehavior: FWPlayerLaunchBehavior? = null,
+)

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

@@ -1,5 +1,6 @@
 package com.fireworksdk.bridge.models
 
+import com.fireworksdk.bridge.models.enums.FWPlayerLaunchBehavior
 import org.json.JSONObject
 
 object FWSDKInitOptionsModelDeserializer {
@@ -18,7 +19,7 @@ object FWSDKInitOptionsModelDeserializer {
     return FWSDKInitOptionsModel(
       userId = userId,
       shareBaseURL = shareBaseURL,
-      videoLaunchBehavior = videoLaunchBehavior,
+      videoLaunchBehavior = if (!videoLaunchBehavior.isNullOrBlank()) FWPlayerLaunchBehavior.deserialize(videoLaunchBehavior) else null ,
     )
   }
 }

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

@@ -0,0 +1,20 @@
+package com.fireworksdk.bridge.models
+
+import com.fireworksdk.bridge.models.enums.FWPlayerLaunchBehavior
+import org.json.JSONObject
+
+object FWSDKInitOptionsModelSerializer {
+
+  private const val USER_ID_KEY = "userId"
+  private const val SHARE_BASE_URL_KEY = "shareBaseURL"
+  private const val VIDEO_LAUNCH_BEHAVIOR_KEY = "videoLaunchBehavior"
+
+  fun serialize(model: FWSDKInitOptionsModel?): JSONObject? {
+    model ?: return null
+    val jsonObject = JSONObject()
+    jsonObject.put(USER_ID_KEY, model.userId)
+    jsonObject.put(SHARE_BASE_URL_KEY, model.shareBaseURL)
+    jsonObject.put(VIDEO_LAUNCH_BEHAVIOR_KEY, FWPlayerLaunchBehavior.serialize(model.videoLaunchBehavior))
+    return jsonObject
+  }
+}

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

@@ -1,17 +1,8 @@
 package com.fireworksdk.bridge.models
 
-import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import com.fireworksdk.bridge.models.enums.FWShoppingCtaResultRes
 
-@Parcelize
 data class FWShoppingCtaResult(
-  val res: Res? = null,
+  val res: FWShoppingCtaResultRes? = null,
   val tips: String? = null,
-) : Parcelable {
-
-  enum class Res(val rawValue: String) {
-    Success("success"),
-    Fail("fail"),
-    Loading("loading"),
-  }
-}
+)

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

@@ -1,5 +1,6 @@
 package com.fireworksdk.bridge.models
 
+import com.fireworksdk.bridge.models.enums.FWShoppingCtaResultRes
 import org.json.JSONObject
 
 object FWShoppingCtaResultDeserializer {
@@ -7,26 +8,14 @@ object FWShoppingCtaResultDeserializer {
   private const val RES_KEY = "res"
   private const val TIPS_KEY = "tips"
 
-
   fun deserialize(responseJson: JSONObject?): FWShoppingCtaResult? {
     responseJson?: return null
 
     val resString = if (responseJson.has(RES_KEY)) responseJson.optString(RES_KEY) else null
     val tips = if (responseJson.has(TIPS_KEY)) responseJson.optString(TIPS_KEY) else null
 
-    var res = FWShoppingCtaResult.Res.Success
-    when (resString) {
-      FWShoppingCtaResult.Res.Fail.rawValue -> {
-        res = FWShoppingCtaResult.Res.Fail
-      }
-      FWShoppingCtaResult.Res.Loading.rawValue -> {
-        res = FWShoppingCtaResult.Res.Loading
-      }
-      else -> {}
-    }
-
     return FWShoppingCtaResult(
-      res = res,
+      res = if (!resString.isNullOrBlank()) FWShoppingCtaResultRes.deserialize(resString) else null,
       tips = tips,
     )
   }

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

@@ -0,0 +1,18 @@
+package com.fireworksdk.bridge.models
+
+import com.fireworksdk.bridge.models.enums.FWShoppingCtaResultRes
+import org.json.JSONObject
+
+object FWShoppingCtaResultSerializer {
+
+  private const val RES_KEY = "res"
+  private const val TIPS_KEY = "tips"
+
+  fun serialize(model: FWShoppingCtaResult?): JSONObject? {
+    model ?: return null
+    val jsonObject = JSONObject()
+    jsonObject.put(RES_KEY, FWShoppingCtaResultRes.serialize(model.res))
+    jsonObject.put(TIPS_KEY, model.tips)
+    return jsonObject
+  }
+}

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

@@ -1,31 +1,30 @@
 package com.fireworksdk.bridge.models
 
-import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import com.fireworksdk.bridge.models.enums.FWVideoFeedTitlePosition
 
-@Parcelize
 data class FWVideoFeedConfigModel(
   val backgroundColor: String? = null,
   val cornerRadius: Int? = null,
   val title: FWTitleModel? = null,
-  val titlePosition: String? = null,
+  val titlePosition: FWVideoFeedTitlePosition? = null,
   val playIcon: FWPlayIconModel? = null,
   val showAdBadge: Boolean? = null,
   val enableAutoplay: Boolean? = null,
   val gridColumns: Int? = null,
-) : Parcelable {
+  val itemSpacing: Int? = null,
+) {
 
-  @Parcelize
   data class FWTitleModel(
     val hidden: Boolean? = null,
     val textColor: String? = null,
     val fontSize: Int? = null,
     val fontInfo: FWFontInfoModel? = null,
-  ) : Parcelable
+    val backgroundColor: String? = null,
+    val gradientDrawable: FWGradientDrawableModel? = null,
+  )
 
-  @Parcelize
   data class FWPlayIconModel(
     val hidden: Boolean? = null,
     val iconWidth: Int? = null,
-  ) : Parcelable
+  )
 }

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

@@ -1,5 +1,6 @@
 package com.fireworksdk.bridge.models
 
+import com.fireworksdk.bridge.models.enums.FWVideoFeedTitlePosition
 import org.json.JSONObject
 
 object FWVideoFeedConfigModelDeserializer {
@@ -12,11 +13,13 @@ object FWVideoFeedConfigModelDeserializer {
   private const val SHOW_AD_BADGE_KEY = "showAdBadge"
   private const val ENABLE_AUTOPLAY_KEY = "enableAutoplay"
   private const val GRID_COLUMNS_KEY = "gridColumns"
+  private const val ITEM_SPACING_KEY = "itemSpacing"
 
   private const val HIDDEN_KEY = "hidden"
   private const val TEXT_COLOR_KEY = "textColor"
   private const val FONT_SIZE_KEY = "fontSize"
   private const val FONT_INFO_KEY = "androidFontInfo"
+  private const val GRADIENT_DRAWABLE_KEY = "gradientDrawable"
 
   private const val ICON_WIDTH_KEY = "iconWidth"
 
@@ -24,23 +27,25 @@ object FWVideoFeedConfigModelDeserializer {
     responseJson?: return null
 
     val backgroundColor = if (responseJson.has(BACKGROUND_COLOR_KEY)) responseJson.optString(BACKGROUND_COLOR_KEY) else null
-    val cornerRadius = if (responseJson.has(CORNER_RADIUS_KEY)) responseJson.optInt(CORNER_RADIUS_KEY) else null
+    val cornerRadius = if (!responseJson.isNull(CORNER_RADIUS_KEY)) responseJson.optInt(CORNER_RADIUS_KEY) else null
     val title = if (responseJson.has(TITLE_KEY)) deserializeTitle(responseJson.optJSONObject(TITLE_KEY)) else null
     val titlePosition = if (responseJson.has(TITLE_POSITION_KEY)) responseJson.optString(TITLE_POSITION_KEY) else null
     val playIcon = if (responseJson.has(PLAY_ICON_KEY)) deserializePlayIcon(responseJson.optJSONObject(PLAY_ICON_KEY)) else null
     val showAdBadge = if (responseJson.has(SHOW_AD_BADGE_KEY)) responseJson.optBoolean(SHOW_AD_BADGE_KEY) else null
     val enableAutoplay = if (responseJson.has(ENABLE_AUTOPLAY_KEY)) responseJson.optBoolean(ENABLE_AUTOPLAY_KEY) else null
-    val gridColumns = if (responseJson.has(GRID_COLUMNS_KEY)) responseJson.optInt(GRID_COLUMNS_KEY) else null
+    val gridColumns = if (!responseJson.isNull(GRID_COLUMNS_KEY)) responseJson.optInt(GRID_COLUMNS_KEY) else null
+    val itemSpacing = if (!responseJson.isNull(ITEM_SPACING_KEY)) responseJson.optInt(ITEM_SPACING_KEY) else null
 
     return FWVideoFeedConfigModel(
       backgroundColor = backgroundColor,
       cornerRadius = cornerRadius,
       title = title,
-      titlePosition = titlePosition,
+      titlePosition = if (!titlePosition.isNullOrBlank()) FWVideoFeedTitlePosition.deserialize(titlePosition) else null,
       playIcon = playIcon,
       showAdBadge = showAdBadge,
       enableAutoplay = enableAutoplay,
       gridColumns = gridColumns,
+      itemSpacing = itemSpacing,
     )
   }
 
@@ -51,18 +56,24 @@ object FWVideoFeedConfigModelDeserializer {
     val textColor = if (titleJson.has(TEXT_COLOR_KEY)) titleJson.optString(TEXT_COLOR_KEY) else null
     val fontSize = if (titleJson.has(FONT_SIZE_KEY)) titleJson.optInt(FONT_SIZE_KEY) else null
     val fontInfo = FWFontInfoModelDeserializer.deserialize(titleJson.optJSONObject(FONT_INFO_KEY))
+    val backgroundColor = if (titleJson.has(BACKGROUND_COLOR_KEY)) titleJson.optString(BACKGROUND_COLOR_KEY) else null
+    val gradientDrawable = FWGradientDrawableModelDeserializer.deserialize(titleJson.optJSONObject(GRADIENT_DRAWABLE_KEY))
 
     return FWVideoFeedConfigModel.FWTitleModel(
       hidden = hidden,
       textColor = textColor,
       fontSize = fontSize,
-      fontInfo = fontInfo
+      fontInfo = fontInfo,
+      backgroundColor = backgroundColor,
+      gradientDrawable = gradientDrawable,
     )
   }
 
   private fun deserializePlayIcon(titleJson: JSONObject?): FWVideoFeedConfigModel.FWPlayIconModel {
-    val hidden = titleJson?.optBoolean(HIDDEN_KEY)
-    val iconWidth = titleJson?.optInt(ICON_WIDTH_KEY)
+    titleJson ?: return FWVideoFeedConfigModel.FWPlayIconModel()
+
+    val hidden = titleJson.optBoolean(HIDDEN_KEY)
+    val iconWidth = if (!titleJson.isNull(ICON_WIDTH_KEY)) titleJson.optInt(ICON_WIDTH_KEY) else null
 
     return FWVideoFeedConfigModel.FWPlayIconModel(
       hidden = hidden,

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

@@ -0,0 +1,59 @@
+package com.fireworksdk.bridge.models
+
+import com.fireworksdk.bridge.models.enums.FWVideoFeedTitlePosition
+import org.json.JSONObject
+
+object FWVideoFeedConfigModelSerializer {
+
+  private const val BACKGROUND_COLOR_KEY = "backgroundColor"
+  private const val CORNER_RADIUS_KEY = "cornerRadius"
+  private const val TITLE_KEY = "title"
+  private const val TITLE_POSITION_KEY = "titlePosition"
+  private const val PLAY_ICON_KEY = "playIcon"
+  private const val SHOW_AD_BADGE_KEY = "showAdBadge"
+  private const val ENABLE_AUTOPLAY_KEY = "enableAutoplay"
+  private const val GRID_COLUMNS_KEY = "gridColumns"
+  private const val ITEM_SPACING_KEY = "itemSpacing"
+
+  private const val HIDDEN_KEY = "hidden"
+  private const val TEXT_COLOR_KEY = "textColor"
+  private const val FONT_SIZE_KEY = "fontSize"
+  private const val FONT_INFO_KEY = "androidFontInfo"
+  private const val GRADIENT_DRAWABLE_KEY = "gradientDrawable"
+
+  private const val ICON_WIDTH_KEY = "iconWidth"
+
+  fun serialize(model: FWVideoFeedConfigModel?): JSONObject? {
+    model ?: return null
+    val jsonObject = JSONObject()
+    jsonObject.put(BACKGROUND_COLOR_KEY, model.backgroundColor)
+    jsonObject.put(CORNER_RADIUS_KEY, model.cornerRadius)
+    jsonObject.put(TITLE_KEY, serializeTitle(model.title))
+    jsonObject.put(TITLE_POSITION_KEY, FWVideoFeedTitlePosition.serialize(model.titlePosition))
+    jsonObject.put(PLAY_ICON_KEY, serializePlayIcon(model.playIcon))
+    jsonObject.put(SHOW_AD_BADGE_KEY, model.showAdBadge)
+    jsonObject.put(ENABLE_AUTOPLAY_KEY, model.enableAutoplay)
+    jsonObject.put(GRID_COLUMNS_KEY, model.gridColumns)
+    jsonObject.put(ITEM_SPACING_KEY, model.itemSpacing)
+    return jsonObject
+  }
+
+  private fun serializeTitle(model: FWVideoFeedConfigModel.FWTitleModel?): JSONObject? {
+    model ?: return null
+    val jsonObject = JSONObject()
+    jsonObject.put(HIDDEN_KEY, model.hidden)
+    jsonObject.put(TEXT_COLOR_KEY, model.textColor)
+    jsonObject.put(FONT_SIZE_KEY, model.fontSize)
+    jsonObject.put(FONT_INFO_KEY, FWFontInfoModelSerializer.serialize(model.fontInfo))
+    jsonObject.put(GRADIENT_DRAWABLE_KEY, FWGradientDrawableModelSerializer.serialize(model.gradientDrawable))
+    return jsonObject
+  }
+
+  private fun serializePlayIcon(model: FWVideoFeedConfigModel.FWPlayIconModel?): JSONObject? {
+    model ?: return null
+    val jsonObject = JSONObject()
+    jsonObject.put(HIDDEN_KEY, model.hidden)
+    jsonObject.put(ICON_WIDTH_KEY, model.iconWidth)
+    return jsonObject
+  }
+}

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

@@ -1,9 +1,5 @@
 package com.fireworksdk.bridge.models
 
-import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
-
-@Parcelize
 data class FWVideoFeedItemDetailsModel(
   val index: Int?,
   val id: String?,
@@ -14,4 +10,4 @@ data class FWVideoFeedItemDetailsModel(
   val playlist: String?,
   val channel: String?,
   val dynamicContentParameters: Map<String, List<String>>?,
-) : Parcelable
+)

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

@@ -1,19 +1,18 @@
 package com.fireworksdk.bridge.models
 
-import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import com.fireworksdk.bridge.models.enums.FWVideoFeedMode
+import com.fireworksdk.bridge.models.enums.FWVideoFeedSource
 
-
-@Parcelize
 data class FWVideoFeedPropsModel(
-    val source: String? = null,
-    val channel: String? = null,
-    val playlist: String? = null,
-    val playlistGroup: String? = null,
-    val hashtagFilterExpression: String? = null,
-    val mode: String? = null,
-    val enablePictureInPicture: Boolean? = null,
-    val videoFeedConfiguration: FWVideoFeedConfigModel? = null,
-    val videoPlayerConfiguration: FWVideoPlayerConfigModel? = null,
-    val dynamicContentParameters: Map<String, List<String>>? = null,
-) : Parcelable
+  val source: FWVideoFeedSource? = null,
+  val channel: String? = null,
+  val playlist: String? = null,
+  val playlistGroup: String? = null,
+  val hashtagFilterExpression: String? = null,
+  val mode: FWVideoFeedMode? = null,
+  val enablePictureInPicture: Boolean? = null,
+  val videoFeedConfiguration: FWVideoFeedConfigModel? = null,
+  val videoPlayerConfiguration: FWVideoPlayerConfigModel? = null,
+  val dynamicContentParameters: Map<String, List<String>>? = null,
+  val marginRight: Double? = null,
+)