react-native-firework-sdk 1.0.6-beta.2 → 1.1.2

package/android/src/main/java/com/{reactnativefireworksdk → fireworksdk/bridge/reactnative}/module/FireworkSDKModule.kt

@@ -1,19 +1,19 @@
-package com.reactnativefireworksdk.module
+package com.fireworksdk.bridge.reactnative.module
 
 import android.annotation.SuppressLint
 import android.content.pm.PackageManager
 import android.provider.Settings
 import com.facebook.react.bridge.*
-import com.loopnow.fireworklibrary.FwSDK
-import com.loopnow.fireworklibrary.SdkStatus
-import com.loopnow.fireworklibrary.VideoEvent
-import com.reactnativefireworksdk.models.FWVideoPlaybackDetails
-import com.reactnativefireworksdk.models.FWVideoPlaybackSubEventName
-import com.reactnativefireworksdk.models.FWVideoPlayerConfigModel
-import com.reactnativefireworksdk.utils.*
+import com.fireworksdk.bridge.models.FWVideoPlaybackDetails
+import com.fireworksdk.bridge.models.FWVideoPlaybackSubEventName
+import com.fireworksdk.bridge.models.FWVideoPlayerConfigModel
+import com.fireworksdk.bridge.utils.*
 import org.json.JSONObject
 import com.facebook.react.bridge.ReactMethod
-import com.reactnativefireworksdk.models.FireworkSDKInterface
+import com.fireworksdk.bridge.models.FWAdBadgeConfigModel
+import com.fireworksdk.bridge.reactnative.models.FireworkSDKInterface
+import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
+import com.loopnow.fireworklibrary.*
 
 
 class FireworkSDKModule(
@@ -79,10 +79,19 @@ class FireworkSDKModule(
    *
    */
   @ReactMethod
-  override fun setShareBaseURL(url: String?) {
+  override fun setShareBaseURL(url: String?, promise: Promise) {
     if (!url.isNullOrBlank()) {
       FwSDK.setBasePlayerUrl(url)
     }
+    promise.resolve(Arguments.createMap())
+  }
+
+  @ReactMethod
+  override fun setAdBadgeConfiguration(config: ReadableMap?, promise: Promise) {
+    val configMap = config?.toHashMap()
+    val adBadgeConfigModel = FWJsonUtils.fromMap(configMap, FWAdBadgeConfigModel::class.java)
+    FWVideoPlayerUtils.setAdBadgeConfig(adBadgeConfigModel)
+    promise.resolve(Arguments.createMap())
   }
 
   @ReactMethod
@@ -128,7 +137,6 @@ class FireworkSDKModule(
             }
           }
         })
-      handleVideoPlaybackEvent()
     }
   }
 
@@ -221,15 +229,17 @@ class FireworkSDKModule(
   }
 
   @ReactMethod
