react-native-firework-sdk 2.2.4 → 2.3.0

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

@@ -0,0 +1,19 @@
+package com.fireworksdk.bridge.models.enums
+
+enum class FWVideoFeedTitlePosition(val rawValue: String) {
+  Nested("nested"),
+  Stacked("stacked");
+
+  companion object {
+    fun deserialize(rawValue: String?): FWVideoFeedTitlePosition? {
+      rawValue ?: return null
+      return FWVideoFeedTitlePosition.values().first { it.rawValue == rawValue }
+    }
+
+    fun serialize(model: FWVideoFeedTitlePosition?): String? {
+      model ?: return null
+      return model.rawValue
+    }
+  }
+}
+

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

@@ -0,0 +1,19 @@
+package com.fireworksdk.bridge.models.enums
+
+enum class FWVideoPlayerCTAWidth(val rawValue: String) {
+  FullWidth("fullWidth"),
+  Compact("compact"),
+  SizeToFit("sizeToFit");
+
+  companion object {
+    fun deserialize(rawValue: String?): FWVideoPlayerCTAWidth? {
+      rawValue ?: return null
+      return FWVideoPlayerCTAWidth.values().first { it.rawValue == rawValue }
+    }
+
+    fun serialize(model: FWVideoPlayerCTAWidth?): String? {
+      model ?: return null
+      return model.rawValue
+    }
+  }
+}

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

@@ -0,0 +1,22 @@
+package com.fireworksdk.bridge.reactnative
+
+import android.app.Activity
+import android.content.Context
+import com.firework.livestream.LivestreamPlayerInitializer
+import com.fireworksdk.bridge.utils.FWLanguageUtil
+import com.fireworksdk.bridge.utils.FWLiveStreamUtil
+
+object FWReactNativeSDK {
+
+  fun addLivestreamPlayerInitializer(initializer: LivestreamPlayerInitializer?) {
+    FWLiveStreamUtil.addLivestreamPlayerInitializer(initializer)
+  }
+
+  fun updateBaseContextLocale(context: Context): Context {
+    return FWLanguageUtil.getInstance(context).updateBaseContextLocale(context)
+  }
+
+  fun changeLanguage(localeString: String, activity: Activity) {
+    FWLanguageUtil.getInstance(activity).changeLanguage(localeString, activity)
+  }
+}

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

@@ -3,8 +3,7 @@ package com.fireworksdk.bridge.reactnative.manager
 import android.view.Choreographer
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
-import com.facebook.react.bridge.ReactApplicationContext
+import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.common.MapBuilder
@@ -12,24 +11,28 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.firework.storyblock.FeedLoadState
-import com.fireworksdk.bridge.components.videofeed.StoryBlockFragment
-import com.fireworksdk.bridge.components.videofeed.StoryBlockFrameLayout
+import com.fireworksdk.bridge.components.storyblock.StoryBlockFragment
+import com.fireworksdk.bridge.components.storyblock.StoryBlockFrameLayout
 import com.fireworksdk.bridge.models.*
+import com.fireworksdk.bridge.models.enums.FWStoryBlockEventName
+import com.fireworksdk.bridge.models.enums.FWVideoFeedSource
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
+import com.fireworksdk.bridge.utils.FWFragmentUtil
 import com.fireworksdk.bridge.utils.FWGlobalDataUtil
 import com.fireworksdk.bridge.utils.FWLogUtils
 import org.json.JSONObject
 
 
