react-native-firework-sdk 2.18.12 → 2.19.0

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.30.2
+FireworkSDK_fwNativeVersion=6.30.6

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

@@ -25,6 +25,7 @@ import com.fireworksdk.bridge.models.FWVideoFeedPropsModel
 import com.fireworksdk.bridge.models.FWVideoFeedPropsModelDeserializer
 import com.fireworksdk.bridge.models.FWVideoFeedPropsModelSerializer
 import com.fireworksdk.bridge.utils.FWCommonUtil
+import com.fireworksdk.bridge.utils.FWComponentType
 import com.fireworksdk.bridge.utils.FWConfigUtil
 import com.fireworksdk.bridge.utils.FWGlobalDataUtil
 import com.fireworksdk.bridge.utils.FWLanguageUtil
@@ -124,7 +125,7 @@ class StoryBlockFragment : FWBaseFragment() {
   }
 
   private fun initStoryBlock() {
-    val viewOptionsBuilder = FWConfigUtil.generateViewOptionsBuilder(context, videoFeedPropsModel)
+    val viewOptionsBuilder = FWConfigUtil.generateViewOptionsBuilder(context, videoFeedPropsModel, FWComponentType.STORY_BLOCK)
 
     fwStoryBlockView?.init(
       fragmentManager = childFragmentManager,

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

@@ -7,6 +7,7 @@ import com.firework.error.FwErrorListener
 import com.firework.videofeed.FeedViewStateListener
 import com.firework.videofeed.FwVideoFeedView
 import com.fireworksdk.bridge.models.*
+import com.fireworksdk.bridge.utils.FWComponentType
 import com.fireworksdk.bridge.utils.FWConfigUtil
 import com.fireworksdk.bridge.utils.FWLanguageUtil
 
@@ -41,7 +42,7 @@ class FWVideoFeed(
     if (isInit) {
       return
     }
-    val viewOptionsBuilder = FWConfigUtil.generateViewOptionsBuilder(context, videoFeedPropsModel)
+    val viewOptionsBuilder = FWConfigUtil.generateViewOptionsBuilder(context, videoFeedPropsModel,  FWComponentType.VIDEO_FEED)
     videoFeedView.init(viewOptionsBuilder.build())
     isInit = true
   }

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

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

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

@@ -4,12 +4,14 @@ import org.json.JSONObject
 
 object FWControlsInsetModelDeserializer {
   private const val TOP = "top"
+  private const val BOTTOM = "bottom"
 
   fun deserialize(jsonObject: JSONObject?): FWControlsInsetModel? {
     jsonObject ?: return null
 
     return FWControlsInsetModel(
       top = jsonObject.optInt(TOP, 0),
+      bottom = jsonObject.optInt(BOTTOM, 0),
     )
   }
 }

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

@@ -5,12 +5,14 @@ import org.json.JSONObject
 object FWControlsInsetModelSerializer {
 
   private const val TOP = "top"
+  private const val BOTTOM = "bottom"
 
   fun serialize(model: FWControlsInsetModel?): JSONObject? {
     model ?: return null
 
     val jsonObject = JSONObject()
     model.top?.let { jsonObject.put(TOP, it) }
+    model.bottom?.let { jsonObject.put(BOTTOM, it) }
 
     return jsonObject
   }

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

@@ -1,6 +1,7 @@
 package com.fireworksdk.bridge.models
 
 import com.fireworksdk.bridge.models.enums.FWCtaDelayType
+import com.fireworksdk.bridge.models.enums.FWFeedCompleteAction
 import com.fireworksdk.bridge.models.enums.FWPlayerStyle
 import com.fireworksdk.bridge.models.enums.FWVideoCompleteAction
 import com.fireworksdk.bridge.models.enums.FWVideoPlayerCTAWidth
@@ -11,6 +12,7 @@ data class FWVideoPlayerConfigModel(
   val scrollDirection: FWVideoPlayerScrollDirection? = null,
   val enableScrollForVertical: Boolean? = null,
   val videoCompleteAction: FWVideoCompleteAction? = null,
+  val feedCompleteAction: FWFeedCompleteAction? = null,
   val showShareButton: Boolean? = null,
   val ctaButtonStyle: FWCtaButtonStyleModel? = null,
   val showMuteButton: Boolean? = null,
@@ -34,6 +36,8 @@ data class FWVideoPlayerConfigModel(
   val chatStyle: FWChatStyleModel? = null,
   val shouldExtendMediaOutsideSafeArea: Boolean? = null,
   val additionalControlsInset: FWControlsInsetModel? = null,
+  val isArrowButtonVisible: Boolean? = null,
+  val isFullscreenArrowButtonVisible: Boolean? = null,
 ) {
 
   data class FWCtaButtonStyleModel(

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

@@ -1,6 +1,7 @@
 package com.fireworksdk.bridge.models
 
 import com.fireworksdk.bridge.models.enums.FWCtaDelayType
+import com.fireworksdk.bridge.models.enums.FWFeedCompleteAction
 import com.fireworksdk.bridge.models.enums.FWPlayerStyle
 import com.fireworksdk.bridge.models.enums.FWVideoCompleteAction
 import com.fireworksdk.bridge.models.enums.FWVideoPlayerCTAWidth
@@ -13,6 +14,7 @@ object FWVideoPlayerConfigModelDeserializer {
   private const val SCROLL_DIRECTION_KEY = "scrollDirection"
   private const val ENABLE_SCROLL_FOR_VERTICAL_KEY = "enableScrollForVertical"
   private const val VIDEO_COMPLETE_ACTION_KEY = "videoCompleteAction"
+  private const val FEED_COMPLETE_ACTION_KEY = "feedCompleteAction"
   private const val SHOW_SHARE_BUTTON_KEY = "showShareButton"
   private const val CTA_BUTTON_STYLE_KEY = "ctaButtonStyle"
   private const val SHOW_MUTE_BUTTON_KEY = "showMuteButton"
@@ -48,6 +50,8 @@ object FWVideoPlayerConfigModelDeserializer {
   private const val ENABLE_SMALL_SIZE_IN_COMPACT = "enableSmallSizeInCompact"
   private const val SHOULD_EXTEND_MEDIA_OUTSIDE_SAFE_AREA_KEY = "shouldExtendMediaOutsideSafeArea"
   private const val ADDITIONAL_CONTROLS_INSET_KEY = "additionalControlsInset"
+  private const val IS_ARROW_BUTTON_VISIBLE_KEY = "isArrowButtonVisible"
+  private const val IS_FULLSCREEN_ARROW_BUTTON_VISIBLE_KEY = "isFullscreenArrowButtonVisible"
 
   fun deserialize(responseJson: JSONObject?): FWVideoPlayerConfigModel? {
     responseJson ?: return null
@@ -56,6 +60,7 @@ object FWVideoPlayerConfigModelDeserializer {
     val scrollDirection = if (responseJson.has(SCROLL_DIRECTION_KEY)) responseJson.optString(SCROLL_DIRECTION_KEY) else null
     val enableScrollForVertical = if (responseJson.has(ENABLE_SCROLL_FOR_VERTICAL_KEY)) responseJson.optBoolean(ENABLE_SCROLL_FOR_VERTICAL_KEY) else null
     val videoCompleteAction = if (responseJson.has(VIDEO_COMPLETE_ACTION_KEY)) responseJson.optString(VIDEO_COMPLETE_ACTION_KEY) else null
+    val feedCompleteAction = if (responseJson.has(FEED_COMPLETE_ACTION_KEY)) responseJson.optString(FEED_COMPLETE_ACTION_KEY) else null
     val showShareButton = if (responseJson.has(SHOW_SHARE_BUTTON_KEY)) responseJson.optBoolean(SHOW_SHARE_BUTTON_KEY) else null
     val ctaButtonStyle = deserializeCtaButtonStyle(responseJson.optJSONObject(CTA_BUTTON_STYLE_KEY))
     val showMuteButton = if (responseJson.has(SHOW_MUTE_BUTTON_KEY)) responseJson.optBoolean(SHOW_MUTE_BUTTON_KEY) else null
@@ -86,12 +91,17 @@ object FWVideoPlayerConfigModelDeserializer {
       if (responseJson.has(SHOULD_EXTEND_MEDIA_OUTSIDE_SAFE_AREA_KEY)) responseJson.optBoolean(SHOULD_EXTEND_MEDIA_OUTSIDE_SAFE_AREA_KEY) else null
     val additionalControlsInset =
       if (responseJson.has(ADDITIONAL_CONTROLS_INSET_KEY)) FWControlsInsetModelDeserializer.deserialize(responseJson.optJSONObject(ADDITIONAL_CONTROLS_INSET_KEY)) else null
+    val isArrowButtonVisible =
+      if (responseJson.has(IS_ARROW_BUTTON_VISIBLE_KEY)) responseJson.optBoolean(IS_ARROW_BUTTON_VISIBLE_KEY) else null
+    val isFullscreenArrowButtonVisible =
+      if (responseJson.has(IS_FULLSCREEN_ARROW_BUTTON_VISIBLE_KEY)) responseJson.optBoolean(IS_FULLSCREEN_ARROW_BUTTON_VISIBLE_KEY) else null
 
     return FWVideoPlayerConfigModel(
       playerStyle = if (!playerStyle.isNullOrBlank()) FWPlayerStyle.deserialize(playerStyle) else null,
       scrollDirection = if (!scrollDirection.isNullOrBlank()) FWVideoPlayerScrollDirection.deserialize(scrollDirection) else null,
       enableScrollForVertical = enableScrollForVertical,
       videoCompleteAction = if (!videoCompleteAction.isNullOrBlank()) FWVideoCompleteAction.deserialize(videoCompleteAction) else null,
+      feedCompleteAction = if (!feedCompleteAction.isNullOrBlank()) FWFeedCompleteAction.deserialize(feedCompleteAction) else null,
       showShareButton = showShareButton,
       ctaButtonStyle = ctaButtonStyle,
       showMuteButton = showMuteButton,
@@ -115,6 +125,8 @@ object FWVideoPlayerConfigModelDeserializer {
       chatStyle = FWChatConfigModelDeserializer.deserialize(chatStyleJsonObject),
       shouldExtendMediaOutsideSafeArea = shouldExtendMediaOutsideSafeArea,
       additionalControlsInset = additionalControlsInset,
+      isArrowButtonVisible = isArrowButtonVisible,
+      isFullscreenArrowButtonVisible = isFullscreenArrowButtonVisible,
     )
   }
 

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

@@ -1,6 +1,7 @@
 package com.fireworksdk.bridge.models
 
 import com.fireworksdk.bridge.models.enums.FWCtaDelayType
+import com.fireworksdk.bridge.models.enums.FWFeedCompleteAction
 import com.fireworksdk.bridge.models.enums.FWPlayerStyle
 import com.fireworksdk.bridge.models.enums.FWVideoCompleteAction
 import com.fireworksdk.bridge.models.enums.FWVideoPlayerCTAWidth
@@ -13,6 +14,7 @@ object FWVideoPlayerConfigModelSerializer {
   private const val SCROLL_DIRECTION_KEY = "scrollDirection"
   private const val ENABLE_SCROLL_FOR_VERTICAL_KEY = "enableScrollForVertical"
   private const val VIDEO_COMPLETE_ACTION_KEY = "videoCompleteAction"
+  private const val FEED_COMPLETE_ACTION_KEY = "feedCompleteAction"
   private const val SHOW_SHARE_BUTTON_KEY = "showShareButton"
   private const val CTA_BUTTON_STYLE_KEY = "ctaButtonStyle"
   private const val SHOW_MUTE_BUTTON_KEY = "showMuteButton"
@@ -52,6 +54,8 @@ object FWVideoPlayerConfigModelSerializer {
   private const val ENABLE_SMALL_SIZE_IN_COMPACT = "enableSmallSizeInCompact"
   private const val SHOULD_EXTEND_MEDIA_OUTSIDE_SAFE_AREA_KEY = "shouldExtendMediaOutsideSafeArea"
   private const val ADDITIONAL_CONTROLS_INSET_KEY = "additionalControlsInset"
+  private const val IS_ARROW_BUTTON_VISIBLE_KEY = "isArrowButtonVisible"
+  private const val IS_FULLSCREEN_ARROW_BUTTON_VISIBLE_KEY = "isFullscreenArrowButtonVisible"
 
 
   fun serialize(model: FWVideoPlayerConfigModel?): JSONObject? {
@@ -61,6 +65,7 @@ object FWVideoPlayerConfigModelSerializer {
     jsonObject.put(SCROLL_DIRECTION_KEY, FWVideoPlayerScrollDirection.serialize(model.scrollDirection))
     jsonObject.put(ENABLE_SCROLL_FOR_VERTICAL_KEY, model.enableScrollForVertical)
     jsonObject.put(VIDEO_COMPLETE_ACTION_KEY, FWVideoCompleteAction.serialize(model.videoCompleteAction))
+    jsonObject.put(FEED_COMPLETE_ACTION_KEY, FWFeedCompleteAction.serialize(model.feedCompleteAction))
     jsonObject.put(SHOW_SHARE_BUTTON_KEY, model.showShareButton)
     jsonObject.put(CTA_BUTTON_STYLE_KEY, serializeCtaButtonStyle(model.ctaButtonStyle))
     jsonObject.put(CHAT_STYLE_KEY, serializeChatStyle(model.chatStyle))
@@ -84,6 +89,8 @@ object FWVideoPlayerConfigModelSerializer {
     jsonObject.put(ENABLE_SMALL_SIZE_IN_COMPACT, model.enableSmallSizeInCompact)
     jsonObject.put(SHOULD_EXTEND_MEDIA_OUTSIDE_SAFE_AREA_KEY, model.shouldExtendMediaOutsideSafeArea)
     jsonObject.put(ADDITIONAL_CONTROLS_INSET_KEY, FWControlsInsetModelSerializer.serialize(model.additionalControlsInset))
+    jsonObject.put(IS_ARROW_BUTTON_VISIBLE_KEY, model.isArrowButtonVisible)
+    jsonObject.put(IS_FULLSCREEN_ARROW_BUTTON_VISIBLE_KEY, model.isFullscreenArrowButtonVisible)
     return jsonObject
   }
 

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

@@ -7,7 +7,7 @@ data class FWVideoShoppingProduct(
   val currency: String? = null,
   val description: String? = null,
   val units: List<FWVideoProductUnit>? = null,
-  val isAvailable: Boolean = true,
+  val isAvailable: Boolean? = null,
   val mainProductImage: String? = null,
   val isDisabled: Boolean? = null,
   val hidePrice: Boolean? = null,
@@ -27,7 +27,7 @@ data class FWVideoShoppingProduct(
     val url: String? = null,
     val imageUrl: String? = null,
     val options: List<FWVideoProductOption>? = null,
-    val isAvailable: Boolean = true,
+    val isAvailable: Boolean? = null,
   )
 
   data class FWVideoProductPrice(

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

@@ -53,7 +53,7 @@ object FWVideoShoppingProductDeserializer {
     val currency = if (responseJson.has(CURRENCY_KEY)) responseJson.optString(CURRENCY_KEY) else null
     val description = if (responseJson.has(DESCRIPTION_KEY)) responseJson.optString(DESCRIPTION_KEY) else null
     val units = deserializeUnits(responseJson.optJSONArray(UNITS_KEY))
-    val isAvailable = responseJson.optBoolean(IS_AVAILABLE_KEY, true)
+    val isAvailable = if (responseJson.has(IS_AVAILABLE_KEY)) responseJson.optBoolean(IS_AVAILABLE_KEY) else null
     val mainProductImage = if (responseJson.has(MAIN_PRODUCT_IMAGE_KEY)) responseJson.optString(MAIN_PRODUCT_IMAGE_KEY) else null
     val isDisabled = if (responseJson.has(IS_DISABLED_KEY)) responseJson.optBoolean(IS_DISABLED_KEY) else null
     val hidePrice = if (responseJson.has(HIDE_PRICE_KEY)) responseJson.optBoolean(HIDE_PRICE_KEY) else null
@@ -104,7 +104,7 @@ object FWVideoShoppingProductDeserializer {
     val url = if (unitsJsonObject.has(URL_KEY)) unitsJsonObject.optString(URL_KEY) else null
     val imageUrl = if (unitsJsonObject.has(IMAGE_URL_KEY)) unitsJsonObject.optString(IMAGE_URL_KEY) else null
     val options = deserializeOptions(unitsJsonObject.optJSONArray(OPTIONS_KEY))
-    val isAvailable = unitsJsonObject.optBoolean(IS_AVAILABLE_KEY, true)
+    val isAvailable = if (unitsJsonObject.has(IS_AVAILABLE_KEY)) unitsJsonObject.optBoolean(IS_AVAILABLE_KEY) else null
 
     return FWVideoShoppingProduct.FWVideoProductUnit(
       unitId = unitId,

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

@@ -0,0 +1,18 @@
+package com.fireworksdk.bridge.models.enums
+
+enum class FWFeedCompleteAction(val rawValue: String) {
+  Loop("loop"),
+  Dismiss("dismiss");
+
+  companion object {
+    fun deserialize(rawValue: String?): FWFeedCompleteAction? {
+      rawValue ?: return null
+      return FWFeedCompleteAction.values().firstOrNull { it.rawValue == rawValue }
+    }
+
+    fun serialize(model: FWFeedCompleteAction?): String? {
+      model ?: return null
+      return model.rawValue
+    }
+  }
+}

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

@@ -5,7 +5,11 @@ import android.widget.Toast
 import com.facebook.react.bridge.*
 import com.firework.analyticsevents.VideoInfo
 import com.firework.common.product.CurrencyCode
+import com.firework.common.product.Money
 import com.firework.common.product.Product
+import com.firework.common.product.ProductImage
+import com.firework.common.product.ProductUnit
+import com.firework.common.product.ProductUnitOption
 import com.firework.error.shopping.ShoppingError
 import com.firework.sdk.FireworkSdk
 import com.firework.shopping.*
@@ -97,8 +101,8 @@ class FWVideoShoppingModule(
   }
 
   private fun hydrateProduct(
-    product: Product,
-    videoProduct: FWVideoShoppingProduct,
+    product: Product, // product from native
+    videoProduct: FWVideoShoppingProduct, // product from host app
     hydrator: ProductHydrator,
     position: Int
   ) {
@@ -121,6 +125,7 @@ class FWVideoShoppingModule(
         videoProduct.customCTAUrl?.let { customCTAUrl(it) }
         videoProduct.customCTATitle?.let { customCTATitle(it) }
         videoProduct.hidden?.let { hidden(it) }
+        val existingUnitIds = product.units.mapNotNull { it.id }.toSet()
         product.units.forEachIndexed { index, unit ->
           unit.id?.let { variantId ->
             val vpUnit = videoProduct.units?.find { vpu ->
@@ -137,14 +142,57 @@ class FWVideoShoppingModule(
                 currency(currency)
                 price(price = vpu.price?.amount ?: unit.price.amount)
                 name((vpu.name ?: unit.name) ?: "")
-                isAvailable(vpu.isAvailable)
+                vpu.isAvailable?.let { isAvailable(it) }
                 vpu.originalPrice?.amount?.let { originalPrice(it) }
+                vpu.options?.let { opts ->
+                  val unitOpts = opts.mapNotNull { opt ->
+                    val name = opt.name ?: return@mapNotNull null
+                    val value = opt.value ?: return@mapNotNull null
+                    ProductUnitOption(name, value)
+                  }
+                  if (unitOpts.isNotEmpty()) unitOptions(unitOpts)
+                }
                 this
               }
             }
           }
         }
-        isAvailable(videoProduct.isAvailable)
+        videoProduct.units?.forEach { vpu ->
+          val newUnitId = vpu.unitId ?: return@forEach
+          if (newUnitId !in existingUnitIds) {
+            val currencyCode = if (vpu.price?.currencyCode != null && vpu.price.currencyCode.isNotBlank()) {
+              try { CurrencyCode.valueOf(vpu.price.currencyCode) } catch (e: IllegalArgumentException) { null }
+            } else null
+            val defaultCurrencyCode = currencyCode ?: CurrencyCode.USD
+            val price = Money(vpu.price?.amount ?: 0.0, defaultCurrencyCode)
+            val originalPrice = vpu.originalPrice?.amount?.let { amount ->
+              val opCurrencyCode = if (!vpu.originalPrice.currencyCode.isNullOrBlank()) {
+                try { CurrencyCode.valueOf(vpu.originalPrice.currencyCode) } catch (e: IllegalArgumentException) { defaultCurrencyCode }
+              } else defaultCurrencyCode
+              Money(amount, opCurrencyCode)
+            }
+            val unitOptions = vpu.options?.mapNotNull { opt ->
+              val name = opt.name ?: return@mapNotNull null
+              val value = opt.value ?: return@mapNotNull null
+              ProductUnitOption(name, value)
+            } ?: emptyList()
+            val image = vpu.imageUrl?.takeIf { it.isNotBlank() }?.let { ProductImage(it, 0) }
+            addVariant(
+              ProductUnit(
+                id = newUnitId,
+                name = vpu.name,
+                price = price,
+                originalPrice = originalPrice,
+                url = vpu.url ?: "",
+                options = unitOptions,
+                image = image,
+                isAvailable = vpu.isAvailable,
+              )
+            )
+          }
+        }
+        videoProduct.isAvailable?.let { isAvailable(it) }
+        this
       }
     }
   }

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

@@ -28,6 +28,7 @@ import com.fireworksdk.bridge.reactnative.FWReactNativeSDK
 import com.fireworksdk.bridge.reactnative.models.FireworkSDKInterface
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.fireworksdk.bridge.utils.*
+import com.fireworksdk.bridge.utils.FWComponentType
 import org.json.JSONObject
 import java.util.*
 import kotlin.system.exitProcess
@@ -48,12 +49,13 @@ class FireworkSDKModule(
     return if (sdkInitResultModel != null) { // init in application
       if (sdkInitResultModel.success == true) {
         FWEventUtils.sendInitSuccessEvent(reactApplicationContext)
-      } else if (sdkInitResultModel.success == false) {
+        FireworkSdk.analytics.register(this)
+        true
+      } else {
         FWEventUtils.sendInitFailedEvent(reactApplicationContext, sdkInitResultModel.reason)
+        FireworkSdk.analytics.register(this)
+        false
       }
-
-      FireworkSdk.analytics.register(this)
-      true
     } else {
       false
     }
@@ -119,7 +121,7 @@ class FireworkSDKModule(
       videoPlayerConfiguration = videoPlayerConfigModel
     )
 
-    val viewOptionsBuilder = FWConfigUtil.generateViewOptionsBuilder(activity, videoFeedPropsModel)
+    val viewOptionsBuilder = FWConfigUtil.generateViewOptionsBuilder(activity, videoFeedPropsModel, FWComponentType.VIDEO_PLAYER)
     FireworkSdk.startPlayer(viewOptionsBuilder.build(), url)
   }
 

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

@@ -20,6 +20,7 @@ import com.firework.common.feed.FeedResource
 import com.firework.common.feed.FeedTitlePosition
 import com.firework.common.player.ActionButtonOption
 import com.firework.common.player.CloseButtonOption
+import com.firework.common.player.FeedCompleteAction
 import com.firework.common.player.LivestreamCountDownOption
 import com.firework.common.player.MuteButtonOption
 import com.firework.common.player.PipButtonOption
@@ -49,6 +50,7 @@ import com.fireworksdk.bridge.models.FWVideoFeedPropsModel
 import com.fireworksdk.bridge.models.enums.FWAppearanceMode
 import com.fireworksdk.bridge.models.enums.FWBadgeTextType
 import com.fireworksdk.bridge.models.enums.FWCtaDelayType
+import com.fireworksdk.bridge.models.enums.FWFeedCompleteAction
 import com.fireworksdk.bridge.models.enums.FWGradientDrawableOrientation
 import com.fireworksdk.bridge.models.enums.FWPlayerStyle
 import com.fireworksdk.bridge.models.enums.FWSystemTypeface
@@ -60,9 +62,15 @@ import com.fireworksdk.bridge.models.enums.FWVideoPlayerCTAWidth
 import com.fireworksdk.bridge.models.enums.FWVideoPlayerLogoOption
 import com.fireworksdk.bridge.models.enums.FWVideoPlayerScrollDirection
 
+enum class FWComponentType {
+  VIDEO_FEED,
+  STORY_BLOCK,
+  VIDEO_PLAYER,
+}
+
 object FWConfigUtil {
 
-  fun generateViewOptionsBuilder(context: Context?, videoFeedPropsModel: FWVideoFeedPropsModel?): ViewOptions.Builder {
+  fun generateViewOptionsBuilder(context: Context?, videoFeedPropsModel: FWVideoFeedPropsModel?, componentType: FWComponentType): ViewOptions.Builder {
     context ?: return ViewOptions.Builder()
     videoFeedPropsModel ?: return ViewOptions.Builder()
 
@@ -353,6 +361,16 @@ object FWConfigUtil {
       else -> {}
     }
 
+    when (videoFeedPropsModel.videoPlayerConfiguration?.feedCompleteAction) {
+      FWFeedCompleteAction.Loop -> {
+        playerOptionBuilder.feedCompleteAction(FeedCompleteAction.LOOP)
+      }
+      FWFeedCompleteAction.Dismiss -> {
+        playerOptionBuilder.feedCompleteAction(FeedCompleteAction.DISMISS)
+      }
+      else -> {}
+    }
+
     val showShareButton = videoFeedPropsModel.videoPlayerConfiguration?.showShareButton
     showShareButton?.let {
       playerOptionBuilder.showShareButton(it)
@@ -647,9 +665,12 @@ object FWConfigUtil {
     videoFeedPropsModel.videoPlayerConfiguration?.additionalControlsInset?.let { additionalControlsInset ->
       storyblockOptionBuilder.setImmersiveParam(
         ImmersiveParam(
-          FWCommonUtil.dpToPx(
+          topControlsInset = FWCommonUtil.dpToPx(
             (additionalControlsInset.top ?: 0).toFloat(), context
-          )
+          ),
+          bottomControlsInset = FWCommonUtil.dpToPx(
+            (additionalControlsInset.bottom ?: 0).toFloat(), context
+          ),
         )
       )
     }
@@ -657,6 +678,27 @@ object FWConfigUtil {
       playerOptionBuilder.enableImmersiveMode(shouldExtendMediaOutsideSafeArea)
     }
 
+    when (componentType) {
+      FWComponentType.VIDEO_FEED -> {
+        videoFeedPropsModel.videoPlayerConfiguration?.isArrowButtonVisible?.let { isArrowButtonVisible ->
+          playerOptionBuilder.isArrowButtonVisible(isArrowButtonVisible)
+        }
+      }
+      FWComponentType.STORY_BLOCK -> {
+        videoFeedPropsModel.videoPlayerConfiguration?.isArrowButtonVisible?.let { isArrowButtonVisible ->
+          storyblockOptionBuilder.isArrowButtonVisible(isArrowButtonVisible)
+        }
+        videoFeedPropsModel.videoPlayerConfiguration?.isFullscreenArrowButtonVisible?.let { isFullscreenArrowButtonVisible ->
+          playerOptionBuilder.isArrowButtonVisible(isFullscreenArrowButtonVisible)
+        }
+      }
+      FWComponentType.VIDEO_PLAYER -> {
+        videoFeedPropsModel.videoPlayerConfiguration?.isArrowButtonVisible?.let { isArrowButtonVisible ->
+          playerOptionBuilder.isArrowButtonVisible(isArrowButtonVisible)
+        }
+      }
+    }
+
     playerOptionBuilder.shareUrlCustomCallBack(FWGlobalDataUtil.customShareUrlCallback)
 
     return ViewOptions.Builder()

package/ios/Components/StoryBlock.swift

@@ -100,7 +100,7 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
     }
 
     private func embed() {
-        guard let parentVC = parentViewController else {
+        guard let parentVC = fws_parentViewController else {
             return
         }
         guard self.storyBlockVC == nil else {
@@ -254,6 +254,10 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
                 resultConfig.ctaButton.contentConfiguration.font = iOSFontInfo.getFont(fontSize)
                 resultConfig.fullScreenPlayerView.ctaButton.contentConfiguration.font = iOSFontInfo.getFont(fontSize)
             }
+            if let shape = ctaButtonStyle.shape {
+                resultConfig.ctaButton.contentConfiguration.shape = shape.shape()
+                resultConfig.fullScreenPlayerView.ctaButton.contentConfiguration.shape = shape.shape()
+            }
         }
 
         if let showPlaybackButton = config.showPlaybackButton {
@@ -391,7 +395,7 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
             resultConfig.additionalControlsInset = .init(
                 top: additionalControlsInset.top ?? 0,
                 left: 0,
-                bottom: 0,
+                bottom: additionalControlsInset.bottom ?? 0,
                 right: 0)
         }
 
@@ -426,6 +430,23 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
             resultConfig.enableScrollForVertical = enableScrollForVertical
         }
 
+        if let isArrowButtonVisible = config.isArrowButtonVisible {
+            resultConfig.scrollNavigation.isArrowButtonVisible = isArrowButtonVisible
+        }
+
+        if let isFullscreenArrowButtonVisible = config.isFullscreenArrowButtonVisible {
+            resultConfig.fullScreenPlayerView.scrollNavigation.isArrowButtonVisible = isFullscreenArrowButtonVisible
+        }
+
+        if let feedCompleteAction = config.feedCompleteAction {
+            switch feedCompleteAction {
+            case .loop:
+                resultConfig.fullScreenPlayerView.feedCompleteAction = .loop
+            case .dismiss:
+                resultConfig.fullScreenPlayerView.feedCompleteAction = .dismiss
+            }
+        }
+
         if let storyBlockBehavior = gVideoLaunchBehavior?.storyBlockBehavior() {
             resultConfig.onFirstDisplay = storyBlockBehavior
         } else {

package/ios/Components/StoryBlockConfiguration.swift

@@ -33,4 +33,7 @@ public class StoryBlockConfiguration: NSObject, Codable {
     var pipPlacement: PipPlacement?
     var scrollDirection: ScrollDirection?
     var enableScrollForVertical: Bool?
+    var isArrowButtonVisible: Bool?
+    var isFullscreenArrowButtonVisible: Bool?
+    var feedCompleteAction: FeedCompleteAction?
 }

package/ios/Components/StoryBlockManager.m

@@ -16,7 +16,7 @@
 #endif
 
 
-@interface RCT_EXTERN_REMAP_MODULE(FWStoryBlock, StoryBlockManager, NSObject)
+@interface RCT_EXTERN_REMAP_MODULE(FWStoryBlock, FWStoryBlockManager, NSObject)
 
 RCT_CUSTOM_VIEW_PROPERTY(source, StoryBlockSource, StoryBlock) {
     if (json) {

package/ios/Components/StoryBlockManager.swift

@@ -7,12 +7,11 @@
 
 import FireworkVideo
 import Foundation
-import FireworkVideoUI
 
-@objc(StoryBlockManager)
-class StoryBlockManager: RCTViewManager, StoryBlockViewDelegate {
+@objc(FWStoryBlockManager)
+class FWStoryBlockManager: RCTViewManager, StoryBlockViewDelegate {
     override func view() -> UIView! {
-        _ = AppLanguageManager.shared
+        _ = FWSAppLanguageManager.shared
         let storyBlock = StoryBlock()
         storyBlock.delegate = self
 

package/ios/Components/VideoFeed.swift

@@ -9,7 +9,6 @@
 
 import FireworkVideo
 import UIKit
-import FireworkVideoUI
 
 @objc
 public enum VideoFeedMode: Int {
@@ -171,7 +170,7 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate, PictureInPictur
     }
 
     private func embed() {
-        guard let parentVC = parentViewController else {
+        guard let parentVC = fws_parentViewController else {
             return
         }
         guard self.feedVC == nil else {
@@ -422,6 +421,9 @@ extension VideoFeed {
                 let iOSFontInfo = ctaButtonStyle.iOSFontInfo ?? FontInfo()
                 vpcConfig.ctaButton.contentConfiguration.font = iOSFontInfo.getFont(fontSize)
             }
+            if let shape = ctaButtonStyle.shape {
+                vpcConfig.ctaButton.contentConfiguration.shape = shape.shape()
+            }
         }
         if let showPlaybackButton = config.showPlaybackButton {
             vpcConfig.playbackButton.isHidden = !showPlaybackButton
@@ -555,6 +557,19 @@ extension VideoFeed {
             }
         }
 
+        if let isArrowButtonVisible = config.isArrowButtonVisible {
+            vpcConfig.scrollNavigation.isArrowButtonVisible = isArrowButtonVisible
+        }
+
+        if let feedCompleteAction = config.feedCompleteAction {
+            switch feedCompleteAction {
+            case .loop:
+                vpcConfig.feedCompleteAction = .loop
+            case .dismiss:
+                vpcConfig.feedCompleteAction = .dismiss
+            }
+        }
+
         return vpcConfig
     }
 

package/ios/Components/VideoFeedManager.m

@@ -16,7 +16,7 @@
 #import "react_native_firework_sdk-Swift.h"
 #endif
 
-@interface RCT_EXTERN_REMAP_MODULE(FWVideoFeed, VideoFeedManager, NSObject)
+@interface RCT_EXTERN_REMAP_MODULE(FWVideoFeed, FWVideoFeedManager, NSObject)
 
 RCT_CUSTOM_VIEW_PROPERTY(source, VideFeedSourceType, VideoFeed) {
     if (json) {

package/ios/Components/VideoFeedManager.swift

@@ -8,13 +8,12 @@
 
 import FireworkVideo
 import Foundation
-import FireworkVideoUI
 
-@objc(VideoFeedManager)
-class VideoFeedManager: RCTViewManager, VideoFeedDelegate {
+@objc(FWVideoFeedManager)
+class FWVideoFeedManager: RCTViewManager, VideoFeedDelegate {
 
     override func view() -> UIView! {
-        _ = AppLanguageManager.shared
+        _ = FWSAppLanguageManager.shared
         let videFeed = VideoFeed()
         videFeed.delegate = self