@wscsports/blaze-rtn-sdk 1.1.1 → 1.2.2

package/android/build.gradle

@@ -78,7 +78,7 @@ dependencies {
     // noinspection GradleDynamicVersion
     api 'com.facebook.react:react-native:+'
 
-    def blazeSDK = '1.2.13'
+    def blazeSDK = '1.9.3'
     implementation group: "com.blaze", name: "blazesdk", version: "${blazeSDK}"
 
     // Gson.

package/android/src/main/java/com/blaze/rtnblazesdk/BlazeSdkModule.kt

@@ -12,8 +12,6 @@ import com.blaze.blazesdk.features.shared.models.ui_shared.BlazeLinkActionHandle
 import com.blaze.blazesdk.prefetch.models.BlazeCachingLevel
 import com.blaze.blazesdk.shared.BlazeSDK
 import com.blaze.blazesdk.shared.results.BlazeResult
-import com.blaze.blazesdk.style.players.moments.BlazeMomentsPlayerStyle
-import com.blaze.blazesdk.style.players.stories.BlazeStoryPlayerStyle
 import com.blaze.rtnblazesdk.events.SdkModuleJsEvent
 import com.blaze.rtnblazesdk.utils.extractCachingLevel
 import com.blaze.rtnblazesdk.utils.extractDataSource
@@ -21,12 +19,21 @@ import com.blaze.rtnblazesdk.utils.extractMomentsPlayerStyle
 import com.blaze.rtnblazesdk.utils.extractStoriesPlayerStyle
 import com.blaze.rtnblazesdk.utils.handleResult
 import com.blaze.rtnblazesdk.utils.rejectWith
+import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.NoSuchKeyException
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
+import javax.annotation.Nonnull
 
-class BlazeSdkModule(private val context: ReactApplicationContext): NativeBlazeSdkSpec(context) {
+class BlazeSdkModule(private val context: ReactApplicationContext): ReactContextBaseJavaModule(context) {
+
+    @Nonnull
+    override fun getName(): String {
+        return NAME
+    }
 
     private val reactNativeSDKHelper = BlazeReactSDKHelper()
     private var appOverridesCTAHandling: Boolean = false
@@ -113,7 +120,9 @@ class BlazeSdkModule(private val context: ReactApplicationContext): NativeBlazeS
         BlazeExternalModulesBinder.reactNativeSDKHelper = reactNativeSDKHelper
     }
 
-    override fun init(options: ReadableMap, promise: Promise) {
+    @ReactMethod
+    @DoNotStrip
+    fun init(options: ReadableMap, promise: Promise) {
 
         try {
             setAppOverrideCtaHandling(options)
@@ -169,7 +178,9 @@ class BlazeSdkModule(private val context: ReactApplicationContext): NativeBlazeS
         context.emitDeviceEvent(event.eventName, event.params)
     }
 
-    override fun playStory(options: ReadableMap, promise: Promise) {
+    @ReactMethod
+    @DoNotStrip
+    fun playStory(options: ReadableMap, promise: Promise) {
         try {
             val storyId = options.getString(KEY_STORY_OPT_STORY_ID) ?: run {
                 promise.rejectWith("no story id")
@@ -191,7 +202,9 @@ class BlazeSdkModule(private val context: ReactApplicationContext): NativeBlazeS
         }
     }
 
-    override fun playMoment(options: ReadableMap, promise: Promise) {
+    @ReactMethod
+    @DoNotStrip
+    fun playMoment(options: ReadableMap, promise: Promise) {
 
         try {
             val momentId = options.getString(KEY_STORY_OPT_MOMENT_ID) ?: run {
@@ -211,7 +224,9 @@ class BlazeSdkModule(private val context: ReactApplicationContext): NativeBlazeS
         }
     }
 
-    override fun prepareStories(options: ReadableMap, promise: Promise) {
+    @ReactMethod
+    @DoNotStrip
+    fun prepareStories(options: ReadableMap, promise: Promise) {
         try {
             val dataSource = options.getMap(KEY_ENTRY_POINT_DATA_SOURCE)?.extractDataSource() ?: run {
                 promise.rejectWith("Error parsing data source for prepareStories")
@@ -226,7 +241,9 @@ class BlazeSdkModule(private val context: ReactApplicationContext): NativeBlazeS
 
     }
 
-    override fun prepareMoments(options: ReadableMap, promise: Promise) {
+    @ReactMethod
+    @DoNotStrip
+    fun prepareMoments(options: ReadableMap, promise: Promise) {
         try {
             val dataSource = options.getMap(KEY_ENTRY_POINT_DATA_SOURCE)?.extractDataSource() ?: run {
                 promise.rejectWith("Error parsing data source for prepareMoments")
@@ -240,28 +257,37 @@ class BlazeSdkModule(private val context: ReactApplicationContext): NativeBlazeS
         }
     }
 
-
-    override fun dismissPlayer(promise: Promise) {
+    @ReactMethod
+    @DoNotStrip
+    fun dismissPlayer(promise: Promise) {
         BlazeSDK.dismissCurrentPlayer()
         promise.resolve(true)
     }
 
-    override fun isInitialized(): Boolean {
+    @DoNotStrip
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    fun isInitialized(): Boolean {
         return BlazeSDK.isInitialized()
     }
 
-    override fun setExternalUserId(externalUserId: String?, promise: Promise) {
+    @ReactMethod
+    @DoNotStrip
+    fun setExternalUserId(externalUserId: String?, promise: Promise) {
         BlazeSDK.setExternalUserId(externalUserId) { result ->
             promise.handleResult(result)
         }
     }
 
-    override fun setDoNotTrack(doNotTrack: Boolean, promise: Promise) {
+    @ReactMethod
+    @DoNotStrip
+    fun setDoNotTrack(doNotTrack: Boolean, promise: Promise) {
         BlazeSDK.setDoNotTrack(doNotTrack)
         promise.resolve(doNotTrack)
     }
 
-    override fun playStories(options: ReadableMap, promise: Promise) {
+    @ReactMethod
+    @DoNotStrip
+    fun playStories(options: ReadableMap, promise: Promise) {
         try {
             val dataSource = options.getMap(KEY_ENTRY_POINT_DATA_SOURCE)?.extractDataSource() ?: run {
                 promise.rejectWith("Error parsing data source for playStories")
@@ -280,7 +306,9 @@ class BlazeSdkModule(private val context: ReactApplicationContext): NativeBlazeS
         }
     }
 
-    override fun playMoments(options: ReadableMap, promise: Promise) {
+    @ReactMethod
+    @DoNotStrip
+    fun playMoments(options: ReadableMap, promise: Promise) {
         try {
             val dataSource = options.getMap(KEY_ENTRY_POINT_DATA_SOURCE)?.extractDataSource() ?: run {
                 promise.rejectWith("Error parsing data source for playMoments")
@@ -299,7 +327,9 @@ class BlazeSdkModule(private val context: ReactApplicationContext): NativeBlazeS
         }
     }
 
-    override fun handleUniversalLink(link: String, promise: Promise) {
+    @ReactMethod
+    @DoNotStrip
+    fun handleUniversalLink(link: String, promise: Promise) {
         try {
             BlazeSDK.handleUniversalLink(link){ result ->
                 promise.handleResult(result)
@@ -309,7 +339,9 @@ class BlazeSdkModule(private val context: ReactApplicationContext): NativeBlazeS
         }
     }
 
-    override fun canHandleUniversalLink(link: String, promise: Promise) {
+    @ReactMethod
+    @DoNotStrip
+    fun canHandleUniversalLink(link: String, promise: Promise) {
         try {
             val canHandle = BlazeSDK.canHandleUniversalLink(link)
             promise.resolve(canHandle)
@@ -318,7 +350,9 @@ class BlazeSdkModule(private val context: ReactApplicationContext): NativeBlazeS
         }
     }
 
-    override fun updateGeoRestriction(geoLocation: String?, promise: Promise) {
+    @ReactMethod
+    @DoNotStrip
+    fun updateGeoRestriction(geoLocation: String?, promise: Promise) {
         val updatedGeoLocation = if (geoLocation.isNullOrEmpty()) null else geoLocation
         try {
             BlazeSDK.updateGeoRestriction(updatedGeoLocation){ result ->
@@ -329,7 +363,9 @@ class BlazeSdkModule(private val context: ReactApplicationContext): NativeBlazeS
         }
     }
 
-    override fun canHandlePushNotification(payload: ReadableMap, promise: Promise) {
+    @ReactMethod
+    @DoNotStrip
+    fun canHandlePushNotification(payload: ReadableMap, promise: Promise) {
         try {
             // This is needed for now since the Android SDK requires <String, String>. Remove if it changes.
             val hashMap = payload.toHashMap() as HashMap<String, String>
@@ -340,7 +376,9 @@ class BlazeSdkModule(private val context: ReactApplicationContext): NativeBlazeS
         }
     }
 
-    override fun handleNotificationPayload(payload: ReadableMap, promise: Promise) {
+    @ReactMethod
+    @DoNotStrip
+    fun handleNotificationPayload(payload: ReadableMap, promise: Promise) {
         try {
             // This is needed for now since the Android SDK requires <String, String>. Remove if it changes.
             val hashMap = payload.toHashMap() as HashMap<String, String>
@@ -353,6 +391,8 @@ class BlazeSdkModule(private val context: ReactApplicationContext): NativeBlazeS
     }
 
     companion object {
+        const val NAME = "RTNBlazeSdk"
+
         val TAG: String = BlazeSdkModule::class.java.simpleName
 
         const val KEY_INIT_API_KEY = "apiKey"

package/android/src/main/java/com/blaze/rtnblazesdk/BlazeSdkPackage.kt

@@ -1,5 +1,9 @@
 package com.blaze.rtnblazesdk
 
+import com.blaze.rtnblazesdk.moments.BlazeMomentsGridViewManager
+import com.blaze.rtnblazesdk.moments.BlazeMomentsRowViewManager
+import com.blaze.rtnblazesdk.stories.BlazeStoriesGridViewManager
+import com.blaze.rtnblazesdk.stories.BlazeStoriesRowViewManager
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext

package/android/src/main/java/com/blaze/rtnblazesdk/base/BaseWidgetView.kt

@@ -13,12 +13,10 @@ import com.blaze.blazesdk.delegates.models.BlazePlayerType
 import com.blaze.blazesdk.extentions.blazeDeepCopy
 import com.blaze.blazesdk.features.shared.models.ui_shared.BlazeLinkActionHandleType
 import com.blaze.blazesdk.prefetch.models.BlazeCachingLevel
-import com.blaze.blazesdk.shared.BlazeSDK
 import com.blaze.blazesdk.shared.results.BlazeResult
 import com.blaze.blazesdk.style.widgets.BlazeWidgetItemCustomMapping
 import com.blaze.blazesdk.style.widgets.BlazeWidgetItemStyleOverrides
 import com.blaze.blazesdk.style.widgets.BlazeWidgetLayout
-import com.blaze.rtnblazesdk.BlazeSdkModule
 import com.blaze.rtnblazesdk.BlazeSdkModuleRepo
 import com.blaze.rtnblazesdk.customization.BlazeReactWidgetItemCustomMapping
 import com.blaze.rtnblazesdk.customization.BlazeReactWidgetItemStyleOverrides
@@ -27,6 +25,7 @@ import com.blaze.rtnblazesdk.events.BaseEvent
 import com.blaze.rtnblazesdk.events.WidgetCTAClickEvent
 import com.blaze.rtnblazesdk.events.WidgetDataLoadCompletedEvent
 import com.blaze.rtnblazesdk.events.WidgetDataLoadStartedEvent
+import com.blaze.rtnblazesdk.events.WidgetHeightChangedEvent
 import com.blaze.rtnblazesdk.events.WidgetItemClickedEvent
 import com.blaze.rtnblazesdk.events.WidgetOnPlayerEventTriggered
 import com.blaze.rtnblazesdk.events.WidgetOnTriggerPlayerBodyTextLinkEvent
@@ -188,6 +187,16 @@ abstract class BaseWidgetView @JvmOverloads constructor(
     abstract fun updateWidgetsUi()
     abstract fun play()
 
+    override fun onHeightChanged(height: Int) {
+        dispatchEvent(
+            WidgetHeightChangedEvent(
+                UIManagerHelper.getSurfaceId(context),
+                id,
+                newHeight = height,
+            )
+        )
+    }
+
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         createWidgetAndAddToParent()
@@ -233,13 +242,11 @@ abstract class BaseWidgetView @JvmOverloads constructor(
     }
 
     fun updateDataSourceFromArgs(args: ReadableArray) {
-        if (args.isNotEmpty()) {
-            val dataSourceMap = args.getMap(ARG_INDEX_DATA_SOURCE_MAP)
-            dataSourceMap.extractDataSource()?.let { sourceType ->
-                dataSourceType = sourceType
-                val isSilentRefresh = args.getBooleanOrNull(ARG_INDEX_UPDATE_DATA_SOURCE_IS_SILENT_REFRESH) ?: false
-                updateWidgetDataSource(sourceType = sourceType, isSilentRefresh = isSilentRefresh)
-            }
+        val dataSourceMap = args.getMap(ARG_INDEX_DATA_SOURCE_MAP) ?: return
+        dataSourceMap.extractDataSource()?.let { sourceType ->
+            dataSourceType = sourceType
+            val isSilentRefresh = args.getBooleanOrNull(ARG_INDEX_UPDATE_DATA_SOURCE_IS_SILENT_REFRESH) ?: false
+            updateWidgetDataSource(sourceType = sourceType, isSilentRefresh = isSilentRefresh)
         }
     }
 
@@ -266,12 +273,7 @@ abstract class BaseWidgetView @JvmOverloads constructor(
     }
 
     fun onPropsUpdate(props: ReactStylesDiffMap) {
-        // The widget will be non-null when the props are changing while the widget already exists and initialized.
-        // So make sure to update it again then reloadData with shimmer.
-        dataSourceType?.let {
-            callInitWidget(it)
-            reloadData(false)
-        }
+        // Currently we don't do anything here.
     }
 
     protected fun dispatchEvent(e: BaseEvent<*>) {
@@ -306,7 +308,7 @@ abstract class BaseWidgetView @JvmOverloads constructor(
 
         val customizationMap = rawLayout.toHashMap().mapNotNull { (key, value) ->
             val keyObj =  key.fromJsonString<BlazeReactWidgetItemCustomMapping>()
-            val valueObj = value.toObject<BlazeReactWidgetItemStyleOverrides>()
+            val valueObj = value?.toObject<BlazeReactWidgetItemStyleOverrides>()
             if (keyObj != null && valueObj != null) {
                 keyObj to valueObj
             } else {

package/android/src/main/java/com/blaze/rtnblazesdk/base/BlazeReactSizeFixingView.kt

@@ -5,8 +5,7 @@ import android.util.AttributeSet
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.uimanager.UIManagerModule
+import com.blaze.rtnblazesdk.extensions.convertPixelsToDp
 
 abstract class BlazeReactSizeFixingFrameLayout @JvmOverloads constructor(
         context: Context,
@@ -48,7 +47,7 @@ abstract class BlazeReactSizeFixingFrameLayout @JvmOverloads constructor(
 
         currentHeight = measuredHeight
 
-        updateGridShadowLayoutHeight(height = measuredHeight)
+        updateHeight(height = measuredHeight)
         disableNestedScrolling(this) // disable nested scrolling
     }
 
@@ -74,26 +73,20 @@ abstract class BlazeReactSizeFixingFrameLayout @JvmOverloads constructor(
         }
     }
 
+    abstract fun onHeightChanged(height: Int)
+
     /**
-     * All native views are backed by a ReactShadowNode in React Native -
-     * which is an wrapper view that is measured based on the native view.
      *
      * For grid views, we need to calculate their height manually
-     * and send the value to the React Native UI Manager -
+     * and send the value to the React Native side -
      * because they have dynamic data and therefore dynamic height.
      *
      * React Native can then measure the backing view correctly.
      *
      * @see <a href="https://github.com/facebook/react-native/blob/main/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java#L133">createShadowNodeInstance</a>
      */
-    private fun updateGridShadowLayoutHeight(height: Int) {
-        val reactContext = context as ReactContext
-        reactContext.runOnNativeModulesQueueThread {
-            val uiManager = reactContext.getNativeModule(UIManagerModule::class.java) ?: return@runOnNativeModulesQueueThread
-            reactContext.runOnUiQueueThread {
-                uiManager.setViewLocalData(id, height) //dispatch height data to shadow node
-                requestLayout()
-            }
-        }
+    private fun updateHeight(height: Int) {
+        val dpHeight = context.convertPixelsToDp(height).toInt()
+        onHeightChanged(dpHeight)
     }
-}
+}

package/android/src/main/java/com/blaze/rtnblazesdk/base/BlazeWidgetViewManager.kt

@@ -0,0 +1,149 @@
+package com.blaze.rtnblazesdk.base
+
+import androidx.annotation.Keep
+import com.blaze.rtnblazesdk.events.WidgetCTAClickEvent
+import com.blaze.rtnblazesdk.events.WidgetDataLoadCompletedEvent
+import com.blaze.rtnblazesdk.events.WidgetDataLoadStartedEvent
+import com.blaze.rtnblazesdk.events.WidgetHeightChangedEvent
+import com.blaze.rtnblazesdk.events.WidgetItemClickedEvent
+import com.blaze.rtnblazesdk.events.WidgetOnPlayerEventTriggered
+import com.blaze.rtnblazesdk.events.WidgetOnTriggerPlayerBodyTextLinkEvent
+import com.blaze.rtnblazesdk.events.WidgetPlayerDidAppearEvent
+import com.blaze.rtnblazesdk.events.WidgetPlayerDismissedEvent
+import com.blaze.rtnblazesdk.stories.BlazeStoriesGridView
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.uimanager.ReactStylesDiffMap
+import com.facebook.react.uimanager.SimpleViewManager
+import com.facebook.react.uimanager.annotations.ReactProp
+
+abstract class BlazeWidgetViewManager<TWidget : BaseWidgetView>(
+    context: ReactApplicationContext?,
+) : SimpleViewManager<TWidget>() {
+
+    override fun receiveCommand(view: TWidget, commandId: Int, args: ReadableArray?) {
+        when (commandId) {
+            COMMAND_RELOAD_DATA_ID -> args?.let { view.getIsSilentRefreshAndReloadData(it) }
+            COMMAND_UPDATE_DATA_SOURCE_ID -> args?.let { view.updateDataSourceFromArgs(it) }
+            COMMAND_PLAY_WIDGET_ID -> view.play()
+            COMMAND_UPDATE_OVERRIDE_STYLES_ID -> args?.let { view.updateOverrideStylesFromArgs(it) }
+            COMMAND_UPDATE_WIDGETS_UI_ID -> view.updateWidgetsUi()
+        }
+    }
+
+    override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {
+        val map: Map<String, Any> = mapOf(
+            WidgetDataLoadStartedEvent.EVENT_NAME to mapOf(Pair(KEY_EVENT_REGISTRATION_NAME, "onWidgetDataLoadStartedInternal")),
+            WidgetDataLoadCompletedEvent.EVENT_NAME to mapOf(Pair(KEY_EVENT_REGISTRATION_NAME, "onWidgetDataLoadCompletedInternal")),
+            WidgetPlayerDidAppearEvent.EVENT_NAME to mapOf(Pair(KEY_EVENT_REGISTRATION_NAME, "onWidgetPlayerDidAppearInternal")),
+            WidgetPlayerDismissedEvent.EVENT_NAME to mapOf(Pair(KEY_EVENT_REGISTRATION_NAME, "onWidgetPlayerDismissedInternal")),
+            WidgetItemClickedEvent.EVENT_NAME to mapOf(Pair(KEY_EVENT_REGISTRATION_NAME, "onItemClickedInternal")),
+            WidgetCTAClickEvent.EVENT_NAME to mapOf(Pair(KEY_EVENT_REGISTRATION_NAME, "onTriggerCTAInternal")),
+            WidgetOnTriggerPlayerBodyTextLinkEvent.EVENT_NAME to mapOf(Pair(KEY_EVENT_REGISTRATION_NAME, "onTriggerPlayerBodyTextLinkInternal")),
+            WidgetOnPlayerEventTriggered.EVENT_NAME to mapOf(Pair(KEY_EVENT_REGISTRATION_NAME, "onPlayerEventTriggeredInternal")),
+            WidgetHeightChangedEvent.EVENT_NAME to mapOf(Pair(KEY_EVENT_REGISTRATION_NAME, "onHeightChangedInternal")),
+        )
+        return map
+    }
+
+    companion object {
+        const val COMMAND_RELOAD_DATA = "reloadData"
+        const val COMMAND_UPDATE_DATA_SOURCE = "updateDataSource"
+        const val COMMAND_PLAY_WIDGET = "play"
+        const val KEY_EVENT_REGISTRATION_NAME = "registrationName"
+        const val COMMAND_UPDATE_OVERRIDE_STYLES = "updateOverrideStyles"
+        const val COMMAND_UPDATE_WIDGETS_UI = "updateWidgetsUi"
+
+        //COMMAND IDs
+        const val COMMAND_RELOAD_DATA_ID = 0
+        const val COMMAND_UPDATE_DATA_SOURCE_ID = 1
+        const val COMMAND_PLAY_WIDGET_ID = 2
+        const val COMMAND_UPDATE_OVERRIDE_STYLES_ID = 3
+        const val COMMAND_UPDATE_WIDGETS_UI_ID = 4
+    }
+
+    override fun getCommandsMap(): MutableMap<String, Int> {
+        return mutableMapOf(
+            COMMAND_RELOAD_DATA to COMMAND_RELOAD_DATA_ID,
+            COMMAND_UPDATE_DATA_SOURCE to COMMAND_UPDATE_DATA_SOURCE_ID,
+            COMMAND_PLAY_WIDGET to COMMAND_PLAY_WIDGET_ID,
+            COMMAND_UPDATE_OVERRIDE_STYLES to COMMAND_UPDATE_OVERRIDE_STYLES_ID,
+            COMMAND_UPDATE_WIDGETS_UI to COMMAND_UPDATE_WIDGETS_UI_ID,
+        )
+    }
+
+    override fun updateProperties(viewToUpdate: TWidget, props: ReactStylesDiffMap) {
+        super.updateProperties(viewToUpdate, props)
+        viewToUpdate.onPropsUpdate(props)
+    }
+
+    //---------- Shared props ----------//
+
+    @Keep
+    @ReactProp(name = "dataSource")
+    fun setDataSource(view: TWidget, value: ReadableMap?) {
+        view.setDataSourceTypeFromMap(value)
+    }
+
+    @Keep
+    @ReactProp(name = "presetWidgetLayout")
+    fun setPresetWidgetLayout(view: TWidget, value: String?) {
+        view.presetWidgetLayoutString = value
+    }
+
+    @Keep
+    @ReactProp(name = "appOverridesCTAHandling")
+    fun setAppOverridesCTAHandling(view: TWidget, value: Boolean) {
+        view.appOverridesCTAHandling = value
+    }
+
+    @Keep
+    @ReactProp(name = "blazeWidgetLayout")
+    fun setBlazeWidgetLayout(view: TWidget, value: ReadableMap?) {
+        view.reactWidgetLayoutStyleMap = value
+    }
+
+    @Keep
+    @ReactProp(name = "shouldOrderWidgetByReadStatus")
+    fun setShouldOrderWidgetByReadStatus(view: TWidget, value: Boolean) {
+        view.shouldOrderWidgetByReadStatus = value
+    }
+
+    @Keep
+    @ReactProp(name = "perItemStyleOverridesInternal")
+    fun setPerItemStyleOverrides(view: TWidget, value: ReadableMap?) {
+        view.perItemStyleOverridesReadableMap = value
+    }
+
+    @Keep
+    @ReactProp(name = "cachingLevel")
+    fun setCachingLevel(view: TWidget, value: String?) {
+        view.reactCachingLevel = value
+    }
+
+    //---------- Props for Grids ----------//
+
+    @Keep
+    @ReactProp(name = "isEmbeddedInScrollView")
+    fun setIsEmbeddedInScrollView(view: TWidget, value: Boolean) {
+        view.isEmbeddedInScrollView = value
+    }
+
+    //---------- Props for Moment widget ----------//
+
+    @Keep
+    @ReactProp(name = "blazeMomentsPlayerStyle")
+    fun setBlazeMomentsPlayerStyle(view: TWidget, value: ReadableMap?) {
+        view.reactWidgetPlayerStyleMap = value
+    }
+
+    //---------- Props for Story widget ----------//
+
+    @Keep
+    @ReactProp(name = "blazeStoryPlayerStyle")
+    fun setBlazeStoryPlayerStyle(view: TWidget, value: ReadableMap?) {
+        view.reactWidgetPlayerStyleMap = value
+    }
+
+}

package/android/src/main/java/com/blaze/rtnblazesdk/customization/BlazeReactLayoutMerger.kt

@@ -11,6 +11,7 @@ import BlazeReactWidgetItemBadgeStyle
 import BlazeReactWidgetItemImageAnimatedThumbnailStyle
 import BlazeReactWidgetItemImageContainerBorderStateStyle
 import BlazeReactWidgetItemImageContainerBorderStyle
+import BlazeReactWidgetItemImageGradientOverlayStyle
 import BlazeReactWidgetItemImagePosition
 import BlazeReactWidgetItemImageStyle
 import BlazeReactWidgetItemStatusIndicatorStateStyle
@@ -28,6 +29,7 @@ import com.blaze.blazesdk.style.widgets.BlazeWidgetItemBadgeStyle
 import com.blaze.blazesdk.style.widgets.BlazeWidgetItemImageAnimatedThumbnailStyle
 import com.blaze.blazesdk.style.widgets.BlazeWidgetItemImageContainerBorderStateStyle
 import com.blaze.blazesdk.style.widgets.BlazeWidgetItemImageContainerBorderStyle
+import com.blaze.blazesdk.style.widgets.BlazeWidgetItemImageGradientOverlayStyle
 import com.blaze.blazesdk.style.widgets.BlazeWidgetItemImageStyle
 import com.blaze.blazesdk.style.widgets.BlazeWidgetItemStatusIndicatorStateStyle
 import com.blaze.blazesdk.style.widgets.BlazeWidgetItemStatusIndicatorStyle
@@ -36,7 +38,6 @@ import com.blaze.blazesdk.style.widgets.BlazeWidgetItemTextStyle
 import com.blaze.blazesdk.style.widgets.BlazeWidgetItemTitleStyle
 import com.blaze.blazesdk.style.widgets.BlazeWidgetLayout
 
-
 fun BlazeWidgetLayout.mergedWith(
     customization: BlazeReactWidgetLayout?,
     context: Context
@@ -53,7 +54,6 @@ fun BlazeWidgetLayout.mergedWith(
     merged.maxDisplayItemsCount = customization.maxDisplayItemsCount ?: merged.maxDisplayItemsCount
     merged.widgetItemStyle =
         this.widgetItemStyle.mergedWith(customization.widgetItemStyle, context)
-    merged.isScrollEnabled = customization.isScrollEnabled ?: merged.isScrollEnabled
     merged.margins = this.margins.mergedWith(customization.margins)
     return merged
 }
@@ -255,9 +255,34 @@ fun BlazeWidgetItemImageStyle.mergedWith(customization: BlazeReactWidgetItemImag
     customization.thumbnailType?.let { merged.thumbnailType = it.mapToBlazeEnumClass() }
     merged.margins = this.margins.mergedWith(customization.margins)
     merged.animatedThumbnail = this.animatedThumbnail.mergedWith(customization.animatedThumbnail)
+    merged.gradientOverlay = this.gradientOverlay.mergedWith(customization.gradientOverlay)
+
+    return merged
+}
+
+fun BlazeWidgetItemImageGradientOverlayStyle.mergedWith(customization: BlazeReactWidgetItemImageGradientOverlayStyle?): BlazeWidgetItemImageGradientOverlayStyle {
+    customization ?: return this
+
+    val merged = this
+    merged.isVisible = customization.isVisible ?: merged.isVisible
+    merged.position = merged.position.mergedWith(customization.position)
+
+    // We switch between startColor and endColor to match the iOS implementation.
+    // If this is aligned on future Android version we must switch them back!
+    merged.startColor = safeParseColor(customization.endColor) ?: merged.startColor
+    merged.endColor = safeParseColor(customization.startColor) ?: merged.endColor
+
     return merged
 }
 
+fun BlazeWidgetItemImageGradientOverlayStyle.BlazeGradientPosition.mergedWith(
+    customization: BlazeReactWidgetItemImageGradientOverlayStyle.Position?
+): BlazeWidgetItemImageGradientOverlayStyle.BlazeGradientPosition {
+    customization ?: return this
+
+    return customization.mapToBlazeEnumClass()
+}
+
 fun BlazeWidgetItemImageAnimatedThumbnailStyle.mergedWith(customization: BlazeReactWidgetItemImageAnimatedThumbnailStyle?): BlazeWidgetItemImageAnimatedThumbnailStyle {
     customization ?: return this
 

package/android/src/main/java/com/blaze/rtnblazesdk/customization/BlazeReactWidgetLayout.kt

@@ -2,6 +2,7 @@ import android.view.Gravity
 import androidx.annotation.Keep
 import com.blaze.blazesdk.style.shared.models.BlazeObjectXPosition
 import com.blaze.blazesdk.style.shared.models.BlazeObjectYPosition
+import com.blaze.blazesdk.style.widgets.BlazeWidgetItemImageGradientOverlayStyle
 import com.blaze.blazesdk.style.widgets.BlazeWidgetItemImageStyle
 import com.blaze.rtnblazesdk.customization.BlazeEnumMapper
 
@@ -73,9 +74,31 @@ data class BlazeReactWidgetItemImageStyle(
     val border: BlazeReactWidgetItemImageContainerBorderStyle?,
     val thumbnailType: BlazeReactThumbnailType?,
     val margins: BlazeReactMargins?,
-    val animatedThumbnail: BlazeReactWidgetItemImageAnimatedThumbnailStyle?
+    val animatedThumbnail: BlazeReactWidgetItemImageAnimatedThumbnailStyle?,
+    val gradientOverlay: BlazeReactWidgetItemImageGradientOverlayStyle?
 )
 
+@Keep
+data class BlazeReactWidgetItemImageGradientOverlayStyle(
+    val isVisible: Boolean?,
+    val position: Position?,
+    val startColor: String?,
+    val endColor: String?
+) {
+    @Keep
+    enum class Position(override val rawValue: String) : BlazeEnumMapper<BlazeWidgetItemImageGradientOverlayStyle.BlazeGradientPosition> {
+        TOP("Top") {
+            override fun mapToBlazeEnumClass() = BlazeWidgetItemImageGradientOverlayStyle.BlazeGradientPosition.TOP
+        },
+        CENTER("Center") {
+            override fun mapToBlazeEnumClass() = BlazeWidgetItemImageGradientOverlayStyle.BlazeGradientPosition.CENTER
+        },
+        Bottom("Bottom") {
+            override fun mapToBlazeEnumClass() = BlazeWidgetItemImageGradientOverlayStyle.BlazeGradientPosition.BOTTOM
+        },
+    }
+}
+
 @Keep
 data class BlazeReactWidgetItemImageContainerBorderStyle(
     val isVisible: Boolean?,
@@ -255,6 +278,5 @@ data class BlazeReactWidgetLayout(
     val columns: Int?,
     val maxDisplayItemsCount: Int?,
     val widgetItemStyle: BlazeReactWidgetItemStyle?,
-    val margins: BlazeReactMargins?,
-    val isScrollEnabled: Boolean?
+    val margins: BlazeReactMargins?
 )

package/android/src/main/java/com/blaze/rtnblazesdk/events/SdkModuleJsEvent.kt

@@ -153,6 +153,7 @@ sealed interface SdkModuleJsEvent {
         return when (this) {
             BlazePlayerType.MOMENTS -> "Moments"
             BlazePlayerType.STORIES -> "Stories"
+            BlazePlayerType.VIDEOS ->  "Videos"
         }
     }
 

package/android/src/main/java/com/blaze/rtnblazesdk/events/WidgetHeightChangedEvent.kt

@@ -0,0 +1,25 @@
+package com.blaze.rtnblazesdk.events
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+
+class WidgetHeightChangedEvent(
+    surfaceId: Int,
+    viewTag: Int,
+    val newHeight: Int,
+) : BaseEvent<WidgetHeightChangedEvent>(surfaceId, viewTag) {
+    companion object {
+        // The name just needs to be unique, the way it's called on the React side is defined elsewhere.
+        const val EVENT_NAME = "Blaze.WidgetHeightChangedEvent"
+    }
+
+    override fun getEventName(): String {
+        return EVENT_NAME
+    }
+
+    override fun getEventData(): WritableMap? {
+        val params = Arguments.createMap()
+        params.putInt("newHeight", newHeight)
+        return params
+    }
+}

package/android/src/main/java/com/blaze/rtnblazesdk/extensions/ContextExtensions.kt

@@ -0,0 +1,19 @@
+package com.blaze.rtnblazesdk.extensions
+
+import android.content.Context
+import kotlin.math.roundToInt
+
+internal fun Context.convertDpToPx(dp: Int): Int {
+    val screenPixelDensity = resources.displayMetrics.density
+    return (dp * screenPixelDensity).roundToInt()
+}
+
+internal fun Context.convertDpToPx(dp: Float): Float {
+    val screenPixelDensity = resources.displayMetrics.density
+    return (dp * screenPixelDensity)
+}
+
+internal fun Context.convertPixelsToDp(pixels: Int): Float {
+    val screenPixelDensity = resources.displayMetrics.density
+    return (pixels / screenPixelDensity)
+}