-class FWStoryBlockManager(
-  private val reactContext: ReactApplicationContext
-) : ViewGroupManager<StoryBlockFrameLayout>() {
+class FWStoryBlockManager : ViewGroupManager<StoryBlockFrameLayout>() {
+
+  private lateinit var reactContext: ThemedReactContext
 
   override fun getName(): String {
     return REACT_CLASS
   }
 
   override fun createViewInstance(reactContext: ThemedReactContext): StoryBlockFrameLayout {
+    this.reactContext = reactContext
     return StoryBlockFrameLayout(reactContext)
   }
 
@@ -44,7 +47,7 @@ class FWStoryBlockManager(
     map["create"] = COMMAND_CREATE
     map["play"] = COMMAND_PLAY
     map["pause"] = COMMAND_PAUSE
-    map["toggle_full_screen"] = COMMAND_TOGGLE_FULL_SCREEN
+    map["toggleFullScreen"] = COMMAND_TOGGLE_FULL_SCREEN
     return map
   }
 
@@ -60,42 +63,55 @@ class FWStoryBlockManager(
         val reactNativeViewId = requireNotNull(args).getInt(0)
         createFragment(root, reactNativeViewId)
       }
-      COMMAND_PLAY -> root.play()
-      COMMAND_PAUSE -> root.pause()
-      COMMAND_TOGGLE_FULL_SCREEN -> root.toggleFullScreen()
+      COMMAND_PLAY -> root.storyBlockFragment?.play()
+      COMMAND_PAUSE -> root.storyBlockFragment?.pause()
+      COMMAND_TOGGLE_FULL_SCREEN -> root.storyBlockFragment?.toggleFullScreen()
       else -> {}
     }
   }
 
   @ReactProp(name = "source")
   fun setSource(view: StoryBlockFrameLayout, source: String?) {
-    view.setSource(source)
+    view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
+      source = FWVideoFeedSource.deserialize(source)
+    )
   }
 
   @ReactProp(name = "channel")
   fun setChannel(view: StoryBlockFrameLayout, channel: String?) {
-    view.setChannel(channel)
+    view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
+      channel = channel
+    )
   }
 
   @ReactProp(name = "playlist")
   fun setPlaylist(view: StoryBlockFrameLayout, playlist: String?) {
-    view.setPlaylist(playlist)
+    view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
+      playlist = playlist
+    )
   }
 
   @ReactProp(name = "hashtagFilterExpression")
   fun setHashtagFilterExpression(view: StoryBlockFrameLayout, hashtagFilterExpression: String?) {
-    view.setHashtagFilterExpressionProps(hashtagFilterExpression)
+    view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
+      hashtagFilterExpression = hashtagFilterExpression
+    )
   }
 
+  @Suppress("UNCHECKED_CAST")
   @ReactProp(name = "dynamicContentParameters")
   fun setDynamicContentParameters(view: StoryBlockFrameLayout, parameters: ReadableMap?) {
     val parametersMap = parameters?.toHashMap() as? HashMap<String, List<String>>
-    view.setDynamicContentParameters(parametersMap)
+    view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
+      dynamicContentParameters = parametersMap
+    )
   }
 
   @ReactProp(name = "enablePictureInPicture")
   fun setEnablePictureInPicture(view: StoryBlockFrameLayout, enablePictureInPicture: Boolean?) {
-    view.setEnablePictureInPicture(enablePictureInPicture)
+    view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
+      enablePictureInPicture = enablePictureInPicture
+    )
   }
 
   @ReactProp(name = "videoFeedConfiguration")
@@ -103,7 +119,9 @@ class FWStoryBlockManager(
     val configMap = config?.toHashMap() ?: hashMapOf()
     val jsonObject = JSONObject(configMap)
     val videoFeedConfigModel = FWVideoFeedConfigModelDeserializer.deserialize(jsonObject)
-    view.setVideoFeedConfig(videoFeedConfigModel)
+    view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
+      videoFeedConfiguration = videoFeedConfigModel
+    )
   }
 
   @ReactProp(name = "videoPlayerConfiguration")
