react-native-firework-sdk 2.17.0-beta.9 → 2.17.1

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

@@ -26,6 +26,7 @@ object FWVideoPlayerConfigModelDeserializer {
   private const val COUNT_DOWN_TIMER_CONFIGURATION_KEY = "countdownTimerConfiguration"
   private const val ACTION_BUTTON_STYLE_KEY = "actionButtonStyle"
   private const val CANCEL_BUTTON_STYLE_KEY = "cancelButtonStyle"
+  private const val CHAT_STYLE_KEY = "chatStyle"
 
   private const val BACKGROUND_COLOR_KEY = "backgroundColor"
   private const val FONT_SIZE_KEY = "fontSize"
@@ -35,10 +36,15 @@ object FWVideoPlayerConfigModelDeserializer {
   private const val TYPE_KEY = "type"
   private const val VALUE_KEY = "value"
 
+  private const val ANDROID_FONT_INFO_KEY = "androidFontInfo"
+  private const val SHADOW_COLOR_KEY = "shadowColor"
+
   private const val SHOW_FULL_SCREEN_ICON = "enableFullScreen"
   private const val ENABLE_AUTOPLAY = "enableAutoplay"
   private const val ENABLE_AUTOPAUSE = "enableAutopause"
   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"
 
   fun deserialize(responseJson: JSONObject?): FWVideoPlayerConfigModel? {
     responseJson ?: return null
@@ -61,6 +67,8 @@ object FWVideoPlayerConfigModelDeserializer {
     val countdownTimerConfigurationJsonObject = responseJson.optJSONObject(COUNT_DOWN_TIMER_CONFIGURATION_KEY)
     val actionButtonStyleJsonObject = responseJson.optJSONObject(ACTION_BUTTON_STYLE_KEY)
     val cancelButtonStyleJsonObject = responseJson.optJSONObject(CANCEL_BUTTON_STYLE_KEY)
+    val chatStyleJsonObject = responseJson.optJSONObject(CHAT_STYLE_KEY)
+
     val showFullScreenIcon =
       if (responseJson.has(SHOW_FULL_SCREEN_ICON)) responseJson.optBoolean(SHOW_FULL_SCREEN_ICON) else null
     val enableAutoPlay =
@@ -69,6 +77,10 @@ object FWVideoPlayerConfigModelDeserializer {
       if (responseJson.has(ENABLE_AUTOPAUSE)) responseJson.optBoolean(ENABLE_AUTOPAUSE) else null
     val enableSmallSizeInCompact =
       if (responseJson.has(ENABLE_SMALL_SIZE_IN_COMPACT)) responseJson.optBoolean(ENABLE_SMALL_SIZE_IN_COMPACT) else null
+    val shouldExtendMediaOutsideSafeArea =
+      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
 
     return FWVideoPlayerConfigModel(
       playerStyle = if (!playerStyle.isNullOrBlank()) FWPlayerStyle.deserialize(playerStyle) else null,
@@ -92,7 +104,10 @@ object FWVideoPlayerConfigModelDeserializer {
       showFullScreenIcon = showFullScreenIcon,
       enableAutoPlay = enableAutoPlay,
       enableAutoPause = enableAutoPause,
-      enableSmallSizeInCompact = enableSmallSizeInCompact
+      enableSmallSizeInCompact = enableSmallSizeInCompact,
+      chatStyle = FWChatConfigModelDeserializer.deserialize(chatStyleJsonObject),
+      shouldExtendMediaOutsideSafeArea = shouldExtendMediaOutsideSafeArea,
+      additionalControlsInset = additionalControlsInset,
     )
   }
 

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

@@ -26,11 +26,19 @@ object FWVideoPlayerConfigModelSerializer {
   private const val COUNT_DOWN_TIMER_CONFIGURATION_KEY = "countdownTimerConfiguration"
   private const val ACTION_BUTTON_STYLE_KEY = "actionButtonStyle"
   private const val CANCEL_BUTTON_STYLE_KEY = "cancelButtonStyle"
+  private const val CHAT_STYLE_KEY = "chatStyle"
 
   private const val BACKGROUND_COLOR_KEY = "backgroundColor"
   private const val FONT_SIZE_KEY = "fontSize"
   private const val TEXT_COLOR_KEY = "textColor"
   private const val SHAPE_KEY = "shape"
+  private const val TEXT_SHADOW_KEY = "textShadow"
+
+  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"
 
   private const val TYPE_KEY = "type"
   private const val VALUE_KEY = "value"
@@ -39,6 +47,8 @@ object FWVideoPlayerConfigModelSerializer {
   private const val ENABLE_AUTOPLAY = "enableAutoplay"
   private const val ENABLE_AUTOPAUSE = "enableAutopause"
   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"
 
 
   fun serialize(model: FWVideoPlayerConfigModel?): JSONObject? {
@@ -48,6 +58,7 @@ object FWVideoPlayerConfigModelSerializer {
     jsonObject.put(VIDEO_COMPLETE_ACTION_KEY, FWVideoCompleteAction.serialize(model.videoCompleteAction))
     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))
     jsonObject.put(SHOW_MUTE_BUTTON_KEY, model.showMuteButton)
     jsonObject.put(SHOW_PLAYBACK_BUTTON_KEY, model.showPlaybackButton)
     jsonObject.put(SHOW_BRANDING_KEY, model.showBranding)
@@ -66,6 +77,8 @@ object FWVideoPlayerConfigModelSerializer {
     jsonObject.put(ENABLE_AUTOPLAY, model.enableAutoPlay)
     jsonObject.put(ENABLE_AUTOPAUSE, model.enableAutoPause)
     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))
     return jsonObject
   }
 
@@ -79,6 +92,25 @@ object FWVideoPlayerConfigModelSerializer {
     return jsonObject
   }
 
+  private fun serializeChatStyle(model: FWVideoPlayerConfigModel.FWChatStyleModel?): JSONObject? {
+    model ?: return null
+    val jsonObject = JSONObject()
+    jsonObject.put(TEXT_COLOR_KEY, model.textColor)
+    jsonObject.put(TEXT_SHADOW_KEY, serializeTextShadow(model.textShadow))
+    return jsonObject
+  }
+
+  private fun serializeTextShadow(model: FWVideoPlayerConfigModel.FWTextShadowModel?): JSONObject? {
+    model ?: return null
+    val jsonObject = JSONObject()
+    jsonObject.put(OPACITY_KEY, model.opacity)
+    jsonObject.put(COLOR_KEY, model.color)
+    jsonObject.put(OFFSET_X_KEY, model.offsetX)
+    jsonObject.put(OFFSET_Y_KEY, model.offsetY)
+    jsonObject.put(RADIUS_KEY, model.radius)
+    return jsonObject
+  }
+
   private fun serializeCtaDelay(model: FWVideoPlayerConfigModel.FWCtaDelayModel?): JSONObject? {
     model ?: return null
     val jsonObject = JSONObject()
@@ -86,4 +118,4 @@ object FWVideoPlayerConfigModelSerializer {
     jsonObject.put(VALUE_KEY, model.value)
     return jsonObject
   }
-}
+}

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

@@ -8,8 +8,11 @@ enum class FWEventName(val rawValue: String) {
   LiveStream("fw:livestream"),
   LiveStreamChat("fw:livestream-chat"),
   LiveStreamLinkInteractionClick("fw:livestream:custom-link-interaction-click"),
+  LivestreamGiveawayTermsClick("fw:livestream:custom-giveaway-terms-and-conditions-click"),
   LogMessage("fw:log-message"),
-  CustomShareURL("fw:custom-share-url")
+  CustomShareURL("fw:custom-share-url"),
+  InteractableEngagement("fw:interactable-engagement"),
+  StoryBlockClickToFullScreen("fw:storyblock:click-to-full-screen"),
 }
 
 enum class FWSDKInitSubEventName(val rawValue: String) {
@@ -39,6 +42,7 @@ enum class FWVideoPlaybackSubEventName(val rawValue: String) {
 
 enum class FWVideoShoppingEventName(val rawValue: String) {
   CtaButtonClick("fw:shopping:cta-button-click"),
+  SecondaryCtaButtonClick("fw:shopping:secondary-cta-click"),
   ClickCartIcon("fw:shopping:click-cart-icon"),
   UpdateProductDetails("fw:shopping:update-product-details"),
   WillDisplayProduct("fw:shopping:will-display-product"),

package/android/src/main/java/com/fireworksdk/bridge/reactnative/manager/FWStoryBlockManager.kt

@@ -53,13 +53,34 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockFrameLayout>() {
     return map
   }
 
+  override fun receiveCommand(
+    root: StoryBlockFrameLayout,
+    commandId: Int,
+    args: ReadableArray?
+  ) {
+    super.receiveCommand(root, commandId, args)
+    FWLogUtils.d { "FWStoryBlockManager receiveCommand, args (StoryBlockFrameLayout, Int, ReadableArray?), commandId: $commandId, root.isAttachedToWindow: ${root.isAttachedToWindow}" }
+    when (commandId) {
+      COMMAND_CREATE -> {
+        val reactNativeViewId = requireNotNull(args).getInt(0)
+        createFragment(root, reactNativeViewId)
+      }
+      COMMAND_PLAY -> root.storyBlockFragment?.play()
+      COMMAND_PAUSE -> root.storyBlockFragment?.pause()
+      COMMAND_OPEN_FULL_SCREEN -> root.storyBlockFragment?.openFullscreen()
+      COMMAND_ON_VIEWPORT_ENTERED -> root.storyBlockFragment?.onViewportEntered()
+      COMMAND_ON_VIEWPORT_LEFT -> root.storyBlockFragment?.onViewportLeft()
+      else -> {}
+    }
+  }
+
   override fun receiveCommand(
     root: StoryBlockFrameLayout,
     commandId: String?,
     args: ReadableArray?
   ) {
     super.receiveCommand(root, commandId, args)
-    FWLogUtils.d { "FWStoryBlockManager receiveCommand commandId: $commandId, root.isAttachedToWindow: ${root.isAttachedToWindow}" }
+    FWLogUtils.d { "FWStoryBlockManager receiveCommand, args (StoryBlockFrameLayout, String?, ReadableArray?), commandId: $commandId, root.isAttachedToWindow: ${root.isAttachedToWindow}" }
     when (commandId?.toInt()) {
       COMMAND_CREATE -> {
         val reactNativeViewId = requireNotNull(args).getInt(0)
@@ -289,7 +310,7 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockFrameLayout>() {
     super.onDropViewInstance(storyBlockFrameLayout)
   }
 
-  override fun getExportedCustomBubblingEventTypeConstants(): MutableMap<String, Any>? {
+  override fun getExportedCustomBubblingEventTypeConstants(): Map<String, Any>? {
     return MapBuilder.builder<String, Any>()
       .put(FWStoryBlockEventName.StoryBlockLoadFinished.rawValue, MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", FWStoryBlockEventName.StoryBlockLoadFinished.rawValue)))
       .put(FWStoryBlockEventName.StoryBlockFullScreenStateChanged.rawValue, MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", FWStoryBlockEventName.StoryBlockFullScreenStateChanged.rawValue)))

package/android/src/main/java/com/fireworksdk/bridge/reactnative/manager/FWVideoFeedManager.kt

@@ -242,9 +242,21 @@ class FWVideoFeedManager : SimpleViewManager<FWVideoFeed>() {
     return map
   }
 
+  override fun receiveCommand(root: FWVideoFeed, commandId: Int, args: ReadableArray?) {
+    super.receiveCommand(root, commandId, args)
+    FWLogUtils.d { "FWVideoFeedManager receiveCommand, args (FWVideoFeed, Int, ReadableArray?), commandId: $commandId" }
+    when (commandId) {
+      COMMAND_REFRESH -> {
+        FWLogUtils.d { "FWVideoFeedManager call refresh" }
+        root.refresh()
+      }
+      else -> {}
+    }
+  }
+
   override fun receiveCommand(root: FWVideoFeed, commandId: String?, args: ReadableArray?) {
     super.receiveCommand(root, commandId, args)
-    FWLogUtils.d { "FWVideoFeedManager receiveCommand commandId: $commandId" }
+    FWLogUtils.d { "FWVideoFeedManager receiveCommand, args (FWVideoFeed, String?, ReadableArray?), commandId: $commandId" }
     when (commandId?.toInt()) {
       COMMAND_REFRESH -> {
         FWLogUtils.d { "FWVideoFeedManager call refresh" }
@@ -259,7 +271,7 @@ class FWVideoFeedManager : SimpleViewManager<FWVideoFeed>() {
    * first onVideoFeedLoadFinished is event name
    * second onVideoFeedLoadFinished is callback prop in JavaScript
    */
-  override fun getExportedCustomBubblingEventTypeConstants(): MutableMap<String, Any>? {
+  override fun getExportedCustomBubblingEventTypeConstants(): Map<String, Any>? {
     return MapBuilder.builder<String, Any>()
       .put(FWFeedViewEventName.VideoFeedLoadFinished.rawValue, MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", FWFeedViewEventName.VideoFeedLoadFinished.rawValue)))
       .put(FWFeedViewEventName.VideoFeedEmpty.rawValue, MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", FWFeedViewEventName.VideoFeedEmpty.rawValue)))

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

@@ -12,6 +12,7 @@ import com.firework.analyticsevents.cta.CtaButtonClickAnalyticsEvent
 import com.firework.analyticsevents.player.PlayerLifecycleAnalyticsEvent
 import com.firework.analyticsevents.share.ShareButtonAnalyticsEvent
 import com.firework.bus.FwAnalyticCallable
+import com.firework.common.tracking.ProductItem
 import com.firework.sdk.FireworkSdk
 import com.firework.sdk.FwLivestreamPlayerVersion
 import com.firework.sdk.FwTrackingLevel
@@ -302,11 +303,20 @@ class FireworkSDKModule(
 
     UiThreadUtil.runOnUiThread {
       FireworkSdk.shopping.trackPurchase(
-        trackPurchaseModel.orderId,
-        trackPurchaseModel.value,
-        trackPurchaseModel.currencyCode,
-        trackPurchaseModel.countryCode,
-        trackPurchaseModel.additionalInfo ?: mutableMapOf()
+        orderId = trackPurchaseModel.orderId,
+        value = trackPurchaseModel.value,
+        currencyCode = trackPurchaseModel.currencyCode,
+        countryCode = trackPurchaseModel.countryCode,
+        additionalInfo = trackPurchaseModel.additionalInfo ?: mutableMapOf(),
+        products = (trackPurchaseModel.products?.map { it ->
+          ProductItem(
+            productId = it.extProductId ?: "",
+            price = it.price ?: 0.0,
+            quantity = it.quantity ?: 0
+          )
+        } ?: mutableListOf<ProductItem>()) as List<ProductItem>?,
+        shippingPrice = trackPurchaseModel.shippingPrice,
+        subtotal = trackPurchaseModel.subtotal,
       )
       promise.resolve(true)
     }

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

@@ -26,6 +26,21 @@ object FWColorUtil {
     }
   }
 
+  /**
+   * Parse a color string with alpha value.
+   * @param alpha Float, transparency in range 0-1f
+   * @param color String, color string like "#3A86FF"
+   * @return Int, color int with alpha channel
+   */
+  fun parseColorWithAlpha(alpha: Double, color: String): Int {
+        // Parse base color
+        val baseColor = parseColor(color)
+        // Calculate alpha channel (0-255)
+        val alphaInt = (alpha * 255).toInt().coerceIn(0, 255)
+        // Combine alpha and color int
+        return (baseColor and 0x00FFFFFF) or (alphaInt shl 24)
+  }
+
   /**
    * color: #FF3A86FF, #3A86FF
    */

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

@@ -13,10 +13,10 @@ object FWCommonUtil {
     ).toInt()
   }
 
-  fun dpToPx(sp: Float, context: Context): Int {
+  fun dpToPx(dp: Float, context: Context): Int {
     return TypedValue.applyDimension(
       TypedValue.COMPLEX_UNIT_DIP,
-      sp,
+      dp,
       context.resources.displayMetrics,
     ).toInt()
   }

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

@@ -9,6 +9,8 @@ import com.firework.common.Theme
 import com.firework.common.ad.AdBadgeOption
 import com.firework.common.ad.AdBadgeTextType
 import com.firework.common.ad.AdOption
+import com.firework.common.chat.ChatStyle
+import com.firework.common.chat.TextShadow
 import com.firework.common.cta.CtaDelay
 import com.firework.common.cta.CtaDelayUnit
 import com.firework.common.cta.CtaStyle
@@ -27,7 +29,9 @@ import com.firework.common.widget.ActionButton
 import com.firework.common.widget.Shape
 import com.firework.common.widget.WidgetImage
 import com.firework.viewoptions.BaseOption
+import com.firework.viewoptions.ChatOption
 import com.firework.viewoptions.CtaOption
+import com.firework.viewoptions.ImmersiveParam
 import com.firework.viewoptions.LayoutOption
 import com.firework.viewoptions.LogoConfig
 import com.firework.viewoptions.PlayerOption
@@ -71,6 +75,7 @@ object FWConfigUtil {
     val baseOptionBuilder = getDefaultBaseOptionBuilder()
     val adBadgeOptionBuilder = getDefaultAdBadgeOptionBuilder()
     val ctaOptionBuilder = getDefaultCtaOptionBuilder()
+    val chatOptionBuilder = getDefaultChatOptionBuilder()
     val adOptionBuilder = getDefaultAdOptionBuilder()
     val countDownOptionBuilder = getDefaultPlayerCountdownTimerOptionBuilder()
     val actionButtonOption = getDefaultActionButtonOptionBuilder()
@@ -458,6 +463,48 @@ object FWConfigUtil {
     }
     playerOptionBuilder.actionButtonOption(actionButtonOption.build())
 
+    val chatStyle = videoFeedPropsModel.videoPlayerConfiguration?.chatStyle
+    chatStyle?.let { style ->
+      var shadowColor: Int? = null
+      var shadowOffsetX: Float? = null
+      var shadowOffsetY: Float? = null
+      var shadowRadius: Float? = null
+
+
+      // Use textColor directly
+      val textColor: Int? = if (!style.textColor.isNullOrBlank()) {
+        FWColorUtil.parseColor(style.textColor)
+      } else {
+        null
+      }
+
+      style.textShadow?.let { shadow ->
+        shadowColor = if (!shadow.color.isNullOrBlank()) {
+          if (shadow.opacity != null) {
+            FWColorUtil.parseColorWithAlpha(shadow.opacity, shadow.color)
+          } else {
+            FWColorUtil.parseColor(shadow.color)
+          }
+        } else {
+          null
+        }
+
+        shadowOffsetX = shadow.offsetX?.toFloat()
+        shadowOffsetY = shadow.offsetY?.toFloat()
+        shadowRadius = shadow.radius?.toFloat()
+      }
+
+      chatOptionBuilder.chatStyle(ChatStyle(
+        textColor = textColor,
+        textShadow = TextShadow(
+          color = shadowColor,
+          offsetX = shadowOffsetX,
+          offsetY = shadowOffsetY,
+          radius = shadowRadius,
+        )
+      ))
+    }
+
     val ctaDelay = videoFeedPropsModel.videoPlayerConfiguration?.ctaDelay
     ctaDelay?.let { delay ->
       delay.value ?: return@let
@@ -570,6 +617,12 @@ object FWConfigUtil {
       storyblockOptionBuilder.enableAutoPause(enableAutoPause)}
     videoFeedPropsModel.videoPlayerConfiguration?.enableSmallSizeInCompact?.let { enableSmallSizeInCompact ->
       storyblockOptionBuilder.enableSmallSizeInCompact(enableSmallSizeInCompact)}
+    videoFeedPropsModel.videoPlayerConfiguration?.additionalControlsInset?.let { additionalControlsInset ->
+      storyblockOptionBuilder.setImmersiveParam(ImmersiveParam(FWCommonUtil.dpToPx((additionalControlsInset.top ?: 0).toFloat(), context)))
+    }
+    videoFeedPropsModel.videoPlayerConfiguration?.shouldExtendMediaOutsideSafeArea?.let { shouldExtendMediaOutsideSafeArea ->
+      playerOptionBuilder.enableImmersiveMode(shouldExtendMediaOutsideSafeArea)
+    }
 
     playerOptionBuilder.shareUrlCustomCallBack(FWGlobalDataUtil.customShareUrlCallback)
 
@@ -581,6 +634,7 @@ object FWConfigUtil {
       .adBadgeOption(adBadgeOptionBuilder.build())
       .ctaOption(ctaOptionBuilder.build())
       .adOption(adOptionBuilder.build())
+      .chatOption(chatOptionBuilder.build())
       .storyBlockOption(storyblockOptionBuilder.build())
   }
 
@@ -648,11 +702,15 @@ object FWConfigUtil {
     return CtaOption.Builder()
   }
 
+  private fun getDefaultChatOptionBuilder(): ChatOption.Builder {
+    return ChatOption.Builder()
+  }
+
   private fun getDefaultAdOptionBuilder(): AdOption.Builder {
     return AdOption.Builder()
   }
 
-  private fun getTypeface(context: Context, font: FWFontInfoModel?): Typeface? {
+  fun getTypeface(context: Context, font: FWFontInfoModel?): Typeface? {
     val typefaceName = font?.typefaceName
     typefaceName ?: return null
 

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

@@ -19,6 +19,8 @@ object FWGlobalDataUtil {
 
   var shareBaseUrl: String? = null
 
+  var customShareUrl: String? = null
+
   var pauseWhenNotVisible: Boolean = false
 
   var switchLanguageBehavior = FWSwitchLanguageBehavior.RestartingActivity

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

@@ -4,6 +4,7 @@ import com.firework.analyticsevents.VideoInfo
 import com.firework.analyticsevents.VideoType
 import com.firework.analyticsevents.cta.CtaButtonClickAnalyticsEvent
 import com.firework.analyticsevents.player.PlayerLifecycleAnalyticsEvent
+import com.firework.analyticsevents.player.VideoEngagedEvent
 import com.firework.analyticsevents.share.ShareButtonAnalyticsEvent
 import com.firework.common.product.Product
 import com.fireworksdk.bridge.models.FWLiveStreamEventDetailsModel
@@ -62,12 +63,28 @@ object FWModelUtils {
     }
   }
 
+  fun convertVideoInfo2CustomSecondaryCta(product: Product?): FWShoppingCustomCta? {
+    val url = product?.customCTAUrl
+    val title = product?.customCTATitleTranslation
+    val titleKey = product?.customCTATitle
+    return if (!url.isNullOrBlank() && !titleKey.isNullOrBlank() && !title.isNullOrBlank() && !product.isCustomCtaPrimary) {
+      FWShoppingCustomCta(
+        url = url,
+        titleKey = titleKey,
+        title = title,
+      )
+    } else {
+      null
+    }
+  }
+
   fun convertVideoInfo2LivestreamDetails(videoInfo: VideoInfo): FWLiveStreamEventDetailsModel {
     return FWLiveStreamEventDetailsModel(
       id = videoInfo.id,
       feedId = videoInfo.feedId,
       videoType = videoInfo.internalVideoType,
       liveStreamStatus = videoInfo.internalLiveStreamStatus,
+      playbackDetails = convertVideoInfo2PlaybackDetails(videoInfo)
     )
   }
 
@@ -103,6 +120,21 @@ object FWModelUtils {
     )
   }
 
+  fun convertVideoEngageEvent2PlaybackDetails(event: VideoEngagedEvent) : FWVideoPlaybackDetails {
+    return FWVideoPlaybackDetails(
+      badge = event.videoInfo?.badge,
+      caption = event.videoInfo?.caption,
+      duration = event.videoInfo?.duration,
+      hasCta = event.videoInfo?.hasCta,
+      playerHeight = event.videoInfo?.playerHeight,
+      playerWidth = event.videoInfo?.playerWidth,
+      id = event.videoInfo?.id,
+      feedId = event.videoInfo?.feedId,
+      videoType = event.videoInfo?.internalVideoType,
+      liveStreamStatus = event.videoInfo?.internalLiveStreamStatus,
+    )
+  }
+
   fun convertShareButtonEvent2PlaybackDetails(event: ShareButtonAnalyticsEvent): FWVideoPlaybackDetails {
     return FWVideoPlaybackDetails(
       badge = event.videoInfo.badge,

package/ios/Components/StoryBlock.swift

@@ -234,13 +234,16 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
 
         if let ctaButtonStyle = config.ctaButtonStyle {
             if let backgroundColor = ctaButtonStyle.backgroundColor, let color = backgroundColor.uicolor() {
+                resultConfig.ctaButton.contentConfiguration.backgroundColor = color
                 resultConfig.fullScreenPlayerView.ctaButton.contentConfiguration.backgroundColor = color
             }
             if let textcolor = ctaButtonStyle.textColor, let color = textcolor.uicolor() {
+                resultConfig.ctaButton.contentConfiguration.textColor = color
                 resultConfig.fullScreenPlayerView.ctaButton.contentConfiguration.textColor = color
             }
             if let fontSize = ctaButtonStyle.fontSize {
                 let iOSFontInfo = ctaButtonStyle.iOSFontInfo ?? FontInfo()
+                resultConfig.ctaButton.contentConfiguration.font = iOSFontInfo.getFont(fontSize)
                 resultConfig.fullScreenPlayerView.ctaButton.contentConfiguration.font = iOSFontInfo.getFont(fontSize)
             }
         }
@@ -376,6 +379,26 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
             resultConfig.fullScreenPlayerView.countdownTimerConfiguration = countdownTimerConfiguration.fwCountdownTimerConfiguration()
         }
 
+        if let additionalControlsInset = config.additionalControlsInset {
+            resultConfig.additionalControlsInset = .init(
+                top: additionalControlsInset.top ?? 0,
+                left: 0,
+                bottom: 0,
+                right: 0)
+        }
+
+        if let shouldExtendMediaOutsideSafeArea = config.shouldExtendMediaOutsideSafeArea {
+            resultConfig.fullScreenPlayerView.shouldExtendMediaOutsideSafeArea = shouldExtendMediaOutsideSafeArea
+        }
+
+        if let statusBarHidden = config.statusBarHidden {
+            resultConfig.fullScreenPlayerView.statusBarHidden = statusBarHidden
+        }
+
+        if let statusBarStyle = config.statusBarStyle {
+            resultConfig.fullScreenPlayerView.statusBarStyle = statusBarStyle.toUIStatusBarStyle()
+        }
+
         if let storyBlockBehavior = gVideoLaunchBehavior?.storyBlockBehavior() {
             resultConfig.onFirstDisplay = storyBlockBehavior
         } else {

package/ios/Components/StoryBlockConfiguration.swift

@@ -26,4 +26,8 @@ public class StoryBlockConfiguration: NSObject, Codable {
     var videoPlayerLogoConfiguration: VideoPlayerLogoConfiguration?
     var replayBadgeConfiguration: ReplayBadgeConfiguration?
     var countdownTimerConfiguration: CountdownTimerConfiguration?
+    var additionalControlsInset: ControlsInset?
+    var shouldExtendMediaOutsideSafeArea: Bool?
+    var statusBarHidden: Bool?
+    var statusBarStyle: StatusBarStyle?
 }

package/ios/Components/VideoFeed.swift

@@ -530,6 +530,18 @@ extension VideoFeed {
             vpcConfig.countdownTimerConfiguration = countdownTimerConfiguration.fwCountdownTimerConfiguration()
         }
 
+        if let shouldExtendMediaOutsideSafeArea = config.shouldExtendMediaOutsideSafeArea {
+            vpcConfig.shouldExtendMediaOutsideSafeArea = shouldExtendMediaOutsideSafeArea
+        }
+
+        if let statusBarHidden = config.statusBarHidden {
+            vpcConfig.statusBarHidden = statusBarHidden
+        }
+
+        if let statusBarStyle = config.statusBarStyle {
+            vpcConfig.statusBarStyle = statusBarStyle.toUIStatusBarStyle()
+        }
+
         return vpcConfig
     }
 

package/ios/Components/VideoPlayerConfiguration.swift

@@ -23,6 +23,19 @@ public enum VideoPlayerCompleteAction: String, Codable {
     case loop, advanceToNext
 }
 
+public enum StatusBarStyle: String, Codable {
+    case light, dark
+    
+    func toUIStatusBarStyle() -> UIStatusBarStyle {
+        switch self {
+        case .light:
+            return .lightContent
+        case .dark:
+            return .darkContent
+        }
+    }
+}
+
 public enum VideoPlayerCTADelayType: String, Codable {
     case constant, percentage
 }
@@ -75,4 +88,7 @@ public class VideoPlayerConfiguration: NSObject, Codable {
     var videoPlayerLogoConfiguration: VideoPlayerLogoConfiguration?
     var replayBadgeConfiguration: ReplayBadgeConfiguration?
     var countdownTimerConfiguration: CountdownTimerConfiguration?
+    var shouldExtendMediaOutsideSafeArea: Bool?
+    var statusBarHidden: Bool?
+    var statusBarStyle: StatusBarStyle?
 }

package/ios/Models/Common/ControlsInset.swift

@@ -0,0 +1,12 @@
+//
+//  ControlsInset.swift
+//
+//  Created by linjie jiang on 2025/9/15.
+//
+
+import Foundation
+
+@objc
+public class ControlsInset: NSObject, Codable {
+    var top: Double?
+}

package/ios/Modules/FWNavigatorModule/FWNavigatorModule.m

@@ -18,5 +18,6 @@ RCT_EXTERN_METHOD(startFloatingPlayer:(RCTPromiseResolveBlock)resolver rejecter:
 RCT_EXTERN_METHOD(stopFloatingPlayer:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(bringRNContainerToTop:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(bringRNContainerToBottom:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+RCT_EXTERN_METHOD(tryStartFloatingOrCloseFullScreen:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 
 @end