react-native-firework-sdk 2.1.0 → 2.2.0

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

@@ -14,6 +14,7 @@ object FWVideoPlayerConfigModelDeserializer {
   private const val SHOW_BRANDING_KEY = "showBranding"
   private const val CTA_DELAY_KEY = "ctaDelay"
   private const val CTA_HIGHLIGHT_DELAY_KEY = "ctaHighlightDelay"
+  private const val SHARE_BASE_URL_KEY = "shareBaseURL"
 
   private const val BACKGROUND_COLOR_KEY = "backgroundColor"
   private const val FONT_SIZE_KEY = "fontSize"
@@ -25,16 +26,17 @@ object FWVideoPlayerConfigModelDeserializer {
   fun deserialize(responseJson: JSONObject?): FWVideoPlayerConfigModel? {
     responseJson ?: return null
 
-    val playerStyle = responseJson.optString(PLAYER_STYLE_KEY)
-    val videoCompleteAction = responseJson.optString(VIDEO_COMPLETE_ACTION_KEY)
-    val showShareButton = responseJson.optBoolean(SHOW_SHARE_BUTTON_KEY)
+    val playerStyle = if (responseJson.has(PLAYER_STYLE_KEY)) responseJson.optString(PLAYER_STYLE_KEY) else null
+    val videoCompleteAction = if (responseJson.has(VIDEO_COMPLETE_ACTION_KEY)) responseJson.optString(VIDEO_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 = responseJson.optBoolean(SHOW_MUTE_BUTTON_KEY)
-    val showPlaybackButton = responseJson.optBoolean(SHOW_PLAYBACK_BUTTON_KEY)
-    val launchBehavior = responseJson.optString(LAUNCH_BEHAVIOR_KEY)
-    val showBranding = responseJson.optBoolean(SHOW_BRANDING_KEY)
+    val showMuteButton = if (responseJson.has(SHOW_MUTE_BUTTON_KEY)) responseJson.optBoolean(SHOW_MUTE_BUTTON_KEY) else null
+    val showPlaybackButton = if (responseJson.has(SHOW_PLAYBACK_BUTTON_KEY)) responseJson.optBoolean(SHOW_PLAYBACK_BUTTON_KEY) else null
+    val launchBehavior = if (responseJson.has(LAUNCH_BEHAVIOR_KEY)) responseJson.optString(LAUNCH_BEHAVIOR_KEY) else null
+    val showBranding = if (responseJson.has(SHOW_BRANDING_KEY)) responseJson.optBoolean(SHOW_BRANDING_KEY) else null
     val ctaDelay = deserializeCtaDelay(responseJson.optJSONObject(CTA_DELAY_KEY))
     val ctaHighlightDelay = deserializeCtaDelay(responseJson.optJSONObject(CTA_HIGHLIGHT_DELAY_KEY))
+    val shareBaseUrl = if (responseJson.has(SHARE_BASE_URL_KEY)) responseJson.optString(SHARE_BASE_URL_KEY) else null
 
     return FWVideoPlayerConfigModel(
       playerStyle = playerStyle,
@@ -47,13 +49,16 @@ object FWVideoPlayerConfigModelDeserializer {
       showBranding = showBranding,
       ctaDelay = ctaDelay,
       ctaHighlightDelay = ctaHighlightDelay,
+      shareBaseUrl = shareBaseUrl,
     )
   }
 
   private fun deserializeCtaButtonStyle(ctaButtonStyleJson: JSONObject?): FWVideoPlayerConfigModel.FWCtaButtonStyleModel {
-    val backgroundColor = ctaButtonStyleJson?.optString(BACKGROUND_COLOR_KEY)
-    val fontSize = ctaButtonStyleJson?.optInt(FONT_SIZE_KEY)
-    val textColor = ctaButtonStyleJson?.optString(TEXT_COLOR_KEY)
+    ctaButtonStyleJson ?: return FWVideoPlayerConfigModel.FWCtaButtonStyleModel()
+
+    val backgroundColor = if (ctaButtonStyleJson.has(BACKGROUND_COLOR_KEY)) ctaButtonStyleJson.optString(BACKGROUND_COLOR_KEY) else null
+    val fontSize = if (ctaButtonStyleJson.has(FONT_SIZE_KEY)) ctaButtonStyleJson.optInt(FONT_SIZE_KEY) else null
+    val textColor = if (ctaButtonStyleJson.has(TEXT_COLOR_KEY)) ctaButtonStyleJson.optString(TEXT_COLOR_KEY) else null
 
     return FWVideoPlayerConfigModel.FWCtaButtonStyleModel(
       backgroundColor = backgroundColor,
@@ -63,8 +68,10 @@ object FWVideoPlayerConfigModelDeserializer {
   }
 
   private fun deserializeCtaDelay(ctaDelayJson: JSONObject?): FWVideoPlayerConfigModel.FWCtaDelayModel {
-    val type = ctaDelayJson?.optString(TYPE_KEY)
-    val value = ctaDelayJson?.optDouble(VALUE_KEY)
+    ctaDelayJson ?: return FWVideoPlayerConfigModel.FWCtaDelayModel()
+
+    val type = if (ctaDelayJson.has(TYPE_KEY)) ctaDelayJson.optString(TYPE_KEY) else null
+    val value = if (ctaDelayJson.has(VALUE_KEY)) ctaDelayJson.optDouble(VALUE_KEY) else null
 
     return FWVideoPlayerConfigModel.FWCtaDelayModel(
       type = type,

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

@@ -35,9 +35,9 @@ object FWVideoShoppingProductDeserializer {
 
   fun deserialize(responseJson: JSONObject?): FWVideoShoppingProduct? {
     responseJson ?: return null
-    val productId = responseJson.optString(PRODUCT_ID_KEY)
-    val name = responseJson.optString(NAME_KEY)
-    val description = responseJson.optString(DESCRIPTION_KEY)
+    val productId = if (responseJson.has(PRODUCT_ID_KEY)) responseJson.optString(PRODUCT_ID_KEY) else null
+    val name = if (responseJson.has(NAME_KEY)) responseJson.optString(NAME_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)
 
@@ -63,11 +63,11 @@ object FWVideoShoppingProductDeserializer {
 
   private fun deserializeUnit(unitsJsonObject: JSONObject?): FWVideoShoppingProduct.FWVideoProductUnit? {
     unitsJsonObject ?: return null
-    val unitId = unitsJsonObject.optString(UNIT_ID_KEY)
-    val name = unitsJsonObject.optString(NAME_KEY)
+    val unitId = if (unitsJsonObject.has(UNIT_ID_KEY)) unitsJsonObject.optString(UNIT_ID_KEY) else null
+    val name = if (unitsJsonObject.has(NAME_KEY)) unitsJsonObject.optString(NAME_KEY) else null
     val price = deserializePrice(unitsJsonObject.optJSONObject(PRICE_KEY))
-    val url = unitsJsonObject.optString(URL_KEY)
-    val imageUrl = unitsJsonObject.optString(IMAGE_URL_KEY)
+    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)
 
@@ -85,8 +85,8 @@ object FWVideoShoppingProductDeserializer {
 
   private fun deserializePrice(priceJsonObject: JSONObject?): FWVideoShoppingProduct.FWVideoProductPrice? {
     priceJsonObject ?: return null
-    val amount = priceJsonObject.optDouble(AMOUNT_KEY)
-    val currencyCode = priceJsonObject.optString(CURRENCY_CODE_KEY)
+    val amount = if (priceJsonObject.has(AMOUNT_KEY)) priceJsonObject.optDouble(AMOUNT_KEY) else null
+    val currencyCode = if (priceJsonObject.has(CURRENCY_CODE_KEY)) priceJsonObject.optString(CURRENCY_CODE_KEY) else null
 
     return FWVideoShoppingProduct.FWVideoProductPrice(
       amount = amount,
@@ -108,8 +108,8 @@ object FWVideoShoppingProductDeserializer {
 
   private fun deserializeOption(optionJsonObject: JSONObject?): FWVideoShoppingProduct.FWVideoProductOption? {
     optionJsonObject ?: return null
-    val name = optionJsonObject.optString(NAME_KEY)
-    val value = optionJsonObject.optString(VALUE_KEY)
+    val name = if (optionJsonObject.has(NAME_KEY)) optionJsonObject.optString(NAME_KEY) else null
+    val value = if (optionJsonObject.has(VALUE_KEY)) optionJsonObject.optString(VALUE_KEY) else null
 
     return FWVideoShoppingProduct.FWVideoProductOption(
       name = name,

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

@@ -82,6 +82,11 @@ class FWStoryBlockManager(
     view.setPlaylist(playlist)
   }
 
+  @ReactProp(name = "hashtagFilterExpression")
+  fun setHashtagFilterExpression(view: StoryBlockFrameLayout, hashtagFilterExpression: String?) {
+    view.setHashtagFilterExpressionProps(hashtagFilterExpression)
+  }
+
   @ReactProp(name = "dynamicContentParameters")
   fun setDynamicContentParameters(view: StoryBlockFrameLayout, parameters: ReadableMap?) {
     val parametersMap = parameters?.toHashMap() as? HashMap<String, List<String>>

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

@@ -66,6 +66,11 @@ class FWVideoFeedManager : SimpleViewManager<FWVideoFeed>() {
     view.setPlaylistGroupProps(playlistGroup)
   }
 
+  @ReactProp(name = "hashtagFilterExpression")
+  fun setHashtagFilterExpression(view: FWVideoFeed, hashtagFilterExpression: String?) {
+    view.setHashtagFilterExpressionProps(hashtagFilterExpression)
+  }
+
   @ReactProp(name = "mode")
   fun setMode(view: FWVideoFeed, mode: String?) {
     view.setModeProps(mode)

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

@@ -3,7 +3,14 @@ package com.fireworksdk.bridge.reactnative.module
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+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.reactnative.models.FWLiveStreamInterface
+import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.fireworksdk.bridge.utils.FWLogUtils
 
 
@@ -13,14 +20,48 @@ class FWLiveStreamModule(
 
   @ReactMethod
   override fun init() {
-    addFireworkLiveStreamEventListener()
+    FireworkSdk.analytics.register(this)
   }
 
-  private fun addFireworkLiveStreamEventListener() {
-
+  @FwAnalyticCallable
+  fun onLivestreamEvent(event: LivestreamAnalyticEvent) {
+    when (event) {
+      is LivestreamAnalyticEvent.UserSentChatMessage -> {
+        FWLogUtils.d { "userSentChat: $event" }
+        FWEventUtils.sendLiveStreamChatEvent(
+          reactApplicationContext,
+          FWLiveStreamEventName.UserSendChat.rawValue,
+          FWLiveStreamMessageDetailsModel(event.messageId, event.username, event.messageText),
+          FWLiveStreamEventDetailsModel(event.livestreamId)
+        )
+      }
+      is LivestreamAnalyticEvent.UserJoined -> {
+        FWLogUtils.d { "userJoined: $event" }
+        FWEventUtils.sendLiveStreamEvent(
+          reactApplicationContext,
+          FWLiveStreamEventName.UserJoin.rawValue,
+          FWLiveStreamEventDetailsModel(event.livestreamId)
+        )
+      }
+      is LivestreamAnalyticEvent.UserLeft -> {
+        FWLogUtils.d { "userLeft: $event" }
+        FWEventUtils.sendLiveStreamEvent(
+          reactApplicationContext,
+          FWLiveStreamEventName.UserLeave.rawValue,
+          FWLiveStreamEventDetailsModel(event.livestreamId)
+        )
+      }
+      is LivestreamAnalyticEvent.UserSentLike -> {
+        FWLogUtils.d { "userSentLike: $event" }
+        FWEventUtils.sendLiveStreamEvent(
+          reactApplicationContext,
+          FWLiveStreamEventName.UserSendLike.rawValue,
+          FWLiveStreamEventDetailsModel(event.livestreamId)
+        )
+      }
+    }
   }
 
-
     @ReactMethod
   fun addListener(eventName: String?) {
     // Set up any upstream listeners or background tasks as necessary

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

@@ -112,6 +112,8 @@ class FWVideoShoppingModule(
               else unit.price.currencyCode
 
               variant(variantId) {
+                imageUrl((vpu.imageUrl ?: unit.image?.url) ?: "")
+                url(vpu.url ?: unit.url)
                 currency(currency)
                 price(price = vpu.price?.amount ?: unit.price.amount)
                 name((vpu.name ?: unit.name) ?: "")

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

@@ -11,11 +11,13 @@ import android.os.Process
 import android.provider.Settings
 import android.util.Base64
 import com.facebook.react.bridge.*
+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.player.lifecycle.LifecycleState
-import com.firework.player.lifecycle.PlaybackLifecycleObserver
 import com.firework.sdk.FireworkSdk
 import com.firework.sdk.FireworkSdkConfig
 import com.fireworksdk.bridge.FWInitializationProvider
@@ -57,8 +59,8 @@ class FireworkSDKModule(
     val sdkInitOptionsModel = FWSDKInitOptionsModelDeserializer.deserialize(jsonObject)
 
     initSdk(sdkInitOptionsModel)
-    handleCustomCTAClick()
     promise.resolve(Arguments.createMap())
+    FireworkSdk.analytics.register(this)
   }
 
   /**
@@ -97,6 +99,9 @@ class FireworkSDKModule(
    */
   @ReactMethod
   override fun setShareBaseURL(url: String?, promise: Promise) {
+    url?.let {
+      FWGlobalDataUtil.shareBaseUrl = it
+    }
     promise.resolve(Arguments.createMap())
   }
 
@@ -117,7 +122,6 @@ class FireworkSDKModule(
   @ReactMethod
   override fun setVideoPlaybackEventEnabled(value: Boolean?) {
     FWGlobalDataUtil.videoPlaybackEventEnabled = value?:false
-    handleVideoPlaybackEvent()
   }
 
   private fun initSdk(sdkInitOptions: FWSDKInitOptionsModel?) {
@@ -145,7 +149,7 @@ class FireworkSDKModule(
 //      .shareBaseUrl("https://www.mytest.com")
 //      .muteOnLaunch(true)
     shareBaseURL?.let {
-      configBuilder.shareBaseUrl(it)
+      FWGlobalDataUtil.shareBaseUrl = it
     }
     when (videoLaunchBehavior) {
       FWVideoPlayerConstant.FW_PLAYER_LAUNCH_BEHAVIOR_DEFAULT -> {}
@@ -196,54 +200,132 @@ class FireworkSDKModule(
     return Base64.encodeToString(hash, Base64.DEFAULT)
   }
 
-  private fun handleCustomCTAClick() {
-    FireworkSdk.setCtaButtonClickHandler { _, actionUrl, _ ->
-
-      FWEventUtils.sendLogMessageEvent(reactApplicationContext, "[Android] Receive CustomCTAClick event ${FWDateUtils.getDateString(
-        Date()
-      )}")
+  @FwAnalyticCallable
+  fun onCtaButtonClicked(event: CtaButtonClickAnalyticsEvent) {
+    FWEventUtils.sendLogMessageEvent(reactApplicationContext, "[Android] Receive CustomCTAClick event ${FWDateUtils.getDateString(
+      Date()
+    )}")
+
+    if (FWGlobalDataUtil.videoPlaybackEventEnabled) {
+      FWEventUtils.sendVideoPlaybackEvent(
+        reactApplicationContext,
+        FWVideoPlaybackSubEventName.ClickCTA.rawValue,
+        FWVideoPlaybackDetails(
+          badge = event.videoInfo.badge,
+          caption = event.videoInfo.caption,
+          duration = event.videoInfo.duration,
+          hasCta = true,
+          height = event.videoInfo.playerHeight,
+          width = event.videoInfo.playerWidth,
+          videoId = event.videoInfo.id,
+        )
+      )
+    }
 
-      FWEventUtils.sendCustomCTAClickEvent(reactApplicationContext, actionUrl)
+    FWEventUtils.sendCustomCTAClickEvent(reactApplicationContext, event.actionUrl)
 
-      if (!appComponentName.isNullOrBlank() && !customCTALinkContentPageRouteName.isNullOrBlank()) {
-        val activity = FWInitializationProvider.INSTANCE.resumedActivity
+    if (!FWGlobalDataUtil.appComponentName.isNullOrBlank() && !FWGlobalDataUtil.customCTALinkContentPageRouteName.isNullOrBlank()) {
+      val activity = FWInitializationProvider.INSTANCE.resumedActivity
 
-        activity?.startActivity(
-          FWContainerActivity.createIntent(activity, appComponentName,
+      activity?.startActivity(
+        FWContainerActivity.createIntent(activity, FWGlobalDataUtil.appComponentName,
           hashMapOf(
-            "initialRouteName" to customCTALinkContentPageRouteName,
-            "initialParams" to hashMapOf("url" to actionUrl)
+            "initialRouteName" to FWGlobalDataUtil.customCTALinkContentPageRouteName,
+            "initialParams" to hashMapOf("url" to event.actionUrl)
           )
         ))
-        return@setCtaButtonClickHandler true
-      }
+    }
+  }
 
-      return@setCtaButtonClickHandler FWGlobalDataUtil.customCTAClickEnabled
+  @FwAnalyticCallable
+  fun onShareButtonClicked(event: ShareButtonAnalyticsEvent) {
+    if (FWGlobalDataUtil.videoPlaybackEventEnabled) {
+      FWEventUtils.sendVideoPlaybackEvent(
+        reactApplicationContext,
+        FWVideoPlaybackSubEventName.ClickShare.rawValue,
+        FWVideoPlaybackDetails(
+          badge = event.videoInfo.badge,
+          caption = event.videoInfo.caption,
+          duration = event.videoInfo.duration,
+          hasCta = event.videoInfo.hasCta,
+          height = event.videoInfo.playerHeight,
+          width = event.videoInfo.playerWidth,
+          videoId = event.videoInfo.id,
+        )
+      )
     }
   }
 
-  private fun handleVideoPlaybackEvent() {
+  @FwAnalyticCallable
+  fun onPlaybackEvent(event: PlayerLifecycleAnalyticsEvent) {
     if (!FWGlobalDataUtil.videoPlaybackEventEnabled) {
       return
     }
-    FireworkSdk.registerPlaybackLifecycleObserver(object : PlaybackLifecycleObserver {
-      override fun onStateChanged(lifecycleState: LifecycleState) {
-        FWLogUtils.d { "onStateChanged: $lifecycleState - ${lifecycleState.playable.id}" }
-        val playable = lifecycleState.playable
-
+    val progress = event.progress
+
+    val videoPlaybackDetails = FWVideoPlaybackDetails(
+      badge = event.videoInfo.badge,
+      caption = event.videoInfo.caption,
+      duration = event.videoInfo.duration,
+      hasCta = event.videoInfo.hasCta,
+      height = event.videoInfo.playerHeight,
+      width = event.videoInfo.playerWidth,
+      videoId = event.videoInfo.id,
+      progress = progress
+    )
+    when (event) {
+      is PlayerLifecycleAnalyticsEvent.OnStarted -> {
+        if (event.videoInfo.isAd) {
+          FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.AdStart.rawValue, videoPlaybackDetails)
+        } else {
+          FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.Start.rawValue, videoPlaybackDetails)
+        }
+      }
+      is PlayerLifecycleAnalyticsEvent.OnPrepared -> {
+        FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.Impression.rawValue, videoPlaybackDetails)
       }
-    })
+      is PlayerLifecycleAnalyticsEvent.OnBuffering -> {}
+      is PlayerLifecycleAnalyticsEvent.OnIdle -> {}
+      is PlayerLifecycleAnalyticsEvent.OnRepeat -> {}
+      is PlayerLifecycleAnalyticsEvent.OnEnded -> {
+        if (event.videoInfo.isAd) {
+          FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.AdEnd.rawValue, videoPlaybackDetails)
+        } else {
+          FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.Complete.rawValue, videoPlaybackDetails)
+        }
+      }
+      is PlayerLifecycleAnalyticsEvent.OnError -> {}
+      is PlayerLifecycleAnalyticsEvent.OnSeek -> {}
+      is PlayerLifecycleAnalyticsEvent.OnVideoSizeChanged -> {}
+      is PlayerLifecycleAnalyticsEvent.OnFirstQuartile -> {
+        FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.FirstQuartile.rawValue, videoPlaybackDetails)
+      }
+      is PlayerLifecycleAnalyticsEvent.OnSecondQuartile -> {
+        FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.Midpoint.rawValue, videoPlaybackDetails)
+      }
+      is PlayerLifecycleAnalyticsEvent.OnThirdQuartile -> {
+        FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.ThirdQuartile.rawValue, videoPlaybackDetails)
+      }
+      is PlayerLifecycleAnalyticsEvent.OnPlaybackProgressChanged -> {}
+      is PlayerLifecycleAnalyticsEvent.OnPaused -> {
+        FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.Pause.rawValue, videoPlaybackDetails)
+      }
+      is PlayerLifecycleAnalyticsEvent.OnResumed -> {
+        FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.Resume.rawValue, videoPlaybackDetails)
+      }
+      else -> {}
+    }
   }
 
   @ReactMethod
   override fun setCustomCTALinkContentPageRouteName(name: String?, promise: Promise) {
-    customCTALinkContentPageRouteName = name
+    FWGlobalDataUtil.customCTALinkContentPageRouteName = name
     promise.resolve(Arguments.createMap())
   }
 
   @ReactMethod
   override fun setAppComponentName(name: String?, promise: Promise) {
-    appComponentName = name
+    FWGlobalDataUtil.appComponentName = name
     promise.resolve(Arguments.createMap())
   }
 
@@ -313,10 +395,4 @@ class FireworkSDKModule(
     return "FireworkSDK"
   }
 
-  companion object {
-    var appComponentName: String? = null
-    var customCTALinkContentPageRouteName: String? = null
-    var initSuccess: Boolean = false
-  }
-
 }

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

@@ -7,9 +7,9 @@ import com.facebook.react.uimanager.events.RCTEventEmitter
 import com.firework.common.product.Product
 import com.fireworksdk.bridge.models.*
 import com.fireworksdk.bridge.FWInitializationProvider
-import com.fireworksdk.bridge.reactnative.module.FireworkSDKModule
 import com.fireworksdk.bridge.reactnative.pages.FWContainerActivity
 import com.fireworksdk.bridge.utils.FWDateUtils
+import com.fireworksdk.bridge.utils.FWGlobalDataUtil
 import com.fireworksdk.bridge.utils.FWLogUtils
 import java.util.*
 
@@ -19,7 +19,7 @@ object FWEventUtils {
     FWLogUtils.d { "FWNavigatorModule pushNativeContainer: $props" }
     val activity = FWInitializationProvider.INSTANCE.resumedActivity
 
-    if (activity == null || FireworkSDKModule.appComponentName.isNullOrBlank()) {
+    if (activity == null || FWGlobalDataUtil.appComponentName.isNullOrBlank()) {
       promise?.resolve(false)
       return
     }
@@ -36,7 +36,7 @@ object FWEventUtils {
           Date()
         )}")
 
-      activity.startActivity(FWContainerActivity.createIntent(activity, FireworkSDKModule.appComponentName, props?.toHashMap()))
+      activity.startActivity(FWContainerActivity.createIntent(activity, FWGlobalDataUtil.appComponentName, props?.toHashMap()))
 
       sendLogMessageEvent(reactContext, "[Android] After Starting container activity ${
         FWDateUtils.getDateString(
@@ -109,7 +109,7 @@ object FWEventUtils {
       contentMap.putString("videoId", info?.videoId)
     }
     if (info?.duration != null) {
-      contentMap.putDouble("duration", info.duration.toDouble())
+      contentMap.putDouble("duration", info.duration)
     }
     if (info?.caption.isNullOrBlank()) {
       contentMap.putString("caption", info?.caption)
@@ -130,6 +130,9 @@ object FWEventUtils {
     if (info?.hasCta != null) {
       contentMap.putBoolean("hasCTA", info.hasCta)
     }
+    if (info?.progress != null) {
+      contentMap.putDouble("progress", info.progress)
+    }
     eventMap.putMap("info", contentMap)
 
     sendEvent(reactContext, FWEventName.VideoPlayback.rawValue, eventMap)

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

@@ -14,6 +14,7 @@ import com.firework.viewoptions.*
 import com.fireworksdk.bridge.FWInitializationProvider
 import com.fireworksdk.bridge.constants.FWVideoPlayerConstant
 import com.fireworksdk.bridge.models.*
+import com.fireworksdk.bridge.reactnative.module.FireworkSDKModule
 
 object FWConfigUtil {
 
@@ -50,6 +51,15 @@ object FWConfigUtil {
       }
       FWVideoFeedSource.PlaylistGroup.rawValue -> {
 
+      }
+      FWVideoFeedSource.HashtagPlaylist.rawValue -> {
+        videoFeedPropsModel.channel?.let { channel ->
+          if (!videoFeedPropsModel.hashtagFilterExpression.isNullOrBlank()) {
+            baseOptionBuilder.feedResource(FeedResource.ChannelHashtag(channel, videoFeedPropsModel.hashtagFilterExpression))
+          } else {
+            baseOptionBuilder.feedResource(FeedResource.Channel(channel))
+          }
+        }
       }
       else -> {}
     }
@@ -174,6 +184,21 @@ object FWConfigUtil {
       playerOptionBuilder.autoplay(it)
     }
 
+    FWGlobalDataUtil.shareBaseUrl?.let {
+      playerOptionBuilder.shareBaseUrl(it)
+    }
+
+    val shareBaseUrl = videoFeedPropsModel.videoPlayerConfiguration?.shareBaseUrl
+    shareBaseUrl?.let {
+      playerOptionBuilder.shareBaseUrl(it)
+    }
+
+    if (!FWGlobalDataUtil.appComponentName.isNullOrBlank() && !FWGlobalDataUtil.customCTALinkContentPageRouteName.isNullOrBlank()) {
+      playerOptionBuilder.sdkHandleCtaButtonClick(false)
+    } else {
+      playerOptionBuilder.sdkHandleCtaButtonClick(!FWGlobalDataUtil.customCTAClickEnabled)
+    }
+
     val gridColumns = videoFeedPropsModel.videoFeedConfiguration?.gridColumns
     if (gridColumns != null && gridColumns > 0) {
       layoutOptionBuilder.columnCount(gridColumns)
@@ -281,59 +306,28 @@ object FWConfigUtil {
   private fun getDefaultLayoutOptionBuilder(): LayoutOption.Builder {
     val context = FWInitializationProvider.INSTANCE.resumedActivity ?: return LayoutOption.Builder()
     return LayoutOption.Builder()
-      .feedLayout(FeedLayout.HORIZONTAL)
-      .columnCount(2)
-      .backgroundColor(Color.WHITE)
-//      .itemSpacing()
-      .roundedCorner(false)
-//      .roundedCornerRadius(FWCommonUtil.dpToPx("20".toFloat(), context))
-      .showPlayIcon(true)
-      .playIconWidth(FWCommonUtil.dpToPx("24".toFloat(), context))
-      .feedTitlePosition(FeedTitlePosition.NESTED)
+      .playIconWidth(FWCommonUtil.dpToPx("36".toFloat(), context))
   }
 
   private fun getDefaultTitleOptionBuilder(): TitleOption.Builder {
     return TitleOption.Builder()
-      .showFeedTitle(true)
-//      .feedTitleTextTypeface(titleTypeface.toTypeface())
-//      .feedTitleTextColor(ContextCompat.getColor(context, R.color.white))
-//      .feedTitleBackgroundColor(titleBackColor.toBackgroundColor())
-//      .feedTitleTextNumberOfLines(titleMaxLines.toInt())
-//      .feedTitleTextPadding(titlePadding.dpToPixel())
-//      .feedTitleTextSize(titleTextSize.spToPixel())
   }
 
   private fun getDefaultPlayerOptionBuilder(): PlayerOption.Builder {
     return PlayerOption.Builder()
-      .playerMode(PlayerMode.FULL_BLEED_MODE)
-      .autoPlayOnComplete(true)
-      .showShareButton(true)
-      .showFireworkLogo(true)
-      .showMuteButton(true)
-      .showPlayPauseButton(true)
-      .autoplay(false)
-      .enablePipMode(false)
   }
 
   private fun getDefaultBaseOptionBuilder(): BaseOption.Builder {
     return BaseOption.Builder()
-      .feedResource(FeedResource.Discovery)
   }
 
   private fun getDefaultAdBadgeOptionBuilder(): AdBadgeOption.Builder {
 
     return AdBadgeOption.Builder()
-//      .adBadgeBackColor(Color.parseColor("#FF6200EE"))
-//      .adBadgeTextColor(Color.parseColor("#FFFFFFFF"))
-      .adBadgeLabel(AdBadgeTextType.SPONSORED)
-      .adBadgeIsHidden(false)
-      .adBadgeShowOnThumbnails(false)
-      .adBadgeTypeface(Typeface.DEFAULT)
   }
 
   private fun getDefaultCtaOptionBuilder(): CtaOption.Builder {
     return CtaOption.Builder()
-      .ctaDelay(CtaDelay(3.0f, CtaDelayUnit.SECONDS))
   }
 
 }

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

@@ -15,4 +15,10 @@ object FWGlobalDataUtil {
   var customClickLinkButtonEnabled: Boolean = false
 
   var storyBlockFragment by weakProperty<StoryBlockFragment?>()
+
+  var shareBaseUrl: String? = null
+
+  var appComponentName: String? = null
+
+  var customCTALinkContentPageRouteName: String? = null
 }

package/ios/Components/StoryBlock.swift

@@ -10,7 +10,7 @@ import UIKit
 
 @objc
 public enum StoryBlockSourceType: Int {
-    case discover, channel, playlist, dynamicContent
+    case discover, channel, playlist, dynamicContent, hashtagPlaylist
 }
 
 public protocol StoryBlockViewDelegate: AnyObject {
@@ -24,6 +24,7 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate {
     @objc public var channel: String = ""
     @objc public var playlist: String = ""
     @objc public var dynamicContentParameters: [String: [String]] = [:]
+    @objc public var hashtagFilterExpression: String = ""
     @objc public var enablePictureInPicture: Bool = false
     @objc public var adConfiguration: AdConfiguration?
 
@@ -43,6 +44,8 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate {
             return .channelPlaylist(channelID: channel, playlistID: playlist)
         case .dynamicContent:
             return .dynamicContent(channelID: channel, parameters: dynamicContentParameters)
+        case .hashtagPlaylist:
+            return .hashtagPlaylist(channelID: channel, filterExpression: hashtagFilterExpression)
         }
     }
 
@@ -62,7 +65,7 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate {
     }
 
     private func embed() {
-        guard let parentVC = fwParentViewController else {
+        guard let parentVC = parentViewController else {
             return
         }
         guard self.storyBlockVC == nil else {
@@ -84,10 +87,6 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate {
             storyBlockVC.isPictureInPictureEnabled = true
         }
 
-        if FWAppLanguageManager.shared.shouldHorizontalFlip {
-            storyBlockVC.view.fwrtl_viewType = FWRTLViewTypeFlip
-        }
-
         storyBlockVC.delegate = self
         self.storyBlockVC = storyBlockVC
         parentVC.attachChild(storyBlockVC, to: self)

package/ios/Components/StoryBlockManager.m

@@ -27,6 +27,7 @@ RCT_CUSTOM_VIEW_PROPERTY(source, StoryBlockSource, StoryBlock) {
 RCT_EXPORT_VIEW_PROPERTY(channel, NSString)
 RCT_EXPORT_VIEW_PROPERTY(playlist, NSString)
 RCT_EXPORT_VIEW_PROPERTY(dynamicContentParameters, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(hashtagFilterExpression, NSString)
 RCT_EXPORT_VIEW_PROPERTY(enablePictureInPicture, BOOL)
 
 RCT_CUSTOM_VIEW_PROPERTY(adConfiguration, AdConfiguration, StoryBlock) {