react-native-firework-sdk 2.14.2 → 2.15.1

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

@@ -11,19 +11,35 @@ import com.firework.common.ad.AdBadgeTextType
 import com.firework.common.ad.AdOption
 import com.firework.common.cta.CtaDelay
 import com.firework.common.cta.CtaDelayUnit
+import com.firework.common.cta.CtaStyle
 import com.firework.common.feed.FeedLayout
 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.LivestreamCountDownOption
 import com.firework.common.player.MuteButtonOption
+import com.firework.common.player.PipButtonOption
 import com.firework.common.player.PlaybackButtonOption
 import com.firework.common.player.PlayerUiOption
 import com.firework.common.player.VideoDetailsOption
+import com.firework.common.widget.ActionButton
+import com.firework.common.widget.Shape
 import com.firework.common.widget.WidgetImage
-import com.firework.viewoptions.*
+import com.firework.viewoptions.BaseOption
+import com.firework.viewoptions.CtaOption
+import com.firework.viewoptions.LayoutOption
+import com.firework.viewoptions.LogoConfig
+import com.firework.viewoptions.PlayerOption
+import com.firework.viewoptions.StoryBlockOption
+import com.firework.viewoptions.TitleOption
+import com.firework.viewoptions.ViewOptions
 import com.fireworksdk.bridge.FWInitializationProvider