-  fun addListener(eventName: String?) {
+  fun addListener(eventName: String?, promise: Promise) {
     // Set up any upstream listeners or background tasks as necessary
     FWLogUtils.d { "addListener: $eventName" }
+    promise.resolve(Arguments.createMap())
   }
 
   @ReactMethod
-  fun removeListeners(count: Int?) {
+  fun removeListeners(count: Int?, promise: Promise) {
     // Remove upstream listeners, stop unnecessary background tasks
     FWLogUtils.d { "removeListeners: $count" }
+    promise.resolve(Arguments.createMap())
   }
 
   override fun getName(): String {

package/android/src/main/java/com/{reactnativefireworksdk → fireworksdk/bridge/reactnative}/pages/FWVideoShoppingCartActivity.kt

@@ -1,11 +1,11 @@
-package com.reactnativefireworksdk.pages
+package com.fireworksdk.bridge.reactnative.pages
 
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
-import com.reactnativefireworksdk.R
+import com.fireworksdk.bridge.R
 import com.facebook.react.ReactFragment
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler
 
@@ -14,7 +14,7 @@ class FWVideoShoppingCartActivity : AppCompatActivity(), DefaultHardwareBackBtnH
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    setContentView(R.layout.fwrn_fragment_shoppingcart)
+    setContentView(R.layout.fw_bridge_fragment_shoppingcart)
 
     val reactNativeFragment: Fragment = ReactFragment.Builder()
       .setComponentName("FWShoppingCartPage")
@@ -23,7 +23,7 @@ class FWVideoShoppingCartActivity : AppCompatActivity(), DefaultHardwareBackBtnH
 
     supportFragmentManager
       .beginTransaction()
-      .add(R.id.shopping_cart_container, reactNativeFragment)
+      .add(R.id.fw_bridge_shopping_cart_container, reactNativeFragment)
       .commit()
   }
 

package/android/src/main/java/com/{reactnativefireworksdk → fireworksdk/bridge/reactnative}/utils/FWEventUtils.kt

@@ -1,12 +1,12 @@
-package com.reactnativefireworksdk.utils
+package com.fireworksdk.bridge.reactnative.utils
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.facebook.react.uimanager.events.RCTEventEmitter
-import com.loopnow.fireworklibrary.models.Product
-import com.reactnativefireworksdk.models.*
+import com.fireworksdk.bridge.models.*
+import com.loopnow.fireworklibrary.data.Product
 
 object FWEventUtils {
 
@@ -26,8 +26,9 @@ object FWEventUtils {
     val eventMap = Arguments.createMap()
     val contentMap = Arguments.createMap()
     contentMap.putInt("index", info.index?:0)
-    contentMap.putString("videoId", info.id)
+    contentMap.putString("id", info.id)
     contentMap.putInt("duration", info.videoDuration?:0)
+    contentMap.putString("source", info.source)
     eventMap.putMap("info", contentMap)
     sendEvent(reactContext, FWEventName.VideoFeedClick.rawValue, eventMap)
   }
@@ -109,7 +110,7 @@ object FWEventUtils {
   }
 
   fun receiveVideoFeedLoadFinishedSuccessEvent(reactContext: ReactContext, targetTag: Int) {
-    receiveEvent(reactContext, targetTag, FWFeedViewEventName.VideoFeedLoadFinished.rawValue, Arguments.createMap())
+    receiveEvent(reactContext, targetTag, FWFeedViewEventName.VideoFeedLoadFinished.rawValue, null)
   }
 
   fun receiveVideoFeedLoadFinishedFailedEvent(reactContext: ReactContext, targetTag: Int, name: String, reason: String?) {
@@ -137,4 +138,44 @@ object FWEventUtils {
 //      event
 //    )
   }
+
+  // live stream
+  fun sendLiveStreamEvent(reactContext: ReactContext, eventName: String, info: FWLiveStreamEventDetailsModel?) {
+    val eventMap = Arguments.createMap()
+    eventMap.putString("eventName", eventName)
+
+    val contentMap = Arguments.createMap()
+    if (!info?.id.isNullOrBlank()) {
+      contentMap.putString("id", info?.id)
+    }
+    eventMap.putMap("info", contentMap)
+    sendEvent(reactContext, FWEventName.LiveStream.rawValue, eventMap)
+  }
+
+  fun sendLiveStreamChatEvent(reactContext: ReactContext, eventName: String, message: FWLiveStreamMessageDetailsModel?, liveStream: FWLiveStreamEventDetailsModel?) {
+    val eventMap = Arguments.createMap()
+    eventMap.putString("eventName", eventName)
+
+    // chat map
+    val chatMap = Arguments.createMap()
+    if (!message?.messageId.isNullOrBlank()) {
+      chatMap.putString("messageId", message?.messageId)
+    }
+    if (!message?.username.isNullOrBlank()) {
+      chatMap.putString("username", message?.username)
+    }
+    if (!message?.text.isNullOrBlank()) {
+      chatMap.putString("text", message?.text)
+    }
+    eventMap.putMap("chat", chatMap)
+
+    // live stream map
+    val liveStreamMap = Arguments.createMap()
+    if (!liveStream?.id.isNullOrBlank()) {
+      liveStreamMap.putString("id", liveStream?.id)
+    }
+    eventMap.putMap("liveStream", liveStreamMap)
+
+    sendEvent(reactContext, FWEventName.LiveStreamChat.rawValue, eventMap)
+  }
 }

package/android/src/main/java/com/{reactnativefireworksdk → fireworksdk/bridge}/utils/FWJsonUtils.kt

@@ -1,4 +1,4 @@
-package com.reactnativefireworksdk.utils
+package com.fireworksdk.bridge.utils
 
 import android.os.Looper
 import com.fasterxml.jackson.annotation.JsonInclude

package/android/src/main/java/com/{reactnativefireworksdk → fireworksdk/bridge}/utils/FWLogUtils.kt

@@ -1,9 +1,9 @@
-package com.reactnativefireworksdk.utils
+package com.fireworksdk.bridge.utils
 
 import android.os.Looper
 import android.os.SystemClock
 import android.util.Log
-import com.reactnativefireworksdk.BuildConfig
+import com.fireworksdk.bridge.BuildConfig
 import kotlin.math.max
 
 /**

package/android/src/main/java/com/{reactnativefireworksdk → fireworksdk/bridge}/utils/FWUrlUtils.kt

@@ -1,4 +1,4 @@
-package com.reactnativefireworksdk.utils
+package com.fireworksdk.bridge.utils
 
 import android.net.Uri
 

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

@@ -0,0 +1,94 @@
+package com.fireworksdk.bridge.utils
+
+import android.graphics.Color
+import com.loopnow.fireworklibrary.VideoPlayerProperties
+import com.fireworksdk.bridge.constants.FWVideoPlayerConstant
+import com.fireworksdk.bridge.models.FWAdBadgeConfigModel
+import com.fireworksdk.bridge.models.FWVideoFeedConfigModel
+import com.fireworksdk.bridge.models.FWVideoFeedTitlePosition
+import com.fireworksdk.bridge.models.FWVideoPlayerConfigModel
+import com.loopnow.fireworklibrary.AdLabelType
+import com.loopnow.fireworklibrary.VideoFeedProperties
+import com.loopnow.fireworklibrary.models.FeedTitlePosition
+import com.loopnow.fireworklibrary.views.PlaylistGroupFeedView
+import com.loopnow.fireworklibrary.views.VideoFeedView
+
+object FWVideoPlayerUtils {
+
+  var customCTAClickEnabled: Boolean = false
+  var videoPlaybackEventEnabled: Boolean = false
+
+  private var hasAssignedLaunchAppWithMute = false
+  /**
+   * if true, mute when open player (can be set only once)
+   */
+  private var launchPlayerWithMute = false
+    set(value) {
+      if (!hasAssignedLaunchAppWithMute) {
+        hasAssignedLaunchAppWithMute = true
+        VideoPlayerProperties.launchPlayerWithMute = value
+        field = value
+      }
+    }
+
+
+  fun setAdBadgeConfig(config: FWAdBadgeConfigModel?) {
+    val badgeTextType = config?.badgeTextType
+    when {
+      badgeTextType.equals(FWVideoPlayerConstant.FW_AD_BADGE_LABEL_AD) -> {
+        VideoFeedProperties.setAdLabel(AdLabelType.AD)
+      }
+      badgeTextType.equals(FWVideoPlayerConstant.FW_AD_BADGE_LABEL_SPONSORED) -> {
+        VideoFeedProperties.setAdLabel(AdLabelType.SPONSORED)
+      }
+    }
+  }
+
+  fun setPlaylistGroupFeedConfig(feedView: PlaylistGroupFeedView?, config: FWVideoFeedConfigModel?) {
+    val backgroundColor = config?.backgroundColor
+    if (!backgroundColor.isNullOrBlank()) {
+      feedView?.setBackgroundColor(Color.parseColor(backgroundColor))
+    } else {
+      feedView?.setBackgroundColor(Color.TRANSPARENT)
+    }
+
+    feedView?.setTitleVisible(config?.title?.hidden != true)
+
+    val titlePosition = when {
+      config?.titlePosition.equals(FWVideoFeedTitlePosition.Stacked.rawValue) -> FeedTitlePosition.BELOW
+      else -> FeedTitlePosition.ALIGN_BOTTOM
+    }
+    feedView?.setTitlePosition(titlePosition)
+    VideoFeedProperties.displayAdLabel = config?.showAdBadge == true
+  }
+
+  fun setVideoFeedConfig(feedView: VideoFeedView?, config: FWVideoFeedConfigModel?) {
+    val backgroundColor = config?.backgroundColor
+    if (!backgroundColor.isNullOrBlank()) {
+      feedView?.setBackgroundColor(Color.parseColor(backgroundColor))
+    } else {
+      feedView?.setBackgroundColor(Color.TRANSPARENT)
+    }
+
+    feedView?.setTitleVisible(config?.title?.hidden != true)
+
+    val titlePosition = when {
+      config?.titlePosition.equals(FWVideoFeedTitlePosition.Stacked.rawValue) -> FeedTitlePosition.BELOW
+      else -> FeedTitlePosition.ALIGN_BOTTOM
+    }
+    feedView?.setTitlePosition(titlePosition)
+    VideoFeedProperties.displayAdLabel = config?.showAdBadge == true
+  }
+
+  fun setVideoPlayerConfig(config: FWVideoPlayerConfigModel?) {
+    VideoPlayerProperties.share = config?.showShareButton != false
+    VideoPlayerProperties.loop = config?.videoCompleteAction != FWVideoPlayerConstant.FW_VIDEO_COMPLETE_ACTION_ADVANCE_TO_NEXT
+//    VideoPlayerProperties.autoPlayOnComplete = config?.videoCompleteAction != FWVideoPlayerConstant.FW_VIDEO_COMPLETE_ACTION_LOOP
+    VideoPlayerProperties.fullScreenPlayer = config?.playerStyle != FWVideoPlayerConstant.FW_PLAYER_STYLE_FIT
+    VideoPlayerProperties.enableOneTouchMute = config?.showMuteButton == true
+    VideoPlayerProperties.enablePlayPauseControl = config?.showPlaybackButton == true
+    if (config?.launchBehavior != null) {
+      launchPlayerWithMute = config.launchBehavior == FWVideoPlayerConstant.FW_PLAYER_LAUNCH_BEHAVIOR_MUTE_ON_FIRST_LAUNCH
+    }
+  }
+}

package/android/src/main/res/layout/fw_bridge_fragment_playlistfeed.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:id="@+id/fw_bridge_playlistfeed_container"
+  android:background="@color/fw_bridge_white"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <com.loopnow.fireworklibrary.views.PlaylistGroupFeedView
+    android:id="@+id/fw_bridge_playlistfeed"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:imageStyle="@style/FWFeedViewImageStyle"
+    app:textStyle="@style/FWFeedViewCaptionStyle"
+    />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

package/android/src/main/res/layout/{fwrn_fragment_shoppingcart.xml → fw_bridge_fragment_shoppingcart.xml}

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/shopping_cart_container"
+  android:id="@+id/fw_bridge_shopping_cart_container"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
 

package/android/src/main/res/layout/{fwrn_fragment_videofeed.xml → fw_bridge_fragment_videofeed.xml}

@@ -2,11 +2,12 @@
 <androidx.constraintlayout.widget.ConstraintLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:id="@+id/fw_bridge_videofeed_container"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
 
   <com.loopnow.fireworklibrary.views.VideoFeedView
-    android:id="@+id/fwrn_integrated_videofeed"
+    android:id="@+id/fw_bridge_videofeed"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:feedLayout="horizontal"

package/android/src/main/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="fw_bridge_white">#FFFFFF</color>
+</resources>

package/ios/{Component → Components}/VideoFeed.swift

@@ -153,6 +153,28 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
 }
 
 extension VideoFeed {
+    private func convertToFWAdBadgeConfiguration(_ adBadgeConfiguration: AdBadgeConfiguration?) -> FireworkVideo.AdBadgeConfiguration? {
+        guard let adBadgeConfiguration = adBadgeConfiguration else {
+            return nil
+        }
+        
+        var fwAdBadgeConfiguration = FireworkVideo.AdBadgeConfiguration()
+        if let textColor = adBadgeConfiguration.textColor {
+            fwAdBadgeConfiguration.textColor = textColor.uicolor()
+        }
+        if let backgroundColor = adBadgeConfiguration.backgroundColor {
+            fwAdBadgeConfiguration.backgroundColor = backgroundColor.uicolor()
+        }
+        switch adBadgeConfiguration.badgeTextType {
+            case .sponsored:
+                fwAdBadgeConfiguration.badgeText = FireworkVideo.AdBadgeConfiguration.BadgeText.sponsored
+            default:
+                fwAdBadgeConfiguration.badgeText = FireworkVideo.AdBadgeConfiguration.BadgeText.ad
+        }
+        
+        return fwAdBadgeConfiguration
+    }
+    
     private func convertToVideoFeedConentConfiguration() -> VideoFeedContentConfiguration {
         var videoConfig = VideoFeedContentConfiguration()
         //set default value so that behavior will the same with Android
@@ -174,6 +196,10 @@ extension VideoFeed {
         if let shareBaseUrl = gShareBaseURL {
             videoConfig.playerView.shareButton.behavior.baseURL = URL(string:shareBaseUrl)
         }
+        let adBadge = self.convertToFWAdBadgeConfiguration(gAdBadgeConfiguration)
+        if let adBadge = adBadge  {
+            videoConfig.adBadge = adBadge
+        }
         
         //set a value different from default value to compatible with FireworkVideo SDK misalign bug
         videoConfig.itemView.titleLayoutConfiguration.insets = UIEdgeInsets(top: 7, left: 7, bottom: 7, right: 7)
@@ -224,6 +250,9 @@ extension VideoFeed {
         if let showSponsored = config.showSponsored {
             vfcConfig.sponsored.isHidden = !showSponsored
         }
+        if let showAdBadge = config.showAdBadge {
+            vfcConfig.sponsored.isHidden = !showAdBadge
+        }
         
         return vfcConfig
     }

package/ios/{Component → Components}/VideoFeedConfiguration.swift

@@ -15,6 +15,7 @@ public class VideoFeedConfiguration: NSObject, Codable {
     var titlePosition: VideoFeedTitlePosition?
     var playIcon: VideoFeedPlayIconConfiguration?
     var showSponsored: Bool?
+    var showAdBadge: Bool?
     
     class VideoFeedTitleConfiguration: NSObject, Codable {
         public var hidden: Bool?

package/ios/Models/{FireworkJsEvent.swift → NativeToRN/FireworkEventName.swift}

@@ -7,11 +7,14 @@
 
 import Foundation
 
+/// Video event
 enum FWEventName: String, CaseIterable {
   case SDKInit = "fw:sdk-init"
   case CustomCTAClick = "fw:custom-cta-click"
   case VideoPlayback = "fw:video-playback"
   case VideoFeedClick = "fw:video-feed-click"
+  case ShareBaseURLUpdated = "fw:share-base-url-updated" //emitted in JS side
+  case AdBadgeConfigurationUpdated = "fw:ad-badge-configuration-updated" //emitted in JS side
 }
 
 enum VideoPlaybackSubEventName: String {
@@ -26,9 +29,26 @@ enum VideoPlaybackSubEventName: String {
     case ClickShare = "fw:video:click-share"
 }
 
+/// Shopping event
 enum ShoppingEventName: String, CaseIterable {
     case UpdateProductDetails = "fw:shopping:update-product-details"
     case WillDisplayProduct = "fw:shopping:will-display-product"
     case AddToCart = "fw:shopping:add-to-cart"
     case ClickCartIcon = "fw:shopping:click-cart-icon"
 }
+
+/// Live stream event
+enum LiveStreamEventName: String, CaseIterable {
+    case livestream = "fw:livestream"
+    case livestreamChat = "fw:livestream-chat"
+}
+
+enum LiveStreamSubEventName: String {
+    case UserDidjoin = "fw:livestream:user-join"
+    case UserDidLeave = "fw:livestream:user-leave"
+    case UserSendLike = "fw:livestream:user-send-like"
+}
+
+enum LiveStreamChatSubEventName: String {
+    case UserSendChat = "fw:livestream:user-send-chat"
+}

package/ios/Models/{FireworkSDK+JsModel.swift → NativeToRN/FireworkSDK+Json.swift}

@@ -55,8 +55,38 @@ extension VideoFeedError {
 
 extension FeedEventDetails {
     var jsObject: [String: Any] {
-        return ["index": index,
-                "videoId": id,
-                "duration": duration]
+        var sourceStr: String = ""
+        switch(source) {
+        case .discover:
+            sourceStr = "discover"
+        case .channel(channelID: _):
+            sourceStr = "channel"
+        case .channelPlaylist(channelID: _, playlistID: _):
+            sourceStr = "playlist"
+        case .playlistGroup(groupID: _):
+            sourceStr = "playlistGroup"
+        default:
+            break
+        }
+        return [
+            "index": index,
+            "id": id,
+            "duration": duration,
+            "source": sourceStr
+        ]
+    }
+}
+
+extension LiveStreamEventDetails {
+    var jsObject: [String: Any] {
+        return ["id": id]
+    }
+}
+
+extension LiveStreamMessageDetails {
+    var jsObject: [String: Any] {
+        return ["messageId": messageID,
+                "username": username,
+                "text": text]
     }
 }

package/ios/Models/{RCTConvert+FireworkSDKModule.swift → RNToNative/RCTConvert+FireworkSDKModule.swift}

@@ -88,4 +88,24 @@ extension RCTConvert {
         
         return result
     }
+    
+    static func adBadgeConfiguration(_ config: [String: AnyObject]?) -> AdBadgeConfiguration? {
+        guard let rConfig = config else {
+            return nil
+        }
+        
+        let jsonData = try? JSONSerialization.data(withJSONObject: rConfig, options: .prettyPrinted)
+        guard let rJsonData = jsonData else {
+            return nil
+        }
+        
+        var result: AdBadgeConfiguration?
+        do {
+            result = try JSONDecoder().decode(AdBadgeConfiguration.self, from: rJsonData)
+        } catch let error {
+            print(error.localizedDescription)
+        }
+        
+        return result
+    }
 }

package/ios/Modules/FireworkSDKModule/AdBadgeConfiguration.swift

@@ -0,0 +1,18 @@
+//
+//  AdBadgeConfiguration.swift
+//  react-native-firework-sdk
+//
+//  Created by Jeff Zheng on 2022/3/8.
+//
+
+import Foundation
+
+struct AdBadgeConfiguration: Codable {
+    var badgeTextType: BadgeTextType = .ad
+    var backgroundColor: String?
+    var textColor: String?
+    
+    enum BadgeTextType: String, Codable {
+        case ad, sponsored
+    }
+}

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

@@ -10,7 +10,7 @@ import FireworkVideo
 
 extension FireworkSDKModule: FireworkVideoCTADelegate {
     func handleCustomCTAClick(_ viewController: PlayerViewController, url: URL) -> Bool {
-        sendEvent(withName: FWEventName.CustomCTAClick.rawValue, body: [url: url])
+        sendEvent(withName: FWEventName.CustomCTAClick.rawValue, body: ["url": url.absoluteString])
         
         return customCTAClickEnabled
     }

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

@@ -19,42 +19,42 @@ extension FireworkSDKModule: FireworkVideoPlaybackDelegate {
     
     func fireworkVideoDidRecordImpression(_ videoPlayback: VideoPlaybackDetails) {
         guard enableVideoPlayBackEvent else { return }
-        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: [VideoPlaybackSubEventName.Impression.rawValue: videoPlayback.jsObject])
+        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: ["eventName": VideoPlaybackSubEventName.Impression.rawValue, "info": videoPlayback.jsObject])
     }
     
     func fireworkVideoDidStartPlaying(_ videoPlayback: VideoPlaybackDetails) {
         guard enableVideoPlayBackEvent else { return }
-        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: [VideoPlaybackSubEventName.Start.rawValue: videoPlayback.jsObject])
+        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: ["eventName":VideoPlaybackSubEventName.Start.rawValue, "info": videoPlayback.jsObject])
     }
     
     func fireworkVideoReachedFirstQuartile(_ videoPlayback: VideoPlaybackDetails) {
         guard enableVideoPlayBackEvent else { return }
-        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: [VideoPlaybackSubEventName.FirstQuartile.rawValue: videoPlayback.jsObject])
+        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: ["eventName":VideoPlaybackSubEventName.FirstQuartile.rawValue, "info": videoPlayback.jsObject])
     }
     
     func fireworkVideoReachedMidPoint(_ videoPlayback: VideoPlaybackDetails) {
         guard enableVideoPlayBackEvent else { return }
-        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: [VideoPlaybackSubEventName.Midpoint.rawValue: videoPlayback.jsObject])
+        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: ["eventName":VideoPlaybackSubEventName.Midpoint.rawValue, "info": videoPlayback.jsObject])
     }
     
     func fireworkVideoReachedThirdQuartile(_ videoPlayback: VideoPlaybackDetails) {
         guard enableVideoPlayBackEvent else { return }
-        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: [VideoPlaybackSubEventName.ThirdQuartile.rawValue: videoPlayback.jsObject])
+        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: ["eventName":VideoPlaybackSubEventName.ThirdQuartile.rawValue, "info": videoPlayback.jsObject])
     }
     
     func fireworkVideoDidFinishPlaying(_ videoPlayback: VideoPlaybackDetails) {
         guard enableVideoPlayBackEvent else { return }
-        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: [VideoPlaybackSubEventName.Complete.rawValue: videoPlayback.jsObject])
+        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: ["eventName":VideoPlaybackSubEventName.Complete.rawValue, "info": videoPlayback.jsObject])
     }
     
     func fireworkVideoDidTapCTAButton(_ videoPlayback: VideoPlaybackDetails) {
         guard enableVideoPlayBackEvent else { return }
-        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: [VideoPlaybackSubEventName.ClickCTA.rawValue: videoPlayback.jsObject])
+        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: ["eventName":VideoPlaybackSubEventName.ClickCTA.rawValue, "info": videoPlayback.jsObject])
     }
     
     func fireworkVideoDidTapShareButton(_ videoPlayback: VideoPlaybackDetails) {
         guard enableVideoPlayBackEvent else { return }
-        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: [VideoPlaybackSubEventName.ClickShare.rawValue: videoPlayback.jsObject])
+        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: ["eventName":VideoPlaybackSubEventName.ClickShare.rawValue, "info": videoPlayback.jsObject])
     }
     
     func fireworkVideoDidStartPlayingAd(_ videoPlayback: VideoPlaybackDetails) {
@@ -63,21 +63,12 @@ extension FireworkSDKModule: FireworkVideoPlaybackDelegate {
     
     func fireworkVideoDidFinishPlayingAd(_ videoPlayback: VideoPlaybackDetails) {
         guard enableVideoPlayBackEvent else { return }
-        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: [VideoPlaybackSubEventName.AdEnd.rawValue: videoPlayback.jsObject])
+        sendEvent(withName: FWEventName.VideoPlayback.rawValue, body: ["eventName":VideoPlaybackSubEventName.AdEnd.rawValue, "info": videoPlayback.jsObject])
     }
 }
 
 extension FireworkSDKModule: FireworkVideoFeedDelegate {
     func fireworkVideoDidTapThumbnail(_ eventDetails: FeedEventDetails) {
-        switch eventDetails.source {
-        case .playlistGroup(_): break
-            
-        default:
-            sendEvent(withName: FWEventName.VideoFeedClick.rawValue, body: eventDetails.jsObject)
-        }
+        sendEvent(withName: FWEventName.VideoFeedClick.rawValue, body: ["info": eventDetails.jsObject])
     }
-    
-//    func fireworkVideoDidTapVideoThumbnail(_ eventDetails: FeedEventDetails) {
-//        sendEvent(withName: FWEventName.VideoFeedClick.rawValue, body: eventDetails.jsObject)
-//    }
 }

package/ios/Modules/FireworkSDKModule/FireworkSDKModule.m

@@ -13,7 +13,8 @@
 _RCT_EXTERN_REMAP_METHOD(init, initializeSDK:(NSString * __nullable)userId config:(NSDictionary *__nullable)config, NO)
 RCT_EXTERN_METHOD(openVideoPlayer:(NSString *)url config:(NSDictionary *)config)
 RCT_EXTERN_METHOD(setCustomCTAClickEnabled:(BOOL)enabled)
-RCT_EXTERN_METHOD(setShareBaseURL:(NSString *)url)
+RCT_EXTERN_METHOD(setShareBaseURL:(NSString *)url resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(setVideoPlaybackEventEnabled:(BOOL)enabled)
+RCT_EXTERN_METHOD(setAdBadgeConfiguration:(NSDictionary *)config resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 
 @end