react-native-firework-sdk 2.2.5 → 2.3.1

package/FireworkVideoUI.xcframework/Info.plist

@@ -6,30 +6,30 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>FireworkVideoUI.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>FireworkVideoUI.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/FireworkVideoUI.xcframework/ios-arm64/FireworkVideoUI.framework/Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios.abi.json

@@ -1008,13 +1008,6 @@
     "json_format_version": 8
   },
   "ConstValues": [
-    {
-      "filePath": "\/Users\/runner\/work\/bogano\/bogano\/ios\/FireworkVideoUI\/FireworkVideoUI\/Sources\/AppLanguage\/Extensions\/Foundation\/URLSession+AppLanguage.swift",
-      "kind": "Array",
-      "offset": 141,
-      "length": 47,
-      "value": "[\"api.firework.tv\", \"p2.fwpixel.com\"]"
-    },
     {
       "filePath": "\/Users\/runner\/work\/bogano\/bogano\/ios\/FireworkVideoUI\/FireworkVideoUI\/Sources\/LayoutFlip\/LayoutFlipManager.swift",
       "kind": "BooleanLiteral",
@@ -1075,8 +1068,8 @@
       "filePath": "\/Users\/runner\/work\/bogano\/bogano\/ios\/FireworkVideoUI\/FireworkVideoUI\/Sources\/AppLanguage\/Extensions\/UIKit\/UIImageView+AppLanguage.swift",
       "kind": "Array",
       "offset": 172,
-      "length": 102,
-      "value": "[\"shopping-cart\", \"left-arrow\", \"right-arrow\", \"speaker-unmute\", \"speaker-mute\"]"
+      "length": 145,
+      "value": "[\"shopping-cart\", \"left-arrow\", \"right-arrow\", \"speaker-unmute\", \"speaker-mute\", \"mute\", \"mute-off\", \"mute-on\"]"
     },
     {
       "filePath": "\/Users\/runner\/work\/bogano\/bogano\/ios\/FireworkVideoUI\/FireworkVideoUI\/Sources\/AppLanguage\/Extensions\/UIKit\/UITextField+AppLanguage.swift",

package/FireworkVideoUI.xcframework/ios-arm64_x86_64-simulator/FireworkVideoUI.framework/Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios-simulator.abi.json

@@ -1008,13 +1008,6 @@
     "json_format_version": 8
   },
   "ConstValues": [
-    {
-      "filePath": "\/Users\/runner\/work\/bogano\/bogano\/ios\/FireworkVideoUI\/FireworkVideoUI\/Sources\/AppLanguage\/Extensions\/Foundation\/URLSession+AppLanguage.swift",
-      "kind": "Array",
-      "offset": 141,
-      "length": 47,
-      "value": "[\"api.firework.tv\", \"p2.fwpixel.com\"]"
-    },
     {
       "filePath": "\/Users\/runner\/work\/bogano\/bogano\/ios\/FireworkVideoUI\/FireworkVideoUI\/Sources\/LayoutFlip\/LayoutFlipManager.swift",
       "kind": "BooleanLiteral",
@@ -1075,8 +1068,8 @@
       "filePath": "\/Users\/runner\/work\/bogano\/bogano\/ios\/FireworkVideoUI\/FireworkVideoUI\/Sources\/AppLanguage\/Extensions\/UIKit\/UIImageView+AppLanguage.swift",
       "kind": "Array",
       "offset": 172,
-      "length": 102,
-      "value": "[\"shopping-cart\", \"left-arrow\", \"right-arrow\", \"speaker-unmute\", \"speaker-mute\"]"
+      "length": 145,
+      "value": "[\"shopping-cart\", \"left-arrow\", \"right-arrow\", \"speaker-unmute\", \"speaker-mute\", \"mute\", \"mute-off\", \"mute-on\"]"
     },
     {
       "filePath": "\/Users\/runner\/work\/bogano\/bogano\/ios\/FireworkVideoUI\/FireworkVideoUI\/Sources\/AppLanguage\/Extensions\/UIKit\/UITextField+AppLanguage.swift",

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

@@ -1008,13 +1008,6 @@
     "json_format_version": 8
   },
   "ConstValues": [
-    {
-      "filePath": "\/Users\/runner\/work\/bogano\/bogano\/ios\/FireworkVideoUI\/FireworkVideoUI\/Sources\/AppLanguage\/Extensions\/Foundation\/URLSession+AppLanguage.swift",
-      "kind": "Array",
-      "offset": 141,
-      "length": 47,
-      "value": "[\"api.firework.tv\", \"p2.fwpixel.com\"]"
-    },
     {
       "filePath": "\/Users\/runner\/work\/bogano\/bogano\/ios\/FireworkVideoUI\/FireworkVideoUI\/Sources\/LayoutFlip\/LayoutFlipManager.swift",
       "kind": "BooleanLiteral",
@@ -1075,8 +1068,8 @@
       "filePath": "\/Users\/runner\/work\/bogano\/bogano\/ios\/FireworkVideoUI\/FireworkVideoUI\/Sources\/AppLanguage\/Extensions\/UIKit\/UIImageView+AppLanguage.swift",
       "kind": "Array",
       "offset": 172,
-      "length": 102,
-      "value": "[\"shopping-cart\", \"left-arrow\", \"right-arrow\", \"speaker-unmute\", \"speaker-mute\"]"
+      "length": 145,
+      "value": "[\"shopping-cart\", \"left-arrow\", \"right-arrow\", \"speaker-unmute\", \"speaker-mute\", \"mute\", \"mute-off\", \"mute-on\"]"
     },
     {
       "filePath": "\/Users\/runner\/work\/bogano\/bogano\/ios\/FireworkVideoUI\/FireworkVideoUI\/Sources\/AppLanguage\/Extensions\/UIKit\/UITextField+AppLanguage.swift",

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

@@ -14,11 +14,11 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		P3i/2edTGa9yeKILUEa7IMZfWSg=
+		bJBEvOE+WJbSoSkR6Xh6+u4bfOs=
 		</data>
 		<key>Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
-		Au+a1vc6m45SBkvfSdh3UT+uM2E=
+		lQx5YtEpXss7I8lfCQehqabnXgo=
 		</data>
 		<key>Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
@@ -34,11 +34,11 @@
 		</data>
 		<key>Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		GstdOocn005n9Y9BSuCOjaZ/KBo=
+		qRfrL9mXazL6J5BnSlWDYMeoUac=
 		</data>
 		<key>Modules/FireworkVideoUI.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<data>
-		Au+a1vc6m45SBkvfSdh3UT+uM2E=
+		lQx5YtEpXss7I8lfCQehqabnXgo=
 		</data>
 		<key>Modules/FireworkVideoUI.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
@@ -54,7 +54,7 @@
 		</data>
 		<key>Modules/FireworkVideoUI.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		ufdIb2xdE4Uk5fET7rrUGlF8CFY=
+		cZABauPlCz6cG08CTLoue1d6SDU=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -81,7 +81,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			A0FxvzFLyYWeXhK8cUOfscPrLasCqhaZNJhKluYu59k=
+			8/CE+s8YrIvyr2EMm7MB1wpvwF/m4lFyf/192ZqQeqI=
 			</data>
 		</dict>
 		<key>Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
@@ -109,14 +109,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			gHcFcwcr1aAv9W0SVThpQzKZ4iwioor9z8/+tAL9+5Q=
+			C+ZSYS37c1XWrJdfi9CjMAv6kfZ0/nRr3Xsm+jCmWT8=
 			</data>
 		</dict>
 		<key>Modules/FireworkVideoUI.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			A0FxvzFLyYWeXhK8cUOfscPrLasCqhaZNJhKluYu59k=
+			8/CE+s8YrIvyr2EMm7MB1wpvwF/m4lFyf/192ZqQeqI=
 			</data>
 		</dict>
 		<key>Modules/FireworkVideoUI.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
@@ -144,7 +144,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			3LgfAp0SD5Qb24w+Jt+yH3P1gvMKdtH25ZZQHYt25Os=
+			8Nb8KKhfffu+q3nPAgfXOc1Jp/m9uLncYeYthtqbqkE=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>

package/android/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
   // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['FireworkSDK_kotlinVersion']
+  def kotlinVersion = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['FireworkSDK_kotlinVersion']
 
   repositories {
     google()
@@ -9,16 +9,14 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.0.1'
+    classpath("com.android.tools.build:gradle:7.3.1")
     // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
   }
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply from:'publish.gradle'
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['FireworkSDK_' + name]
@@ -28,13 +26,15 @@ def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['FireworkSDK_' + name]).toInteger()
 }
 
+rootProject.ext {
+  fwNativeVersion = getExtOrDefault("fwNativeVersion")
+}
+
 android {
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
   defaultConfig {
-    minSdkVersion 21
+    minSdkVersion getExtOrIntegerDefault('minSdkVersion')
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-    versionCode 1
-    versionName "1.0.0"
   }
 
   // LOG_LEVEL: VERBOSE(2), DEBUG(3), INFO(4), WARN(5), ERROR(6), ASSERT(7)
@@ -58,11 +58,6 @@ android {
     disable 'GradleCompatible'
   }
 
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
-
 }
 
 repositories {
@@ -143,35 +138,10 @@ repositories {
   }
 }
 
-def kotlin_version = getExtOrDefault('kotlinVersion')
-
 dependencies {
   api 'com.facebook.react:react-native:+'
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-
 
-  def fireworkSdkVersion = "6.2.1"
+  def fireworkSdkVersion = getExtOrDefault('fwNativeVersion')
   implementation "com.firework:sdk:$fireworkSdkVersion"
-  implementation "com.firework.external.imageloading:glide:$fireworkSdkVersion"
-  implementation "com.firework.external.livestream:singleHostPlayer:$fireworkSdkVersion"
-  implementation "com.firework.external.livestream:multiHostPlayer:$fireworkSdkVersion"
-
-//  def fireworkSdkVersion = "unspecified"
-//  implementation "firework_sdk_v2:fireworkSdk:$fireworkSdkVersion"
-//  implementation "firework_sdk_v2.external:glideImageLoader:$fireworkSdkVersion"
-//  implementation "firework_sdk_v2.external:singleHostLivestreamPlayer:$fireworkSdkVersion"
-//  implementation "firework_sdk_v2.external:multiHostLivestreamPlayer:$fireworkSdkVersion"
-
-  // 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 {
-  resolutionStrategy {
-    force 'androidx.core:core-ktx:1.6.0'
-    force 'androidx.core:core:1.6.0'
-  }
 }
 

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/android/gradle.properties

@@ -1,6 +1,8 @@
-org.gradle.jvmargs=-Xmx1536M
-android.enableJetifier=true
-FireworkSDK_kotlinVersion=1.5.10
-FireworkSDK_compileSdkVersion=28
-FireworkSDK_targetSdkVersion=28
 android.useAndroidX=true
+android.enableJetifier=true
+org.gradle.jvmargs=-Xmx1536M
+FireworkSDK_kotlinVersion=1.6.10
+FireworkSDK_minSdkVersion=21
+FireworkSDK_compileSdkVersion=33
+FireworkSDK_targetSdkVersion=33
+FireworkSDK_fwNativeVersion=6.3.2

package/android/proguard-rules.pro

@@ -1,31 +1,10 @@
 # Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# By default, the flags in this file are appended to flags specified
+# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
--keep class com.fireworksdk.bridge.** { <fields>; }
--keep class com.fireworksdk.bridge.**
-
-# Firework SDK
--keep public class * extends androidx.lifecycle.ViewModelProvider.Factory
--keep class com.loopnow.fireworklibrary.**
--keepclassmembers public class * extends androidx.lifecycle.ViewModel { public <init>(...); }
--keepclassmembers class com.loopnow.fireworklibrary.** { <fields>; }
--keep class com.google.gson.examples.android.model.** { *; }
--dontoptimize
+# Add any project specific keep options here:

package/android/src/main/AndroidManifest.xml

@@ -4,9 +4,6 @@
   <uses-permission android:name="android.permission.INTERNET" />
 
   <application>
-    <activity
-      android:name="com.fireworksdk.bridge.reactnative.pages.FWContainerActivity"
-      />
 
     <provider
       android:authorities="${applicationId}.fwBridgeProvider"

package/android/src/main/java/com/fireworksdk/bridge/FireworkSDKPackage.kt

@@ -25,7 +25,7 @@ class FireworkSDKPackage : ReactPackage {
     override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
         return listOf(
           FWVideoFeedManager(),
-          FWStoryBlockManager(reactContext),
+          FWStoryBlockManager(),
         )
     }
 }

package/android/src/main/java/com/fireworksdk/bridge/components/base/FWBaseFragment.kt

@@ -0,0 +1,10 @@
+package com.fireworksdk.bridge.components.base
+
+import androidx.fragment.app.Fragment
+
+open class FWBaseFragment : Fragment() {
+
+  open fun removeWhenRecreateActivity(): Boolean {
+    return true
+  }
+}

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

@@ -0,0 +1,157 @@
+package com.fireworksdk.bridge.components.storyblock
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.View.LAYOUT_DIRECTION_LOCALE
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import com.firework.storyblock.FeedLoadListener
+import com.firework.storyblock.FwStoryBlockView
+import com.fireworksdk.bridge.components.base.FWBaseFragment
+import com.fireworksdk.bridge.databinding.FwBridgeStoryBlockBinding
+import com.fireworksdk.bridge.models.FWVideoFeedPropsModel
+import com.fireworksdk.bridge.models.FWVideoFeedPropsModelDeserializer
+import com.fireworksdk.bridge.models.FWVideoFeedPropsModelSerializer
+import com.fireworksdk.bridge.utils.FWCommonUtil
+import com.fireworksdk.bridge.utils.FWConfigUtil
+import com.fireworksdk.bridge.utils.FWLanguageUtil
+import org.json.JSONObject
+
+class StoryBlockFragment : FWBaseFragment() {
+
+  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? = null
+
+  private var isStoryBlockInitializer = false
+  private var storyBlockLayoutParams: FrameLayout.LayoutParams? = null
+
+  private var fwStoryBlockView: FwStoryBlockView? = null
+
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?,
+    savedInstanceState: Bundle?,
+  ): View {
+    _binding = FwBridgeStoryBlockBinding.inflate(inflater)
+
+    val videoFeedPropsModelJsonString  = arguments?.getString(VIDEO_FEED_PROPS_MODEL)
+    videoFeedPropsModelJsonString?.let {
+      val videoFeedPropsModelJsonObject = JSONObject(it)
+      val model = FWVideoFeedPropsModelDeserializer.deserialize(videoFeedPropsModelJsonObject)
+      videoFeedPropsModel = model
+    }
+
+    val right = videoFeedPropsModel?.marginRight
+    if (right != null && right > 0) {
+      val layoutParams = FrameLayout.LayoutParams(
+        ViewGroup.LayoutParams.MATCH_PARENT,
+        ViewGroup.LayoutParams.MATCH_PARENT
+      )
+      layoutParams.setMargins(0, 0, FWCommonUtil.dpToPx(right.toFloat(), requireContext()), 0)
+      binding.storyBlockContainer.layoutParams = layoutParams
+    }
+
+    FWLanguageUtil.getInstance(requireContext()).updateBaseContextLocale(requireContext())
+    binding.storyBlock.layoutDirection = LAYOUT_DIRECTION_LOCALE
+
+    fwStoryBlockView = binding.storyBlock
+    return binding.root
+  }
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    initStoryBlock()
+  }
+
+
+  override fun onDestroyView() {
+    _binding = null
+    super.onDestroyView()
+  }
+
+  private fun initStoryBlock() {
+    val viewOptionsBuilder = FWConfigUtil.generateViewOptionsBuilder(context, videoFeedPropsModel)
+    fwStoryBlockView?.init(
+      childFragmentManager,
+      lifecycle,
+      viewOptionsBuilder.build(),
+      binding.storyBlockContainer,
+    )
+    isStoryBlockInitializer = true
+
+    if (storyBlockLayoutParams != null) {
+      binding.storyBlockContainer.layoutParams = storyBlockLayoutParams
+      binding.root.requestLayout()
+    }
+    // must call it after init()
+    fwStoryBlockView?.setFeedLoadListener(feedLoadListener)
+    fwStoryBlockView?.setOnFullscreenStateChangeListener(fullScreenStateChangeListener)
+  }
+
+  // may be called before onCreateView
+  fun setStoryBlockLayoutParams(l: FrameLayout.LayoutParams?) {
+    l?: return
+    storyBlockLayoutParams = l
+    if (isStoryBlockInitializer) {
+      binding.storyBlockContainer.layoutParams = l
+      binding.root.requestLayout()
+    }
+  }
+
+  // may be called before onCreateView
+  fun setFeedLoadListener(feedLoadListener: FeedLoadListener?) {
+    this.feedLoadListener = feedLoadListener
+    if (isStoryBlockInitializer) {
+      fwStoryBlockView?.setFeedLoadListener(feedLoadListener)
+    }
+  }
+
+  // may be called before onCreateView
+  fun setOnFullScreenStateChangedListener(listener: FwStoryBlockView.OnFullscreenStateChangeListener?) {
+    this.fullScreenStateChangeListener = listener
+    if (isStoryBlockInitializer) {
+      fwStoryBlockView?.setOnFullscreenStateChangeListener(fullScreenStateChangeListener)
+    }
+  }
+
+  fun play() {
+    fwStoryBlockView?.play()
+  }
+
+  fun pause() {
+    fwStoryBlockView?.pause()
+  }
+
+  fun toggleFullScreen() {
+    fwStoryBlockView?.toggleFullscreen()
+  }
+
+  fun isFullScreen(): Boolean {
+    return fwStoryBlockView?.isFullscreen() ?: false
+  }
+
+  fun getStoryBlockView(): FwStoryBlockView? {
+    return fwStoryBlockView
+  }
+
+  companion object {
+    private const val VIDEO_FEED_PROPS_MODEL = "videoFeedPropsModel"
+
+    fun newInstance(
+      videoFeedPropsModel: FWVideoFeedPropsModel?,
+    ): StoryBlockFragment {
+      return StoryBlockFragment().apply {
+        arguments = Bundle().apply {
+          videoFeedPropsModel?.let {
+            putString(VIDEO_FEED_PROPS_MODEL, FWVideoFeedPropsModelSerializer.serialize(it).toString())
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,19 @@
+package com.fireworksdk.bridge.components.storyblock
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.FrameLayout
+import com.fireworksdk.bridge.models.FWVideoFeedPropsModel
+
+class StoryBlockFrameLayout(
+  context: Context,
+  attrs: AttributeSet?
+) : FrameLayout(context, attrs) {
+
+  var storyBlockFragment: StoryBlockFragment? = null
+  var videoFeedPropsModel: FWVideoFeedPropsModel = FWVideoFeedPropsModel()
+
+  constructor(context: Context) : this(context, null)
+
+  fun destroy() {}
+}

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

@@ -3,16 +3,19 @@ package com.fireworksdk.bridge.components.videofeed
 import android.content.Context
 import android.util.AttributeSet
 import android.view.ViewGroup
-import android.widget.RelativeLayout
+import android.widget.FrameLayout
 import com.firework.videofeed.FwVideoFeedView
 import com.fireworksdk.bridge.models.*
+import com.fireworksdk.bridge.models.enums.FWVideoFeedMode
+import com.fireworksdk.bridge.models.enums.FWVideoFeedSource
 import com.fireworksdk.bridge.utils.FWConfigUtil
+import com.fireworksdk.bridge.utils.FWLanguageUtil
 
 
 class FWVideoFeed(
   context: Context,
   attrs: AttributeSet?
-) : RelativeLayout(context, attrs) {
+) : FrameLayout(context, attrs) {
 
   constructor(context: Context) : this(context, null)
 
@@ -20,12 +23,19 @@ class FWVideoFeed(
   var videoFeedPropsModel: FWVideoFeedPropsModel = FWVideoFeedPropsModel()
 
   init {
+    FWLanguageUtil.getInstance(context).updateBaseContextLocale(context)
     videoFeedView.layoutDirection = LAYOUT_DIRECTION_LOCALE
     addView(videoFeedView, LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
   }
 
+  fun setVideoFeedLayoutParams(l: LayoutParams?) {
+    l ?: return
+    videoFeedView.layoutParams = l
+    requestLayout()
+  }
+
   fun afterUpdateTransaction() {
-    val viewOptionsBuilder = FWConfigUtil.generateViewOptionsBuilder(videoFeedPropsModel)
+    val viewOptionsBuilder = FWConfigUtil.generateViewOptionsBuilder(context, videoFeedPropsModel)
     videoFeedView.init(viewOptionsBuilder.build())
   }
 
@@ -37,7 +47,7 @@ class FWVideoFeed(
 
   fun setSourceProps(source: String?) {
     videoFeedPropsModel = videoFeedPropsModel.copy(
-      source = source
+      source = if (!source.isNullOrBlank()) FWVideoFeedSource.deserialize(source) else null
     )
   }
 
@@ -67,7 +77,7 @@ class FWVideoFeed(
 
   fun setModeProps(mode: String?) {
     videoFeedPropsModel = videoFeedPropsModel.copy(
-      mode = mode
+      mode = if (!mode.isNullOrBlank()) FWVideoFeedMode.deserialize(mode) else null
     )
   }
 

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

@@ -1,11 +1,10 @@
 package com.fireworksdk.bridge.models
 
-import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import com.fireworksdk.bridge.models.enums.FWBadgeTextType
 
-@Parcelize
 data class FWAdBadgeConfigModel(
-  var badgeTextType: String? = null,
-  var backgroundColor: String? = null,
-  var textColor: String? = null,
-) : Parcelable
+  val badgeTextType: FWBadgeTextType? = null,
+  val backgroundColor: String? = null,
+  val textColor: String? = null,
+  val fontInfo: FWFontInfoModel? = null,
+)

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

@@ -1,5 +1,6 @@
 package com.fireworksdk.bridge.models
 
+import com.fireworksdk.bridge.models.enums.FWBadgeTextType
 import org.json.JSONObject
 
 object FWAdBadgeConfigModelDeserializer {
@@ -7,6 +8,7 @@ object FWAdBadgeConfigModelDeserializer {
   private const val BADGE_TEXT_TYPE_KEY = "badgeTextType"
   private const val BACKGROUND_COLOR_KEY = "backgroundColor"
   private const val TEXT_COLOR_KEY = "textColor"
+  private const val FONT_INFO_KEY = "androidFontInfo"
 
   fun deserialize(responseJson: JSONObject?): FWAdBadgeConfigModel? {
     responseJson ?: return null
@@ -14,11 +16,13 @@ object FWAdBadgeConfigModelDeserializer {
     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
+    val fontInfo = FWFontInfoModelDeserializer.deserialize(responseJson.optJSONObject(FONT_INFO_KEY))
 
     return FWAdBadgeConfigModel(
-      badgeTextType = badgeTextType,
+      badgeTextType = if (!badgeTextType.isNullOrBlank()) FWBadgeTextType.deserialize(badgeTextType) else null,
       backgroundColor = backgroundColor,
       textColor = textColor,
+      fontInfo = fontInfo,
     )
   }
 }