-import com.fireworksdk.bridge.models.*
+import com.fireworksdk.bridge.models.FWAdConfigurationModel
+import com.fireworksdk.bridge.models.FWButtonInfoModel
+import com.fireworksdk.bridge.models.FWFontInfoModel
+import com.fireworksdk.bridge.models.FWShape
+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
@@ -49,6 +65,7 @@ object FWConfigUtil {
     val playerUiOptionBuilder = getDefaultPlayerUiOptionBuilder()
     val videoDetailsOptionBuilder = getDefaultVideoDetailsOptionBuilder()
     val closeButtonOptionBuilder = getDefaultCloseButtonOptionBuilder()
+    val pipButtonOptionBuilder = getDefaultPipButtonOptionBuilder()
     val muteButtonOptionBuilder = getDefaultMuteButtonOptionBuilder()
     val playbackButtonOptionBuilder = getDefaultPlaybackButtonOptionBuilder()
     val baseOptionBuilder = getDefaultBaseOptionBuilder()
@@ -56,6 +73,8 @@ object FWConfigUtil {
     val ctaOptionBuilder = getDefaultCtaOptionBuilder()
     val adOptionBuilder = getDefaultAdOptionBuilder()
     val countDownOptionBuilder = getDefaultPlayerCountdownTimerOptionBuilder()
+    val actionButtonOption = getDefaultActionButtonOptionBuilder()
+    val storyblockOptionBuilder = getDefaultStoryblockOptionBuilder()
 
     when (videoFeedPropsModel.source) {
       FWVideoFeedSource.Discover -> {
@@ -323,6 +342,117 @@ object FWConfigUtil {
       else -> {}
     }
 
+    val ctaButtonStyle = videoFeedPropsModel.videoPlayerConfiguration?.ctaButtonStyle
+    ctaButtonStyle?.let { style ->
+      val background = if (!style.backgroundColor.isNullOrBlank()) {
+        FWColorUtil.parseColor(style.backgroundColor)
+      } else {
+        null
+      }
+
+      val fontSize = if (style.fontSize != null && style.fontSize > 0) {
+        FWCommonUtil.spToPx(style.fontSize.toFloat(), context).toFloat()
+      } else {
+        null
+      }
+
+      val textColor = if (!style.textColor.isNullOrBlank()) {
+        FWColorUtil.parseColor(style.textColor)
+      } else {
+        null
+      }
+
+      val shape = when (style.shape) {
+        FWShape.ROUND_RECTANGLE -> {
+          Shape.SHAPE_ROUND_RECTANGLE
+        }
+
+        FWShape.OVAL -> {
+          Shape.SHAPE_OVAL
+        }
+
+        else -> null
+      }
+      ctaOptionBuilder.ctaStyle(CtaStyle(
+        shape = shape,
+        backgroundColor = background,
+        textColor = textColor,
+        fontSize = fontSize
+      ))
+    }
+
+    val actionButtonStyle = videoFeedPropsModel.videoPlayerConfiguration?.actionButtonStyle
+    actionButtonStyle?.let { style ->
+      val background = if (!style.backgroundColor.isNullOrBlank()) {
+        FWColorUtil.parseColor(style.backgroundColor)
+      } else {
+        null
+      }
+
+      val textColor = if (!style.textColor.isNullOrBlank()) {
+        FWColorUtil.parseColor(style.textColor)
+      } else {
+        null
+      }
+
+      val dividingLineColor = if (!style.dividingLineColor.isNullOrBlank()) {
+        FWColorUtil.parseColor(style.dividingLineColor)
+      } else {
+        null
+      }
+
+      val shape = when (style.shape) {
+        FWShape.ROUND_RECTANGLE -> {
+          Shape.SHAPE_ROUND_RECTANGLE
+        }
+
+        FWShape.OVAL -> {
+          Shape.SHAPE_OVAL
+        }
+
+        else -> null
+      }
+      actionButtonOption.actionButton(ActionButton(
+        backgroundColor = background,
+        textColor = textColor,
+        shape = shape,
+        dividingLineColor = dividingLineColor
+      ))
+    }
+
+    val cancelButtonStyle = videoFeedPropsModel.videoPlayerConfiguration?.cancelButtonStyle
+    cancelButtonStyle?.let { style ->
+      val background = if (!style.backgroundColor.isNullOrBlank()) {
+        FWColorUtil.parseColor(style.backgroundColor)
+      } else {
+        null
+      }
+
+      val textColor = if (!style.textColor.isNullOrBlank()) {
+        FWColorUtil.parseColor(style.textColor)
+      } else {
+        null
+      }
+
+      val shape = when (style.shape) {
+        FWShape.ROUND_RECTANGLE -> {
+          Shape.SHAPE_ROUND_RECTANGLE
+        }
+
+        FWShape.OVAL -> {
+          Shape.SHAPE_OVAL
+        }
+
+        else -> null
+      }
+      actionButtonOption.cancelButton(ActionButton(
+        backgroundColor = background,
+        textColor = textColor,
+        shape = shape,
+      ))
+    }
+    playerOptionBuilder.actionButtonOption(actionButtonOption.build())
+
     val ctaDelay = videoFeedPropsModel.videoPlayerConfiguration?.ctaDelay
     ctaDelay?.let { delay ->
       delay.value ?: return@let
@@ -368,7 +498,7 @@ object FWConfigUtil {
 
     val showPlaybackButton = videoFeedPropsModel.videoPlayerConfiguration?.showPlaybackButton
     showPlaybackButton?.let {
-      playerOptionBuilder.showPlayPauseButtonInReplay(it)
+      playerOptionBuilder.showPlayPauseButtonInVideo(it)
     }
 
     val showBranding = videoFeedPropsModel.videoPlayerConfiguration?.showBranding
@@ -384,6 +514,7 @@ object FWConfigUtil {
     val buttonConfiguration = videoFeedPropsModel.videoPlayerConfiguration?.buttonConfiguration
     videoDetailsOptionBuilder.buttonIcon(getWidgetImage(context, buttonConfiguration?.videoDetailButton))
     closeButtonOptionBuilder.icon(getWidgetImage(context, buttonConfiguration?.closeButton))
+    pipButtonOptionBuilder.icon(getWidgetImage(context, buttonConfiguration?.pipButton))
     muteButtonOptionBuilder.muteIcon(getWidgetImage(context, buttonConfiguration?.muteButton))
       .unmuteIcon(getWidgetImage(context, buttonConfiguration?.unmuteButton))
     playbackButtonOptionBuilder.playIcon(getWidgetImage(context, buttonConfiguration?.playButton))
@@ -391,6 +522,7 @@ object FWConfigUtil {
 
     playerUiOptionBuilder.videoDetailsOption(videoDetailsOptionBuilder.build())
       .closeButtonOption(closeButtonOptionBuilder.build())
+      .pipButtonOption(pipButtonOptionBuilder.build())
       .muteButtonOption(muteButtonOptionBuilder.build())
       .playbackButtonOption(playbackButtonOptionBuilder.build())
     playerOptionBuilder.playerUiOption(playerUiOptionBuilder.build())
@@ -425,6 +557,14 @@ object FWConfigUtil {
       else -> {}
     }
     playerOptionBuilder.livestreamCountDownOption(countDownOptionBuilder.build())
+    videoFeedPropsModel.videoPlayerConfiguration?.enableAutoPlay?.let { enableAutoplayOnStoryblock ->
+      storyblockOptionBuilder.enableAutoPlay(enableAutoplayOnStoryblock)}
+    videoFeedPropsModel.videoPlayerConfiguration?.showFullScreenIcon?.let { showFullScreenIcon ->
+      storyblockOptionBuilder.showFullScreenIcon(showFullScreenIcon)}
+    videoFeedPropsModel.videoPlayerConfiguration?.enableAutoPause?.let { enableAutoPause ->
+      storyblockOptionBuilder.enableAutoPause(enableAutoPause)}
+
+    playerOptionBuilder.shareUrlCustomCallBack(FWGlobalDataUtil.customShareUrlCallback)
 
     return ViewOptions.Builder()
       .layoutOption(layoutOptionBuilder.build())
@@ -434,6 +574,11 @@ object FWConfigUtil {
       .adBadgeOption(adBadgeOptionBuilder.build())
       .ctaOption(ctaOptionBuilder.build())
       .adOption(adOptionBuilder.build())
+      .storyBlockOption(storyblockOptionBuilder.build())
+  }
+
+  private fun getDefaultStoryblockOptionBuilder(): StoryBlockOption.Builder {
+    return StoryBlockOption.Builder()
   }
 
   private fun getDefaultLayoutOptionBuilder(): LayoutOption.Builder {
@@ -460,6 +605,10 @@ object FWConfigUtil {
     return LivestreamCountDownOption.Builder()
   }
 
+  private fun getDefaultActionButtonOptionBuilder(): ActionButtonOption.Builder {
+    return ActionButtonOption.Builder()
+  }
+
   private fun getDefaultVideoDetailsOptionBuilder(): VideoDetailsOption.Builder {
     return VideoDetailsOption.Builder()
   }
@@ -468,6 +617,10 @@ object FWConfigUtil {
     return CloseButtonOption.Builder()
   }
 
+  private fun getDefaultPipButtonOptionBuilder(): PipButtonOption.Builder {
+    return PipButtonOption.Builder()
+  }
+
   private fun getDefaultMuteButtonOptionBuilder(): MuteButtonOption.Builder {
     return MuteButtonOption.Builder()
   }

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

@@ -1,5 +1,6 @@
 package com.fireworksdk.bridge.utils
 
+import com.firework.analyticsevents.VideoInfo
 import com.fireworksdk.bridge.models.FWAdBadgeConfigModel
 import com.fireworksdk.bridge.models.FWSdkInitResultModel
 import com.fireworksdk.bridge.models.enums.FWSwitchLanguageBehavior
@@ -23,4 +24,9 @@ object FWGlobalDataUtil {
   var switchLanguageBehavior = FWSwitchLanguageBehavior.RestartingActivity
 
   var initCompletedListener: (() -> Unit)? = null
+
+  var customShareUrlCallbackEnabled: Boolean = false
+
+  var customShareUrlCallback: (suspend (String, VideoInfo) -> String)? = null
+
 }

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

@@ -1,6 +1,7 @@
 package com.fireworksdk.bridge.utils
 
 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.share.ShareButtonAnalyticsEvent
@@ -8,6 +9,27 @@ import com.fireworksdk.bridge.models.FWLiveStreamEventDetailsModel
 import com.fireworksdk.bridge.models.FWVideoPlaybackDetails
 
 object FWModelUtils {
+
+  val VideoInfo.internalVideoType: String
+    get() = when (this.videoType) {
+      is VideoType.ShortVideo -> "video"
+      is VideoType.Ad -> "ad"
+      is VideoType.Livestream.Idle -> "livestream"
+      is VideoType.Livestream.Live -> "livestream"
+      is VideoType.Livestream.Replay -> "livestream"
+      is VideoType.Livestream.Completed -> "livestream"
+    }
+
+  val VideoInfo.internalLiveStreamStatus: String?
+    get() = when (this.videoType) {
+      is VideoType.ShortVideo -> null
+      is VideoType.Ad -> null
+      is VideoType.Livestream.Idle -> "idle"
+      is VideoType.Livestream.Live -> "live"
+      is VideoType.Livestream.Replay -> "replay"
+      is VideoType.Livestream.Completed -> "completed"
+    }
+
   fun convertVideoInfo2PlaybackDetails(videoInfo: VideoInfo): FWVideoPlaybackDetails {
     return FWVideoPlaybackDetails(
       badge = videoInfo.badge,
@@ -18,6 +40,8 @@ object FWModelUtils {
       playerWidth = videoInfo.playerWidth,
       id = videoInfo.id,
       feedId = videoInfo.feedId,
+      videoType = videoInfo.internalVideoType,
+      liveStreamStatus = videoInfo.internalLiveStreamStatus,
     )
   }
 
@@ -25,6 +49,8 @@ object FWModelUtils {
     return FWLiveStreamEventDetailsModel(
       id = videoInfo.id,
       feedId = videoInfo.feedId,
+      videoType = videoInfo.internalVideoType,
+      liveStreamStatus = videoInfo.internalLiveStreamStatus,
     )
   }
 
@@ -39,6 +65,8 @@ object FWModelUtils {
       id = event.videoInfo.id,
       actionUrl = event.actionUrl,
       feedId = event.videoInfo.feedId,
+      videoType = event.videoInfo.internalVideoType,
+      liveStreamStatus = event.videoInfo.internalLiveStreamStatus,
     )
   }
 
@@ -53,6 +81,8 @@ object FWModelUtils {
       id = event.videoInfo?.id,
       progress = event.progress,
       feedId = event.videoInfo?.feedId,
+      videoType = event.videoInfo?.internalVideoType,
+      liveStreamStatus = event.videoInfo?.internalLiveStreamStatus,
     )
   }
 
@@ -66,6 +96,8 @@ object FWModelUtils {
       playerWidth = event.videoInfo.playerWidth,
       id = event.videoInfo.id,
       feedId = event.videoInfo.feedId,
+      videoType = event.videoInfo.internalVideoType,
+      liveStreamStatus = event.videoInfo.internalLiveStreamStatus,
     )
   }
 

package/ios/Components/StoryBlock.swift

@@ -20,8 +20,8 @@ public protocol StoryBlockViewDelegate: AnyObject {
     func storyBlock(_ view: StoryBlock, didFailToLoadFeed error: StoryBlockError)
 }
 
+// swiftlint:disable type_body_length
 @objc
-// swiftlint:disable:next type_body_length
 public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPictureControllerDelegate {
     @objc public var sourceType: StoryBlockSourceType = .discover
     @objc public var channel: String = ""
@@ -118,6 +118,8 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
             return
         }
 
+        storyBlockVC.view.flipIfNeeded()
+
         onStoryBlockGetFeedId?(["feedId": storyBlockVC.feedID])
 
         self.storyBlockVC = storyBlockVC
@@ -210,8 +212,10 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
         if let playerStyle = config.playerStyle {
             switch playerStyle {
             case .full:
+                resultConfig.playerStyle = .fullBleed
                 resultConfig.fullScreenPlayerView.playerStyle = .fullBleed
-            default:
+            case .fit:
+                resultConfig.playerStyle = .fit
                 resultConfig.fullScreenPlayerView.playerStyle = .fit
             }
         }
@@ -307,6 +311,7 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
 
         if let buttonConfiguration = config.buttonConfiguration {
             if let videoDetailButtonDisplay = buttonConfiguration.videoDetailButton?.getButtonDisplayConfiguration() {
+                resultConfig.videoDetailButtonDisplayConfiguration = videoDetailButtonDisplay
                 resultConfig.fullScreenPlayerView.videoDetailButtonDisplayConfiguration = videoDetailButtonDisplay
             }
 
@@ -315,18 +320,22 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
             }
 
             if let muteButtonDisplay = buttonConfiguration.muteButton?.getButtonDisplayConfiguration() {
+                resultConfig.muteButton.muteDisplay = muteButtonDisplay
                 resultConfig.fullScreenPlayerView.muteButton.muteDisplay = muteButtonDisplay
             }
 
             if let unmuteButtonDisplay = buttonConfiguration.unmuteButton?.getButtonDisplayConfiguration() {
+                resultConfig.muteButton.unmuteDisplay = unmuteButtonDisplay
                 resultConfig.fullScreenPlayerView.muteButton.unmuteDisplay = unmuteButtonDisplay
             }
 
             if let playButtonDisplay = buttonConfiguration.playButton?.getButtonDisplayConfiguration() {
+                resultConfig.playbackButton.playDisplay = playButtonDisplay
                 resultConfig.fullScreenPlayerView.playbackButton.playDisplay = playButtonDisplay
             }
 
             if let pauseButtonDisplay = buttonConfiguration.pauseButton?.getButtonDisplayConfiguration() {
+                resultConfig.playbackButton.pauseDisplay = pauseButtonDisplay
                 resultConfig.fullScreenPlayerView.playbackButton.pauseDisplay = pauseButtonDisplay
             }
         }
@@ -417,3 +426,4 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
         completionHandler(true)
     }
 }
+// swiftlint:enable type_body_length

package/ios/Components/VideoFeed.swift

@@ -110,7 +110,7 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate, PictureInPictur
     }
 
     private var videoFeedLayout: VideoFeedLayout {
-        var resultLayout: VideoFeedLayout?
+        let resultLayout: VideoFeedLayout
         switch mode {
         case .row:
             let layout = VideoFeedHorizontalLayout()
@@ -139,25 +139,27 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate, PictureInPictur
             }
             if let contentPadding = config.contentPadding {
                 if let top = contentPadding.top {
-                    resultLayout?.contentInsets.top = top
+                    resultLayout.contentInsets.top = top
                 }
                 if let right = contentPadding.right {
-                    resultLayout?.contentInsets.right = right
+                    resultLayout.contentInsets.right = right
                 }
                 if let bottom = contentPadding.bottom {
-                    resultLayout?.contentInsets.bottom = bottom
+                    resultLayout.contentInsets.bottom = bottom
                 }
                 if let left = contentPadding.left {
-                    resultLayout?.contentInsets.left = left
+                    resultLayout.contentInsets.left = left
                 }
             }
 
             if let itemSpacing = config.itemSpacing {
-                resultLayout?.itemSpacing = itemSpacing
+                resultLayout.itemSpacing = itemSpacing
             }
         }
 
-        return resultLayout ?? VideoFeedHorizontalLayout()
+        resultLayout.ignoresSafeAreaLayoutGuide = true
+
+        return resultLayout
     }
 
     private var isInPip: Bool = false
@@ -194,19 +196,12 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate, PictureInPictur
             return
         }
 
+        feedVC.view.flipIfNeeded()
+
         onVideoFeedGetFeedId?(["feedId": feedVC.feedID])
 
-        var viewConfiguration = convertToVideoFeedContentConfiguration()
-        if viewConfiguration.itemView.autoplay.isEnabled {
-            viewConfiguration.itemView.autoplay.isEnabled = false
-            feedVC.viewConfiguration = viewConfiguration
-            DispatchQueue.main.async {
-                viewConfiguration.itemView.autoplay.isEnabled = true
-                feedVC.viewConfiguration = viewConfiguration
-            }
-        } else {
-            feedVC.viewConfiguration = viewConfiguration
-        }
+        let viewConfiguration = convertToVideoFeedContentConfiguration()
+        feedVC.viewConfiguration = viewConfiguration
 
         feedVC.isPictureInPictureEnabled = playerViewConfig?.enablePictureInPicture ?? false
 
@@ -214,16 +209,6 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate, PictureInPictur
         feedVC.pictureInPictureDelegate = self
         self.feedVC = feedVC
 
-        if self.mode != .row, let subView = feedVC.view.subviews.first {
-            let constraints = feedVC.view.constraints
-            for constraint in constraints {
-                if (constraint.firstItem as? NSObject) == subView || (constraint.secondItem as? NSObject) == subView {
-                    constraint.isActive = false
-                }
-            }
-            NSLayoutConstraint.activate(subView.constraints(equalTo: feedVC.view))
-        }
-
         parentVC.attachChild(feedVC, to: self)
     }
 
@@ -413,7 +398,7 @@ extension VideoFeed {
             switch playerStyle {
             case .full:
                 vpcConfig.playerStyle = .fullBleed
-            default:
+            case .fit:
                 vpcConfig.playerStyle = .fit
             }
         }

package/ios/Components/VideoFeedManager.swift

@@ -42,9 +42,4 @@ class VideoFeedManager: RCTViewManager, VideoFeedDelegate {
             view.onVideoFeedLoadFinished?(error.jsObject)
         }
     }
