react-native-firework-sdk 2.0.0 → 2.2.0-beta.1

package/FireworkVideoUI.xcframework/ios-arm64_x86_64-simulator/FireworkVideoUI.framework/Modules/FireworkVideoUI.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface

@@ -0,0 +1,41 @@
+// swift-interface-format-version: 1.0
+// swift-compiler-version: Apple Swift version 5.7.2 (swiftlang-5.7.2.135.5 clang-1400.0.29.51)
+// swift-module-flags: -target x86_64-apple-ios12.1-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name FireworkVideoUI
+// swift-module-flags-ignorable: -enable-bare-slash-regex
+import FireworkVideo
+@_exported import FireworkVideoUI
+import Foundation
+import Swift
+import UIKit
+import WebKit
+import _Concurrency
+import _StringProcessing
+extension Dispatch.DispatchQueue {
+  public class func once(file: Swift.String = #file, function: Swift.String = #function, line: Swift.Int = #line, block: () -> Swift.Void)
+  public class func once(token: Swift.String, block: () -> Swift.Void)
+}
+extension UIKit.UIView {
+  @_Concurrency.MainActor(unsafe) public var parentViewController: UIKit.UIViewController? {
+    get
+  }
+  @_Concurrency.MainActor(unsafe) public var isIOSSDKView: Swift.Bool {
+    get
+  }
+}
+@_hasMissingDesignatedInitializers public class Swizzle {
+  public static func swizzleSelector(cls: Swift.AnyClass, originalSelector: ObjectiveC.Selector, customSelector: ObjectiveC.Selector)
+  public static func swizzleClassSelector(cls: Swift.AnyClass, originalSelector: ObjectiveC.Selector, customSelector: ObjectiveC.Selector)
+  @objc deinit
+}
+@_hasMissingDesignatedInitializers public class AppLanguageManager {
+  public struct NotificationName {
+    public static let AppLanguageChanged: Foundation.Notification.Name
+  }
+  public static let shared: FireworkVideoUI.AppLanguageManager
+  public var appLanguage: Swift.String? {
+    get
+  }
+  @discardableResult
+  public func changeAppLanguage(_ language: Swift.String?) -> Swift.Bool
+  @objc deinit
+}

package/FireworkVideoUI.xcframework/ios-arm64_x86_64-simulator/FireworkVideoUI.framework/Modules/FireworkVideoUI.swiftmodule/x86_64-apple-ios-simulator.swiftinterface

@@ -0,0 +1,41 @@
+// swift-interface-format-version: 1.0
+// swift-compiler-version: Apple Swift version 5.7.2 (swiftlang-5.7.2.135.5 clang-1400.0.29.51)
+// swift-module-flags: -target x86_64-apple-ios12.1-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name FireworkVideoUI
+// swift-module-flags-ignorable: -enable-bare-slash-regex
+import FireworkVideo
+@_exported import FireworkVideoUI
+import Foundation
+import Swift
+import UIKit
+import WebKit
+import _Concurrency
+import _StringProcessing
+extension Dispatch.DispatchQueue {
+  public class func once(file: Swift.String = #file, function: Swift.String = #function, line: Swift.Int = #line, block: () -> Swift.Void)
+  public class func once(token: Swift.String, block: () -> Swift.Void)
+}
+extension UIKit.UIView {
+  @_Concurrency.MainActor(unsafe) public var parentViewController: UIKit.UIViewController? {
+    get
+  }
+  @_Concurrency.MainActor(unsafe) public var isIOSSDKView: Swift.Bool {
+    get
+  }
+}
+@_hasMissingDesignatedInitializers public class Swizzle {
+  public static func swizzleSelector(cls: Swift.AnyClass, originalSelector: ObjectiveC.Selector, customSelector: ObjectiveC.Selector)
+  public static func swizzleClassSelector(cls: Swift.AnyClass, originalSelector: ObjectiveC.Selector, customSelector: ObjectiveC.Selector)
+  @objc deinit
+}
+@_hasMissingDesignatedInitializers public class AppLanguageManager {
+  public struct NotificationName {
+    public static let AppLanguageChanged: Foundation.Notification.Name
+  }
+  public static let shared: FireworkVideoUI.AppLanguageManager
+  public var appLanguage: Swift.String? {
+    get
+  }
+  @discardableResult
+  public func changeAppLanguage(_ language: Swift.String?) -> Swift.Bool
+  @objc deinit
+}

package/FireworkVideoUI.xcframework/ios-arm64_x86_64-simulator/FireworkVideoUI.framework/Modules/module.modulemap

@@ -0,0 +1,11 @@
+framework module FireworkVideoUI {
+  umbrella header "FireworkVideoUI.h"
+
+  export *
+  module * { export * }
+}
+
+module FireworkVideoUI.Swift {
+  header "FireworkVideoUI-Swift.h"
+  requires objc
+}

package/FireworkVideoUI.xcframework/ios-arm64_x86_64-simulator/FireworkVideoUI.framework/_CodeSignature/CodeResources

@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict>
+		<key>Headers/FireworkVideoUI-Swift.h</key>
+		<data>
+		i583HibrN7k0YmXoCN8LIDbmSt4=
+		</data>
+		<key>Headers/FireworkVideoUI.h</key>
+		<data>
+		NRZg85mNKv6PczcMet582mQjwKE=
+		</data>
+		<key>Info.plist</key>
+		<data>
+		n1uKz1HOP5lKIFyaa+M/WugPLpM=
+		</data>
+		<key>Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
+		<data>
+		Au+a1vc6m45SBkvfSdh3UT+uM2E=
+		</data>
+		<key>Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
+		<data>
+		h6vJW+NP0+gY51ZhP57nW392cYk=
+		</data>
+		<key>Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
+		<data>
+		atyRF4RCvp3Q7O/mp4rYXB1jE0Q=
+		</data>
+		<key>Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios-simulator.swiftinterface</key>
+		<data>
+		h6vJW+NP0+gY51ZhP57nW392cYk=
+		</data>
+		<key>Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
+		<data>
+		GstdOocn005n9Y9BSuCOjaZ/KBo=
+		</data>
+		<key>Modules/FireworkVideoUI.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
+		<data>
+		Au+a1vc6m45SBkvfSdh3UT+uM2E=
+		</data>
+		<key>Modules/FireworkVideoUI.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
+		<data>
+		y0ggQlQYk8fPmRZJgyJe3Ma5o+w=
+		</data>
+		<key>Modules/FireworkVideoUI.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
+		<data>
+		JazAtiVxFvmfMtiCcVLmAg7e1KM=
+		</data>
+		<key>Modules/FireworkVideoUI.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>
+		<data>
+		y0ggQlQYk8fPmRZJgyJe3Ma5o+w=
+		</data>
+		<key>Modules/FireworkVideoUI.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
+		<data>
+		ufdIb2xdE4Uk5fET7rrUGlF8CFY=
+		</data>
+		<key>Modules/module.modulemap</key>
+		<data>
+		acpgMXnxtKZurb9LYb4tLOcX2cM=
+		</data>
+	</dict>
+	<key>files2</key>
+	<dict>
+		<key>Headers/FireworkVideoUI-Swift.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			xWiKQmcf3DHCgH9dBkmdlAsxIZiUklEHKL8VF5guI8w=
+			</data>
+		</dict>
+		<key>Headers/FireworkVideoUI.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			C2EMdBka9kS6ugy1NmcysmLzhwcZtW52x27D4Pi5P2Q=
+			</data>
+		</dict>
+		<key>Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			A0FxvzFLyYWeXhK8cUOfscPrLasCqhaZNJhKluYu59k=
+			</data>
+		</dict>
+		<key>Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			UkEtCk4njRXmEtNtWaE93q1xAPpSOkHeaFgW+Lz63CI=
+			</data>
+		</dict>
+		<key>Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			ijGRDjteeQYBsYlAIa1ygEoPzdBUK0odDABdGpCdg6I=
+			</data>
+		</dict>
+		<key>Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios-simulator.swiftinterface</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			UkEtCk4njRXmEtNtWaE93q1xAPpSOkHeaFgW+Lz63CI=
+			</data>
+		</dict>
+		<key>Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			gHcFcwcr1aAv9W0SVThpQzKZ4iwioor9z8/+tAL9+5Q=
+			</data>
+		</dict>
+		<key>Modules/FireworkVideoUI.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			A0FxvzFLyYWeXhK8cUOfscPrLasCqhaZNJhKluYu59k=
+			</data>
+		</dict>
+		<key>Modules/FireworkVideoUI.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			Mzu7kL+XazpOcd2k3KQRRBTHmNTN7XErWwVGHsUJv7E=
+			</data>
+		</dict>
+		<key>Modules/FireworkVideoUI.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			/VtAsoSxZoVfhFW8ufywQGyBJU+cSfB3cI/rcVkUFGU=
+			</data>
+		</dict>
+		<key>Modules/FireworkVideoUI.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			Mzu7kL+XazpOcd2k3KQRRBTHmNTN7XErWwVGHsUJv7E=
+			</data>
+		</dict>
+		<key>Modules/FireworkVideoUI.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			3LgfAp0SD5Qb24w+Jt+yH3P1gvMKdtH25ZZQHYt25Os=
+			</data>
+		</dict>
+		<key>Modules/module.modulemap</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			e6XgRro0MbWm+Nu76XbtPBOQtqanmjktK8gkROMrsUo=
+			</data>
+		</dict>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^.*</key>
+		<true/>
+		<key>^.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/README.md

@@ -1,3 +1,3 @@
 # Firework React Native SDK
 
-Please refer to the integration guide here: https://docs.firework.tv/react-native-sdk/integration-guide-v2
+The integration guide is https://docs.firework.tv/react-native-sdk/integration-guide-v2

package/android/build.gradle

@@ -50,8 +50,8 @@ android {
     }
   }
 
-  dataBinding {
-    enabled = true
+  buildFeatures {
+    viewBinding = true
   }
 
   lintOptions {
@@ -68,7 +68,6 @@ android {
 repositories {
   mavenCentral()
   google()
-  maven { url 'https://jitpack.io' }
   mavenLocal()
 
   maven {
@@ -151,7 +150,7 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
 
-  def fireworkSdkVersion = "6.0.0"
+  def fireworkSdkVersion = "6.2.1"
   implementation "com.firework:sdk:$fireworkSdkVersion"
   implementation "com.firework.external.imageloading:glide:$fireworkSdkVersion"
   implementation "com.firework.external.livestream:singleHostPlayer:$fireworkSdkVersion"
@@ -165,6 +164,8 @@ dependencies {
 
   // required to avoid crash on Android 12 API 31
   implementation 'androidx.work:work-runtime-ktx:2.7.0'
+
+  implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 }
 
 configurations.all {

package/android/src/main/java/com/fireworksdk/bridge/components/videofeed/FWVideoFeed.kt

@@ -59,6 +59,12 @@ class FWVideoFeed(
     )
   }
 
+  fun setHashtagFilterExpressionProps(hashtagFilterExpression: String?) {
+    videoFeedPropsModel = videoFeedPropsModel.copy(
+      hashtagFilterExpression = hashtagFilterExpression
+    )
+  }
+
   fun setModeProps(mode: String?) {
     videoFeedPropsModel = videoFeedPropsModel.copy(
       mode = mode

package/android/src/main/java/com/fireworksdk/bridge/components/videofeed/StoryBlockFragment.kt

@@ -0,0 +1,129 @@
+package com.fireworksdk.bridge.components.videofeed
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.OnBackPressedCallback
+import androidx.fragment.app.Fragment
+import com.firework.storyblock.FeedLoadListener
+import com.firework.storyblock.FwStoryBlockView
+import com.fireworksdk.bridge.databinding.FwBridgeStoryBlockBinding
+import com.fireworksdk.bridge.models.FWVideoFeedPropsModel
+import com.fireworksdk.bridge.utils.FWConfigUtil
+
+class StoryBlockFragment : Fragment() {
+
+  private var _binding: FwBridgeStoryBlockBinding? = null
+  private val binding: FwBridgeStoryBlockBinding get() = _binding!!
+
+  private var feedLoadListener: FeedLoadListener? = null
+  private var fullScreenStateChangeListener: FwStoryBlockView.OnFullscreenStateChangeListener? = null
+  private var videoFeedPropsModel: FWVideoFeedPropsModel = FWVideoFeedPropsModel()
+
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?,
+    savedInstanceState: Bundle?,
+  ): View {
+    _binding = FwBridgeStoryBlockBinding.inflate(inflater)
+    return binding.root
+  }
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    afterUpdateTransaction()
+    // need to call it after init()
+    binding.storyBlock.setFeedLoadListener(feedLoadListener)
+    binding.storyBlock.setOnFullscreenStateChangeListener(fullScreenStateChangeListener)
+//    addBackPressedCallback()
+//    Handler(Looper.getMainLooper()).postDelayed({
+//      addBackPressedCallback()
+//    }, 10000)
+  }
+
+
+  override fun onDestroyView() {
+//    removeBackPressedCallback()
+    _binding = null
+    super.onDestroyView()
+  }
+
+  private fun afterUpdateTransaction() {
+    val viewOptionsBuilder = FWConfigUtil.generateViewOptionsBuilder(videoFeedPropsModel)
+    binding.storyBlock.init(
+      childFragmentManager,
+      requireActivity().lifecycle,
+      viewOptionsBuilder.build(),
+      binding.storyBlockContainer,
+    )
+  }
+
+  fun setProps(props: FWVideoFeedPropsModel?) {
+    props ?: return
+    videoFeedPropsModel = props
+  }
+
+  fun play() {
+    binding.storyBlock.play()
+  }
+
+  fun pause() {
+    binding.storyBlock.pause()
+  }
+
+  fun toggleFullScreen() {
+    binding.storyBlock.toggleFullscreen()
+  }
+
+  fun setFeedLoadListener(feedLoadListener: FeedLoadListener?) {
+    this.feedLoadListener = feedLoadListener
+  }
+
+  fun setOnFullScreenStateChangedListener(listener: FwStoryBlockView.OnFullscreenStateChangeListener?) {
+    this.fullScreenStateChangeListener = listener
+  }
+
+  fun isFullScreen(): Boolean {
+    return binding.storyBlock.isFullscreen()
+  }
+
+  private val mBackPressedCallback: OnBackPressedCallback by lazy  {
+    object : OnBackPressedCallback(true) {
+      override fun handleOnBackPressed() {
+        if (binding.storyBlock.isFullscreen()) {
+          binding.storyBlock.toggleFullscreen()
+        } else {
+          isEnabled = false
+          requireActivity().onBackPressed()
+        }
+      }
+    }
+  }
+
+  private fun addBackPressedCallback() {
+    requireActivity()
+      .onBackPressedDispatcher
+      .addCallback(
+        viewLifecycleOwner,
+        mBackPressedCallback
+      )
+  }
+
+  private fun removeBackPressedCallback() {
+    mBackPressedCallback.remove()
+  }
+
+  override fun onPause() {
+    super.onPause()
+  }
+
+  override fun onResume() {
+    super.onResume()
+  }
+
+  override fun onDestroy() {
+    super.onDestroy()
+  }
+
+}

package/android/src/main/java/com/fireworksdk/bridge/components/videofeed/StoryBlockFrameLayout.kt

@@ -0,0 +1,90 @@
+package com.fireworksdk.bridge.components.videofeed
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.FrameLayout
+import com.fireworksdk.bridge.models.*
+
+class StoryBlockFrameLayout(
+  context: Context,
+  attrs: AttributeSet?
+) : FrameLayout(context, attrs) {
+
+  constructor(context: Context) : this(context, null)
+
+  private var videoFeedPropsModel: FWVideoFeedPropsModel = FWVideoFeedPropsModel()
+  private var storyBlockFragment by weakProperty<StoryBlockFragment?>()
+
+  fun setSource(source: String?) {
+    videoFeedPropsModel = videoFeedPropsModel.copy(
+      source = source
+    )
+  }
+
+  fun setChannel(channel: String?) {
+    videoFeedPropsModel = videoFeedPropsModel.copy(
+      channel = channel
+    )
+  }
+
+  fun setPlaylist(playlist: String?) {
+    videoFeedPropsModel = videoFeedPropsModel.copy(
+      playlist = playlist
+    )
+  }
+
+  fun setHashtagFilterExpressionProps(hashtagFilterExpression: String?) {
+    videoFeedPropsModel = videoFeedPropsModel.copy(
+      hashtagFilterExpression = hashtagFilterExpression
+    )
+  }
+
+  fun setDynamicContentParameters(parametersMap: HashMap<String, List<String>>?) {
+    videoFeedPropsModel = videoFeedPropsModel.copy(
+      dynamicContentParameters = parametersMap
+    )
+  }
+
+  fun setEnablePictureInPicture(enablePictureInPicture: Boolean?) {
+    videoFeedPropsModel = videoFeedPropsModel.copy(
+      enablePictureInPicture = enablePictureInPicture
+    )
+  }
+
+  fun setVideoFeedConfig(config: FWVideoFeedConfigModel?) {
+    videoFeedPropsModel = videoFeedPropsModel.copy(
+      videoFeedConfiguration = config
+    )
+  }
+
+  fun setVideoPlayerConfig(config: FWVideoPlayerConfigModel?) {
+    videoFeedPropsModel = videoFeedPropsModel.copy(
+      videoPlayerConfiguration = config
+    )
+  }
+
+  fun setFragment(fragment: StoryBlockFragment) {
+    this.storyBlockFragment = fragment
+    fragment.setProps(videoFeedPropsModel)
+  }
+
+  fun getFragment(): StoryBlockFragment? {
+    return storyBlockFragment
+  }
+
+  fun play() {
+    storyBlockFragment?.play()
+  }
+
+  fun pause() {
+    storyBlockFragment?.pause()
+  }
+
+  fun toggleFullScreen() {
+    storyBlockFragment?.toggleFullScreen()
+  }
+
+  fun destroy() {
+    storyBlockFragment = null
+  }
+}

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

@@ -11,9 +11,9 @@ object FWAdBadgeConfigModelDeserializer {
   fun deserialize(responseJson: JSONObject?): FWAdBadgeConfigModel? {
     responseJson ?: return null
 
-    val badgeTextType = responseJson.optString(BADGE_TEXT_TYPE_KEY)
-    val backgroundColor = responseJson.optString(BACKGROUND_COLOR_KEY)
-    val textColor = responseJson.optString(TEXT_COLOR_KEY)
+    val badgeTextType = if (responseJson.has(BADGE_TEXT_TYPE_KEY)) responseJson.optString(BADGE_TEXT_TYPE_KEY) else null
+    val backgroundColor = if (responseJson.has(BACKGROUND_COLOR_KEY)) responseJson.optString(BACKGROUND_COLOR_KEY) else null
+    val textColor = if (responseJson.has(TEXT_COLOR_KEY)) responseJson.optString(TEXT_COLOR_KEY) else null
 
     return FWAdBadgeConfigModel(
       badgeTextType = badgeTextType,

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

@@ -21,17 +21,20 @@ enum class FWFeedViewEventName(val rawValue: String) {
 enum class FWVideoPlaybackSubEventName(val rawValue: String) {
   Impression("fw:video:impression"),
   Start("fw:video:start"),
+  Pause("fw:video:pause"),
+  Resume("fw:video:resume"),
   FirstQuartile("fw:video:first-quartile"),
   Midpoint("fw:video:midpoint"),
   ThirdQuartile("fw:video:third-quartile"),
   Complete("fw:video:complete"),
+  AdStart("fw:video:ad-start"),
   AdEnd("fw:video:ad-end"),
   ClickCTA("fw:video:click-cta"),
   ClickShare("fw:video:click-share"),
 }
 
 enum class FWVideoShoppingEventName(val rawValue: String) {
-  AddToCart("fw:shopping:add-to-cart"),
+  CtaButtonClick("fw:shopping:cta-button-click"),
   ClickCartIcon("fw:shopping:click-cart-icon"),
   UpdateProductDetails("fw:shopping:update-product-details"),
   WillDisplayProduct("fw:shopping:will-display-product"),
@@ -47,4 +50,5 @@ enum class FWLiveStreamEventName(val rawValue: String) {
 
 enum class FWStoryBlockEventName(val rawValue: String) {
   StoryBlockLoadFinished("onStoryBlockLoadFinished"),
+  StoryBlockFullScreenStateChanged("onStoryBlockFullScreenStateChanged"),
 }

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

@@ -11,7 +11,7 @@ object FWFontInfoModelDeserializer {
     responseJson ?: return null
 
     val isCustom = responseJson.optBoolean(IS_CUSTOM_KEY, false)
-    val typefaceName = responseJson.optString(TYPEFACE_NAME_KEY)
+    val typefaceName = if (responseJson.has(TYPEFACE_NAME_KEY)) responseJson.optString(TYPEFACE_NAME_KEY) else null
 
     return FWFontInfoModel(
       isCustom = isCustom,