@@ -111,7 +129,19 @@ class FWStoryBlockManager(
     val configMap = config?.toHashMap() ?: hashMapOf()
     val jsonObject = JSONObject(configMap)
     val videoPlayerConfigModel = FWVideoPlayerConfigModelDeserializer.deserialize(jsonObject)
-    view.setVideoPlayerConfig(videoPlayerConfigModel)
+    view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
+      videoPlayerConfiguration = videoPlayerConfigModel
+    )
+  }
+
+  @ReactProp(name = "storyBlockConfiguration")
+  fun setStoryBlockConfig(view: StoryBlockFrameLayout, config: ReadableMap?) {
+    val configMap = config?.toHashMap() ?: hashMapOf()
+    val jsonObject = JSONObject(configMap)
+    val videoPlayerConfigModel = FWVideoPlayerConfigModelDeserializer.deserialize(jsonObject)
+    view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
+      videoPlayerConfiguration = videoPlayerConfigModel
+    )
   }
 
   private fun setupLayout(view: View) {
@@ -168,14 +198,15 @@ class FWStoryBlockManager(
   private fun createFragment(root: StoryBlockFrameLayout, reactNativeViewId: Int?) {
     FWLogUtils.d { "FWStoryBlockManager createFragment, reactNativeViewId = $reactNativeViewId" }
     reactNativeViewId ?: return
-    val activity = (reactContext.currentActivity as AppCompatActivity?) ?: return
+    val activity = reactContext.currentActivity as FragmentActivity?
+    activity ?: return
 
     val parentView = root.findViewById(reactNativeViewId) as ViewGroup
 //    parentView.setBackgroundColor(Color.YELLOW)
     setupLayout(parentView)
 
-    val fragment = StoryBlockFragment()
-    root.setFragment(fragment)
+    val fragment = StoryBlockFragment.newInstance(root.videoFeedPropsModel)
+    root.storyBlockFragment = fragment
     addStoryBlockListener(fragment, reactNativeViewId)
 
     if (parentView.isAttachedToWindow) {
@@ -187,7 +218,7 @@ class FWStoryBlockManager(
       }
     } else {
       parentView.addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
-        override fun onViewAttachedToWindow(v: View?) {
+        override fun onViewAttachedToWindow(v: View) {
           FWLogUtils.d { "FWStoryBlockManager createFragment doOnAttach" }
           if (!fragment.isAdded) {
             activity.supportFragmentManager
@@ -197,20 +228,18 @@ class FWStoryBlockManager(
           }
         }
 
-        override fun onViewDetachedFromWindow(v: View?) {
+        override fun onViewDetachedFromWindow(v: View) {
         }
       })
     }
   }
 
-  override fun onDropViewInstance(view: StoryBlockFrameLayout) {
-    val activity = reactContext.currentActivity as AppCompatActivity
-    val fragment = view.getFragment()
-    fragment?.let {
-      activity.supportFragmentManager.beginTransaction().remove(it).commit()
-    }
-    view.destroy()
-    super.onDropViewInstance(view)
+  override fun onDropViewInstance(storyBlockFrameLayout: StoryBlockFrameLayout) {
+    val activity = reactContext.currentActivity as FragmentActivity?
+    FWFragmentUtil.removeFragment(activity, storyBlockFrameLayout.storyBlockFragment)
+    storyBlockFrameLayout.destroy()
+
+    super.onDropViewInstance(storyBlockFrameLayout)
   }
 
   override fun getExportedCustomBubblingEventTypeConstants(): MutableMap<String, Any>? {

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

@@ -11,10 +11,10 @@ import com.facebook.react.common.MapBuilder
 import com.firework.videofeed.FeedItemClickListener
 import com.firework.videofeed.FeedViewState
 import com.fireworksdk.bridge.components.videofeed.FWVideoFeed
-import com.fireworksdk.bridge.models.FWFeedViewEventName
 import com.fireworksdk.bridge.models.FWVideoFeedConfigModelDeserializer
 import com.fireworksdk.bridge.models.FWVideoFeedItemDetailsModel
 import com.fireworksdk.bridge.models.FWVideoPlayerConfigModelDeserializer
+import com.fireworksdk.bridge.models.enums.FWFeedViewEventName
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.fireworksdk.bridge.utils.FWLogUtils
 import org.json.JSONObject
@@ -81,6 +81,7 @@ class FWVideoFeedManager : SimpleViewManager<FWVideoFeed>() {
     view.setEnablePictureInPicture(enablePictureInPicture)
   }
 
+  @Suppress("UNCHECKED_CAST")
   @ReactProp(name = "dynamicContentParameters")
   fun setDynamicContentParameters(view: FWVideoFeed, parameters: ReadableMap?) {
     val parametersMap = parameters?.toHashMap() as? HashMap<String, List<String>>
@@ -116,7 +117,7 @@ class FWVideoFeedManager : SimpleViewManager<FWVideoFeed>() {
         index,
         id,
         duration.toInt(),
-        videoFeed.videoFeedPropsModel.source,
+        videoFeed.videoFeedPropsModel.source?.rawValue,
         title,
         videoFeed.videoFeedPropsModel.playlistGroup,
         videoFeed.videoFeedPropsModel.playlist,

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

@@ -5,7 +5,6 @@ import com.facebook.react.bridge.ReadableMap
 
 interface FWNavigatorInterface {
 
-  fun pushNativeContainer(props: ReadableMap?, promise: Promise)
   fun popNativeContainer(promise: Promise)
   fun canPopNativeContainer(promise: Promise)
   fun startFloatingPlayer(promise: Promise)

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

@@ -10,7 +10,6 @@ interface FWVideoShoppingInterface {
   fun updateVideoProducts(productArray: ReadableArray?, callbackId: String?)
   fun setProductInfoViewConfiguration(config: ReadableMap?)
   fun updateShoppingCTAResult(result: ReadableMap?, callbackId: Int?)
-  fun jumpToCartPage(callbackId: Int?, props: ReadableMap?)
   fun setCartIconVisible(visible: Boolean?)
   fun setCartItemCount(count: Int?)
   fun setCustomClickLinkButtonEnabled(value: Boolean?, promise: Promise)

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

@@ -10,8 +10,6 @@ interface FireworkSDKInterface {
   fun setShareBaseURL(url: String?, promise: Promise)
   fun setAdBadgeConfiguration(config: ReadableMap?, promise: Promise)
   fun setCustomCTAClickEnabled(value: Boolean?)
-  fun setCustomCTALinkContentPageRouteName(name: String?, promise: Promise)
-  fun setAppComponentName(name: String?, promise: Promise)
   fun setVideoPlaybackEventEnabled(value: Boolean?)
   fun changeAppLanguage(language: String?, promise: Promise)
   fun restart(promise: Promise)

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

@@ -7,8 +7,8 @@ import com.firework.analyticsevents.livestream.LivestreamAnalyticEvent
 import com.firework.bus.FwAnalyticCallable
 import com.firework.sdk.FireworkSdk
 import com.fireworksdk.bridge.models.FWLiveStreamEventDetailsModel
-import com.fireworksdk.bridge.models.FWLiveStreamEventName
 import com.fireworksdk.bridge.models.FWLiveStreamMessageDetailsModel
+import com.fireworksdk.bridge.models.enums.FWLiveStreamEventName
 import com.fireworksdk.bridge.reactnative.models.FWLiveStreamInterface
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.fireworksdk.bridge.utils.FWLogUtils
@@ -62,7 +62,7 @@ class FWLiveStreamModule(
     }
   }
 
-    @ReactMethod
+  @ReactMethod
   fun addListener(eventName: String?) {
     // Set up any upstream listeners or background tasks as necessary
     FWLogUtils.d { "addListener: $eventName" }

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

@@ -5,7 +5,6 @@ import com.facebook.react.bridge.*
 import com.firework.sdk.FireworkSdk
 import com.fireworksdk.bridge.FWInitializationProvider
 import com.fireworksdk.bridge.reactnative.models.FWNavigatorInterface
-import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.fireworksdk.bridge.utils.FWGlobalDataUtil
 import com.fireworksdk.bridge.utils.FWLogUtils
 
@@ -14,11 +13,6 @@ class FWNavigatorModule(
   reactContext: ReactApplicationContext
 ) : ReactContextBaseJavaModule(reactContext), FWNavigatorInterface {
 
-  @ReactMethod
-  override fun pushNativeContainer(props: ReadableMap?, promise: Promise) {
-    FWEventUtils.pushNativeContainer(reactApplicationContext, props, promise)
-  }
-
   @ReactMethod
   override fun popNativeContainer(promise: Promise) {
     FWLogUtils.d { "FWNavigatorModule popNativeContainer" }

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

@@ -1,6 +1,5 @@
 package com.fireworksdk.bridge.reactnative.module
 
-import android.app.Activity
 import android.widget.Toast
 import com.facebook.react.bridge.*
 import com.firework.common.product.CurrencyCode
@@ -10,6 +9,8 @@ import com.firework.sdk.FireworkSdk
 import com.firework.shopping.*
 import com.fireworksdk.bridge.FWInitializationProvider
 import com.fireworksdk.bridge.models.*
+import com.fireworksdk.bridge.models.enums.FWCtaButtonTextValue
+import com.fireworksdk.bridge.models.enums.FWShoppingCtaResultRes
 import com.fireworksdk.bridge.reactnative.models.FWVideoShoppingInterface
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.fireworksdk.bridge.utils.FWDateUtils
@@ -26,7 +27,6 @@ class FWVideoShoppingModule(
 ) : ReactContextBaseJavaModule(reactContext), FWVideoShoppingInterface {
 
   private var ctaHandler: Triple<Int, String, String>? = null
-  private var cartClickHandler: Pair<Int, Activity>? = null
   private val updateProductHandler: HashMap<String, List<Product>> = HashMap()
   private val updateProductHydratorHandler: HashMap<String, ProductHydrator> = HashMap()
 
@@ -94,6 +94,7 @@ class FWVideoShoppingModule(
     hydrator: ProductHydrator,
     position: Int
   ) {
+    FWLogUtils.d { "FWVideoShoppingModule hydrateProduct: $position" }
     product.id?.let { id ->
       val name = videoProduct.name ?: product.name
       val description = (videoProduct.description ?: product.description) ?: ""
@@ -101,7 +102,7 @@ class FWVideoShoppingModule(
       hydrator.hydrate(id) {
         name(name)
         description(description)
-        product.units.forEachIndexed { i, unit ->
+        product.units.forEachIndexed { _, unit ->
           unit.id?.let { variantId ->
             val vpUnit = videoProduct.units?.find { vpu ->
               vpu.unitId == variantId
@@ -142,7 +143,7 @@ class FWVideoShoppingModule(
     val isLinkButtonHidden = configModel.linkButton?.isHidden == true
     var text = ShoppingCtaButtonOptions.Text.ADD_TO_CART
     when (configModel.ctaButton?.text) {
-      FWProductInfoViewConfiguration.CtaButtonConfiguration.TextValue.ShopNow -> {
+      FWCtaButtonTextValue.ShopNow -> {
         text = ShoppingCtaButtonOptions.Text.SHOP_NOW
       }
       else -> {}
@@ -183,15 +184,15 @@ class FWVideoShoppingModule(
     }
 
     when (resultModel.res) {
-      FWShoppingCtaResult.Res.Success -> {
+      FWShoppingCtaResultRes.Success -> {
         val numberOfItemsInCart = FireworkSdk.shopping.numberOfItemsInCart
         FireworkSdk.shopping.setCtaButtonStatus(Shopping.CtaButtonStatus.Success)
         FireworkSdk.shopping.numberOfItemsInCart = numberOfItemsInCart
       }
-      FWShoppingCtaResult.Res.Fail -> {
+      FWShoppingCtaResultRes.Fail -> {
         FireworkSdk.shopping.setCtaButtonStatus(Shopping.CtaButtonStatus.Error)
       }
-      FWShoppingCtaResult.Res.Loading -> {
+      FWShoppingCtaResultRes.Loading -> {
         FireworkSdk.shopping.setCtaButtonStatus(Shopping.CtaButtonStatus.Loading)
       }
       else -> {
@@ -204,21 +205,14 @@ class FWVideoShoppingModule(
     }
   }
 
-  @ReactMethod
-  override fun jumpToCartPage(callbackId: Int?, props: ReadableMap?) {
-    FWLogUtils.d { "FWVideoShoppingModule jumpToCartPage: $callbackId props: $props" }
-    if (callbackId == null || cartClickHandler?.first != callbackId) {
-      return
-    }
-    FWEventUtils.pushNativeContainer(reactApplicationContext, props, null)
-  }
-
   @ReactMethod
   override fun setCartIconVisible(visible: Boolean?) {
-    if (visible == true) {
-      FireworkSdk.shopping.setShoppingCartBehaviour(Shopping.CartBehaviour.Callback)
-    } else {
-      FireworkSdk.shopping.setShoppingCartBehaviour(Shopping.CartBehaviour.NoCart)
+    UiThreadUtil.runOnUiThread {
+      if (visible == true) {
+        FireworkSdk.shopping.setShoppingCartBehaviour(Shopping.CartBehaviour.Callback)
+      } else {
+        FireworkSdk.shopping.setShoppingCartBehaviour(Shopping.CartBehaviour.NoCart)
+      }
     }
   }
 
@@ -234,7 +228,6 @@ class FWVideoShoppingModule(
         val activity = FWInitializationProvider.INSTANCE.resumedActivity
         activity ?: return
         val callbackId = generateCallbackId()
-        cartClickHandler = Pair(callbackId, activity)
         FWEventUtils.sendCartIconClickEvent(reactApplicationContext, callbackId)
       }
     })
@@ -276,18 +269,18 @@ class FWVideoShoppingModule(
       }
     })
 
-    FireworkSdk.shopping.setOnProductLinkClickListener(object : Shopping.OnProductLinkClickListener {
-      override fun onProductLinkClick(
-        productId: String,
-        unitId: String,
-        productWebUrl: String?
-      ): Boolean {
-        if (FWGlobalDataUtil.customClickLinkButtonEnabled) {
-          FWEventUtils.sendCustomLinkButtonClickEvent(reactApplicationContext, productWebUrl, productId, unitId, callbackId)
-        }
-        return FWGlobalDataUtil.customClickLinkButtonEnabled
+    FireworkSdk.shopping.setOnProductLinkClickListener { productId, unitId, productWebUrl ->
+      if (FWGlobalDataUtil.customClickLinkButtonEnabled) {
+        FWEventUtils.sendCustomLinkButtonClickEvent(
+          reactApplicationContext,
+          productWebUrl,
+          productId,
+          unitId,
+          callbackId
+        )
       }
-    })
+      FWGlobalDataUtil.customClickLinkButtonEnabled
+    }
   }
 
   @ReactMethod

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

@@ -15,16 +15,13 @@ 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.imageloading.glide.GlideImageLoaderFactory
-import com.firework.livestream.multihost.MultihostLivestreamPlayerInitializer
-import com.firework.livestream.singlehost.LivestreamPlayerInitializer
 import com.firework.sdk.FireworkSdk
 import com.firework.sdk.FireworkSdkConfig
 import com.fireworksdk.bridge.FWInitializationProvider
-import com.fireworksdk.bridge.constants.FWVideoPlayerConstant
 import com.fireworksdk.bridge.models.*
+import com.fireworksdk.bridge.models.enums.FWPlayerLaunchBehavior
+import com.fireworksdk.bridge.models.enums.FWVideoPlaybackSubEventName
 import com.fireworksdk.bridge.reactnative.models.FireworkSDKInterface
-import com.fireworksdk.bridge.reactnative.pages.FWContainerActivity
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.fireworksdk.bridge.utils.*
 import org.json.JSONObject
@@ -77,6 +74,9 @@ class FireworkSDKModule(
    */
   @ReactMethod
   override fun openVideoPlayer(url: String, config: ReadableMap?) {
+    val activity = FWInitializationProvider.INSTANCE.resumedActivity
+    activity ?: return
+
     val configMap = config?.toHashMap() ?: hashMapOf()
     val jsonObject = JSONObject(configMap)
     val videoPlayerConfigModel = FWVideoPlayerConfigModelDeserializer.deserialize(jsonObject)
@@ -85,7 +85,7 @@ class FireworkSDKModule(
       videoPlayerConfiguration = videoPlayerConfigModel
     )
 
-    val viewOptionsBuilder = FWConfigUtil.generateViewOptionsBuilder(videoFeedPropsModel)
+    val viewOptionsBuilder = FWConfigUtil.generateViewOptionsBuilder(activity, videoFeedPropsModel)
     FireworkSdk.startPlayer(viewOptionsBuilder.build(), url)
   }
 
@@ -142,18 +142,18 @@ class FireworkSDKModule(
       .checksumRequired(false)
       .clientId(clientId)
       .userId(uid)
-      .imageLoader(GlideImageLoaderFactory.createInstance())
-      .addLivestreamPlayerInitializer(LivestreamPlayerInitializer())
-      .addLivestreamPlayerInitializer(MultihostLivestreamPlayerInitializer())
       .enableCache(true)
-//      .shareBaseUrl("https://www.mytest.com")
-//      .muteOnLaunch(true)
     shareBaseURL?.let {
       FWGlobalDataUtil.shareBaseUrl = it
     }
+
+    val livestreamPlayerInitializerList = FWLiveStreamUtil.livestreamPlayerInitializers()
+    for (livestreamPlayerInitializer in livestreamPlayerInitializerList) {
+      configBuilder.addLivestreamPlayerInitializer(livestreamPlayerInitializer)
+    }
     when (videoLaunchBehavior) {
-      FWVideoPlayerConstant.FW_PLAYER_LAUNCH_BEHAVIOR_DEFAULT -> {}
-      FWVideoPlayerConstant.FW_PLAYER_LAUNCH_BEHAVIOR_MUTE_ON_FIRST_LAUNCH -> {
+      FWPlayerLaunchBehavior.Default -> {}
+      FWPlayerLaunchBehavior.MuteOnFirstLaunch -> {
         configBuilder.muteOnLaunch(true)
       }
       else -> {}
@@ -215,26 +215,15 @@ class FireworkSDKModule(
           caption = event.videoInfo.caption,
           duration = event.videoInfo.duration,
           hasCta = true,
-          height = event.videoInfo.playerHeight,
-          width = event.videoInfo.playerWidth,
-          videoId = event.videoInfo.id,
+          playerHeight = event.videoInfo.playerHeight,
+          playerWidth = event.videoInfo.playerWidth,
+          id = event.videoInfo.id,
+          actionUrl = event.actionUrl,
         )
       )
     }
 
     FWEventUtils.sendCustomCTAClickEvent(reactApplicationContext, event.actionUrl)
-
-    if (!FWGlobalDataUtil.appComponentName.isNullOrBlank() && !FWGlobalDataUtil.customCTALinkContentPageRouteName.isNullOrBlank()) {
-      val activity = FWInitializationProvider.INSTANCE.resumedActivity
-
-      activity?.startActivity(
-        FWContainerActivity.createIntent(activity, FWGlobalDataUtil.appComponentName,
-          hashMapOf(
-            "initialRouteName" to FWGlobalDataUtil.customCTALinkContentPageRouteName,
-            "initialParams" to hashMapOf("url" to event.actionUrl)
-          )
-        ))
-    }
   }
 
   @FwAnalyticCallable
@@ -248,9 +237,9 @@ class FireworkSDKModule(
           caption = event.videoInfo.caption,
           duration = event.videoInfo.duration,
           hasCta = event.videoInfo.hasCta,
-          height = event.videoInfo.playerHeight,
-          width = event.videoInfo.playerWidth,
-          videoId = event.videoInfo.id,
+          playerHeight = event.videoInfo.playerHeight,
+          playerWidth = event.videoInfo.playerWidth,
+          id = event.videoInfo.id,
         )
       )
     }
@@ -268,9 +257,9 @@ class FireworkSDKModule(
       caption = event.videoInfo.caption,
       duration = event.videoInfo.duration,
       hasCta = event.videoInfo.hasCta,
-      height = event.videoInfo.playerHeight,
-      width = event.videoInfo.playerWidth,
-      videoId = event.videoInfo.id,
+      playerHeight = event.videoInfo.playerHeight,
+      playerWidth = event.videoInfo.playerWidth,
+      id = event.videoInfo.id,
       progress = progress
     )
     when (event) {
@@ -317,18 +306,6 @@ class FireworkSDKModule(
     }
   }
 
-  @ReactMethod
-  override fun setCustomCTALinkContentPageRouteName(name: String?, promise: Promise) {
-    FWGlobalDataUtil.customCTALinkContentPageRouteName = name
-    promise.resolve(Arguments.createMap())
-  }
-
-  @ReactMethod
-  override fun setAppComponentName(name: String?, promise: Promise) {
-    FWGlobalDataUtil.appComponentName = name
-    promise.resolve(Arguments.createMap())
-  }
-
   @ReactMethod
   override fun changeAppLanguage(language: String?, promise: Promise) {
     val activity = FWInitializationProvider.INSTANCE.resumedActivity
@@ -337,7 +314,7 @@ class FireworkSDKModule(
       return
     }
     UiThreadUtil.runOnUiThread {
-      val result = FWLanguageUtil.changeLanguage(activity, language)
+      val result = FWLanguageUtil.getInstance(activity).changeLanguage(language, activity)
       promise.resolve(result)
     }
   }