-
-    //    // MARK: - FireworkVideoFeedDelegate
-    //    func fireworkVideoDidTapVideoThumbnail(_ eventDetails: FeedEventDetails) {
-    //        view.onVideoFeedClick?(eventDetails.jsObject)
-    //    }
 }

package/ios/FireworkSdk.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		890B6B402BF5F9B4007E5762 /* NumberFormatter+AppLanguage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890B6B3F2BF5F9B4007E5762 /* NumberFormatter+AppLanguage.swift */; };
 		891F4AF62A67E12800A9E8DA /* FWRNContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891F4AF52A67E12800A9E8DA /* FWRNContainerViewController.swift */; };
 		891F4AF82A68DEDF00A9E8DA /* PushRNContainerParams.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891F4AF72A68DEDF00A9E8DA /* PushRNContainerParams.swift */; };
 		891F4AFA2A68DF2B00A9E8DA /* RCTConvert+FWNavigatorModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891F4AF92A68DF2B00A9E8DA /* RCTConvert+FWNavigatorModule.swift */; };
@@ -99,7 +98,6 @@
 
 /* Begin PBXFileReference section */
 		1F6F718A2771B48100224AF3 /* FireworkSdk-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FireworkSdk-Bridging-Header.h"; sourceTree = "<group>"; };
-		890B6B3F2BF5F9B4007E5762 /* NumberFormatter+AppLanguage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NumberFormatter+AppLanguage.swift"; sourceTree = "<group>"; };
 		891F4AF52A67E12800A9E8DA /* FWRNContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FWRNContainerViewController.swift; sourceTree = "<group>"; };
 		891F4AF72A68DEDF00A9E8DA /* PushRNContainerParams.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushRNContainerParams.swift; sourceTree = "<group>"; };
 		891F4AF92A68DF2B00A9E8DA /* RCTConvert+FWNavigatorModule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RCTConvert+FWNavigatorModule.swift"; sourceTree = "<group>"; };
@@ -185,7 +183,6 @@
 		898873122A0A8E7E0089CD1C /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
-				890B6B3F2BF5F9B4007E5762 /* NumberFormatter+AppLanguage.swift */,
 				89C105642BAD2C1D00E47CDD /* UIWindowScene+Swizzle.swift */,
 				898873132A0A8E7E0089CD1C /* UIViewController+AttachChild.swift */,
 				898873142A0A8E7E0089CD1C /* UIView+Constraints.swift */,
@@ -427,7 +424,6 @@
 				8988735B2A0A8E7E0089CD1C /* FireworkSDKModule.m in Sources */,
 				8988736A2A0A8E7E0089CD1C /* VideoFeedConfiguration.swift in Sources */,
 				8975238D2817DEF80070EBB6 /* (null) in Sources */,
-				890B6B402BF5F9B4007E5762 /* NumberFormatter+AppLanguage.swift in Sources */,
 				8975238C2817DEF80070EBB6 /* (null) in Sources */,
 				8988736B2A0A8E7E0089CD1C /* VideoFeed.swift in Sources */,
 				891F4AF62A67E12800A9E8DA /* FWRNContainerViewController.swift in Sources */,

package/ios/Models/NativeToRN/FireworkEventName.swift

@@ -19,7 +19,9 @@ enum FWEventName: String, CaseIterable {
     case appLanguageUpdated = "fw:app-language-updated"  // emitted in JS side
     case nativeAppLanguageUpdated = "fw:native-app-language-updated" // emitted in native side
     case logMessage = "fw:log-message"
-    case productInfoViewConfigurationUpdated = "fw:product-info-view-configuration-updated"  // emitted in JS side
+    case productInfoViewConfigurationUpdated = "fw:product-info-view-configuration-updated" // emitted in JS side
+    case livestreamPlayerDesignVersionUpdated = "fw:livestream-player-design-version-updated" // emitted in JS side
+    case dataTrackingLevelUpdated = "fw:data-tracking-level-updated" // emitted in JS side
 }
 
 enum VideoPlaybackSubEventName: String {

package/ios/Models/RNToNative/RCTConvert+FireworkSDKModule.swift

@@ -126,4 +126,17 @@ extension RCTConvert {
             return nil
         }
     }
+
+    static func livestreamPlayerDesignVersion(
+        _ version: String
+    ) -> FireworkVideo.LivestreamPlayerDesignVersion? {
+        switch version {
+        case "v1":
+            return FireworkVideo.LivestreamPlayerDesignVersion.v1
+        case "v2":
+            return FireworkVideo.LivestreamPlayerDesignVersion.v2
+        default:
+            return nil
+        }
+    }
 }

package/ios/Modules/FireworkSDKModule/FireworkSDKModule+EventTracking.swift

@@ -128,6 +128,36 @@ extension FireworkSDKModule: FireworkVideoPlaybackDelegate {
                 "info": videoPlayback.jsObject
             ])
     }
+
+    func fireworkVideoDidClose(_ videoPlayback: VideoPlaybackDetails) {
+        guard enableVideoPlayBackEvent else { return }
+        sendEvent(
+            withName: FWEventName.videoPlayback.rawValue,
+            body: [
+                "eventName": VideoPlaybackSubEventName.complete.rawValue,
+                "info": videoPlayback.jsObject
+            ])
+    }
+
+    func fireworkVideoDidAutomaticallyPause(_ videoPlayback: VideoPlaybackDetails) {
+        guard enableVideoPlayBackEvent else { return }
+        sendEvent(
+            withName: FWEventName.videoPlayback.rawValue,
+            body: [
+                "eventName": VideoPlaybackSubEventName.pause.rawValue,
+                "info": videoPlayback.jsObject
+            ])
+    }
+
+    func fireworkVideoDidAutomaticallyResume(_ videoPlayback: VideoPlaybackDetails) {
+        guard enableVideoPlayBackEvent else { return }
+        sendEvent(
+            withName: FWEventName.videoPlayback.rawValue,
+            body: [
+                "eventName": VideoPlaybackSubEventName.resume.rawValue,
+                "info": videoPlayback.jsObject
+            ])
+    }
 }
 
 extension FireworkSDKModule: FireworkVideoFeedDelegate {
@@ -138,10 +168,17 @@ extension FireworkSDKModule: FireworkVideoFeedDelegate {
 }
 
 extension FireworkSDKModule {
-    @objc(setDataTrackingLevel:)
-    func setDataTrackingLevel(_ level: String) {
-        if let dataTrackingLevel = RCTConvert.dataTrackingLevel(level) {
-            FireworkVideoSDK.dataTrackingLevel = dataTrackingLevel
-        }
+    @objc(setDataTrackingLevel:resolver:rejecter:)
+    func setDataTrackingLevel(
+        _ level: String,
+        resolver: @escaping RCTPromiseResolveBlock,
+        rejecter: @escaping RCTPromiseRejectBlock
+    ) {
+      if let dataTrackingLevel = RCTConvert.dataTrackingLevel(level) {
+          FireworkVideoSDK.dataTrackingLevel = dataTrackingLevel
+          resolver(true)
+      } else {
+          resolver(false)
+      }
     }
 }

package/ios/Modules/FireworkSDKModule/FireworkSDKModule.m

@@ -22,6 +22,7 @@ RCT_EXTERN_METHOD(trackPurchase:(NSDictionary *)parameters)
 RCT_EXTERN_METHOD(changeAppLanguage:(NSString * __nullable)language resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(pausePlayer:(NSString *)callbackId)
 RCT_EXTERN_METHOD(resumePlayer:(NSString *)callbackId)
-RCT_EXTERN_METHOD(setDataTrackingLevel:(NSString *)level)
+RCT_EXTERN_METHOD(setDataTrackingLevel:(NSString *)level resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+RCT_EXTERN_METHOD(setLivestreamPlayerDesignVersion:(NSString *)version resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 
 @end