@wscsports/blaze-rtn-sdk 1.2.2 → 1.4.4

package/android/build.gradle

@@ -1,11 +1,20 @@
 // android/build.gradle
 
 buildscript {
+    ext {
+        blaze_default_targetSdkVersion = 35
+        blaze_default_compileSdkVersion = 35
+        blaze_default_minSdkVersion = 24
+        blaze_default_kotlin_version = '2.0.21'
+        blazesdk_version = '1.10.3'
+        blaze_gson_version = '2.10.1'
+    }
+
     ext.safeExtGet = { prop, fallback ->
         rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
     }
 
-    ext.blaze_kotlin_version = safeExtGet('kotlinVersion', '1.7.20')
+    ext.blaze_kotlin_version = safeExtGet('kotlinVersion', blaze_default_kotlin_version)
 
     repositories {
         google()
@@ -22,7 +31,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 34)
+    compileSdkVersion safeExtGet('compileSdkVersion', blaze_default_compileSdkVersion)
     namespace "com.blaze.rtnblazesdk"
 
     def versionJsonFile = file('../package.json')
@@ -30,8 +39,8 @@ android {
     def packageVersion = versionJson.version
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 24)
-        targetSdkVersion safeExtGet('targetSdkVersion', 34)
+        minSdkVersion safeExtGet('minSdkVersion', blaze_default_minSdkVersion)
+        targetSdkVersion safeExtGet('targetSdkVersion', blaze_default_targetSdkVersion)
         versionCode 1
         versionName packageVersion
 
@@ -74,14 +83,13 @@ repositories {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$blaze_kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$blaze_kotlin_version"
       
     // noinspection GradleDynamicVersion
     api 'com.facebook.react:react-native:+'
 
-    def blazeSDK = '1.9.3'
-    implementation group: "com.blaze", name: "blazesdk", version: "${blazeSDK}"
+    implementation group: "com.blaze", name: "blazesdk", version: "$blazesdk_version"
 
     // Gson.
-    def GsonVersion = "2.10.1"
-    implementation "com.google.code.gson:gson:$GsonVersion"
+    implementation "com.google.code.gson:gson:$blaze_gson_version"
 }

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

@@ -11,12 +11,15 @@ import com.blaze.blazesdk.external_modules.BlazeExternalModulesBinder
 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.models.BlazeEntryPointTriggerSource
 import com.blaze.blazesdk.shared.results.BlazeResult
 import com.blaze.rtnblazesdk.events.SdkModuleJsEvent
 import com.blaze.rtnblazesdk.utils.extractCachingLevel
 import com.blaze.rtnblazesdk.utils.extractDataSource
 import com.blaze.rtnblazesdk.utils.extractMomentsPlayerStyle
 import com.blaze.rtnblazesdk.utils.extractStoriesPlayerStyle
+import com.blaze.rtnblazesdk.utils.extractVideosPlayerStyle
+import com.blaze.rtnblazesdk.utils.getBooleanOrNull
 import com.blaze.rtnblazesdk.utils.handleResult
 import com.blaze.rtnblazesdk.utils.rejectWith
 import com.facebook.proguard.annotations.DoNotStrip
@@ -148,6 +151,7 @@ class BlazeSdkModule(private val context: ReactApplicationContext): ReactContext
 
             val reactStoryPlayerStyle = options.getMap(KEY_INIT_DEFAULT_STORY_PLAYER_STYLE)
             val reactMomentPlayerStyle = options.getMap(KEY_INIT_DEFAULT_MOMENT_PLAYER_STYLE)
+            val reactVideosPlayerStyle = options.getMap(KEY_INIT_DEFAULT_VIDEO_PLAYER_STYLE)
 
             reactStoryPlayerStyle.extractStoriesPlayerStyle(context).also {
                 BlazeSDK.setDefaultStoryPlayerStyle(it)
@@ -155,6 +159,9 @@ class BlazeSdkModule(private val context: ReactApplicationContext): ReactContext
             reactMomentPlayerStyle.extractMomentsPlayerStyle(context).also {
                 BlazeSDK.setDefaultMomentsPlayerStyle(it)
             }
+            reactVideosPlayerStyle.extractVideosPlayerStyle(context).also {
+                BlazeSDK.setDefaultVideosPlayerStyle(it)
+            }
         } catch (e: Exception) {
             promise.reject("BlazeSDK", e.toString())
             Log.e(TAG, "init: Exception - $e")
@@ -170,7 +177,7 @@ class BlazeSdkModule(private val context: ReactApplicationContext): ReactContext
         try {
             appOverridesCTAHandling = options.getBoolean(KEY_INIT_APP_OVERRIDES_CTA_HANDLING)
         } catch(e: NoSuchKeyException) {
-            Log.e(TAG, "setAppOverrideCtaHandling: NoSuchKeyException - ${e.message}")
+
         }
     }
 
@@ -190,10 +197,14 @@ class BlazeSdkModule(private val context: ReactApplicationContext): ReactContext
             val pageId = options.getString(KEY_STORY_OPT_PAGE_ID)
             val playerStyle = options.getMap(KEY_ENTRY_POINT_PLAYER_THEME)
                 .extractStoriesPlayerStyle(context)
+
+            val triggerSource = options.getString("triggerSource")?.asEntryPointTriggerSource
+                ?: BlazeEntryPointTriggerSource.ENTRYPOINT
             BlazeSDK.playStory(
                 storyId = storyId,
                 pageId = pageId,
-                storyPlayerStyle = playerStyle
+                storyPlayerStyle = playerStyle,
+                triggerSource = triggerSource
             ) { result ->
                 promise.handleResult(result)
             }
@@ -204,19 +215,24 @@ class BlazeSdkModule(private val context: ReactApplicationContext): ReactContext
 
     @ReactMethod
     @DoNotStrip
-    fun playMoment(options: ReadableMap, promise: Promise) {
-
+    fun playStories(options: ReadableMap, promise: Promise) {
         try {
-            val momentId = options.getString(KEY_STORY_OPT_MOMENT_ID) ?: run {
-                promise.rejectWith("no moment id")
+            val dataSource = options.getMap(KEY_ENTRY_POINT_DATA_SOURCE)?.extractDataSource() ?: run {
+                promise.rejectWith("Error parsing data source for playStories")
                 return
             }
 
             val playerStyle = options.getMap(KEY_ENTRY_POINT_PLAYER_THEME)
-                .extractMomentsPlayerStyle(context)
-            BlazeSDK.playMoment(
-                momentId = momentId,
-                momentsPlayerStyle = playerStyle) { result ->
+                .extractStoriesPlayerStyle(context)
+            val triggerSource = options.getString("triggerSource")?.asEntryPointTriggerSource
+                ?: BlazeEntryPointTriggerSource.ENTRYPOINT
+            val shouldOrderContentByReadStatus = options.getBooleanOrNull("shouldOrderContentByReadStatus") ?: true
+            BlazeSDK.playStories(
+                dataSource = dataSource,
+                storyPlayerStyle = playerStyle,
+                triggerSource = triggerSource,
+                shouldOrderContentByReadStatus = shouldOrderContentByReadStatus
+            ) { result ->
                 promise.handleResult(result)
             }
         } catch (e: Exception) {
@@ -243,13 +259,22 @@ class BlazeSdkModule(private val context: ReactApplicationContext): ReactContext
 
     @ReactMethod
     @DoNotStrip
-    fun prepareMoments(options: ReadableMap, promise: Promise) {
+    fun playMoment(options: ReadableMap, promise: Promise) {
         try {
-            val dataSource = options.getMap(KEY_ENTRY_POINT_DATA_SOURCE)?.extractDataSource() ?: run {
-                promise.rejectWith("Error parsing data source for prepareMoments")
+            val momentId = options.getString(KEY_MOMENT_OPT_MOMENT_ID) ?: run {
+                promise.rejectWith("no moment id")
                 return
             }
-            BlazeSDK.prepareMoments(dataSource) { result ->
+
+            val playerStyle = options.getMap(KEY_ENTRY_POINT_PLAYER_THEME)
+                .extractMomentsPlayerStyle(context)
+            val triggerSource = options.getString("triggerSource")?.asEntryPointTriggerSource
+                ?: BlazeEntryPointTriggerSource.ENTRYPOINT
+            BlazeSDK.playMoment(
+                momentId = momentId,
+                momentsPlayerStyle = playerStyle,
+                triggerSource = triggerSource
+            ) { result ->
                 promise.handleResult(result)
             }
         } catch (e: Exception) {
@@ -259,46 +284,92 @@ class BlazeSdkModule(private val context: ReactApplicationContext): ReactContext
 
     @ReactMethod
     @DoNotStrip
-    fun dismissPlayer(promise: Promise) {
-        BlazeSDK.dismissCurrentPlayer()
-        promise.resolve(true)
-    }
+    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")
+                return
+            }
 
-    @DoNotStrip
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    fun isInitialized(): Boolean {
-        return BlazeSDK.isInitialized()
+            val playerStyle = options.getMap(KEY_ENTRY_POINT_PLAYER_THEME)
+                .extractMomentsPlayerStyle(context)
+            val triggerSource = options.getString("triggerSource")?.asEntryPointTriggerSource
+                ?: BlazeEntryPointTriggerSource.ENTRYPOINT
+            val shouldOrderContentByReadStatus = options.getBooleanOrNull("shouldOrderContentByReadStatus") ?: true
+            BlazeSDK.playMoments(
+                dataSource = dataSource,
+                momentsPlayerStyle = playerStyle,
+                triggerSource = triggerSource,
+                shouldOrderContentByReadStatus = shouldOrderContentByReadStatus
+            ) { result ->
+                promise.handleResult(result)
+            }
+        } catch (e: Exception) {
+            promise.rejectWith(e.toString())
+        }
     }
 
     @ReactMethod
     @DoNotStrip
-    fun setExternalUserId(externalUserId: String?, promise: Promise) {
-        BlazeSDK.setExternalUserId(externalUserId) { result ->
-            promise.handleResult(result)
+    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")
+                return
+            }
+            BlazeSDK.prepareMoments(dataSource) { result ->
+                promise.handleResult(result)
+            }
+        } catch (e: Exception) {
+            promise.rejectWith(e.toString())
         }
     }
 
     @ReactMethod
     @DoNotStrip
-    fun setDoNotTrack(doNotTrack: Boolean, promise: Promise) {
-        BlazeSDK.setDoNotTrack(doNotTrack)
-        promise.resolve(doNotTrack)
+    fun playVideo(options: ReadableMap, promise: Promise) {
+        try {
+            val videoId = options.getString(KEY_VIDEO_OPT_VIDEO_ID) ?: run {
+                promise.rejectWith("no video id")
+                return
+            }
+
+            val playerStyle = options.getMap(KEY_ENTRY_POINT_PLAYER_THEME)
+                .extractVideosPlayerStyle(context)
+            val triggerSource = options.getString("triggerSource")?.asEntryPointTriggerSource
+                ?: BlazeEntryPointTriggerSource.ENTRYPOINT
+            BlazeSDK.playVideo(
+                videoId = videoId,
+                videosPlayerStyle = playerStyle,
+                triggerSource = triggerSource
+                ) { result ->
+                promise.handleResult(result)
+            }
+        } catch (e: Exception) {
+            promise.rejectWith(e.toString())
+        }
     }
 
     @ReactMethod
     @DoNotStrip
-    fun playStories(options: ReadableMap, promise: Promise) {
+    fun playVideos(options: ReadableMap, promise: Promise) {
         try {
             val dataSource = options.getMap(KEY_ENTRY_POINT_DATA_SOURCE)?.extractDataSource() ?: run {
-                promise.rejectWith("Error parsing data source for playStories")
+                promise.rejectWith("Error parsing data source for playVideos")
                 return
             }
 
             val playerStyle = options.getMap(KEY_ENTRY_POINT_PLAYER_THEME)
-                .extractStoriesPlayerStyle(context)
-            BlazeSDK.playStories(
+                .extractVideosPlayerStyle(context)
+            val triggerSource = options.getString("triggerSource")?.asEntryPointTriggerSource
+                ?: BlazeEntryPointTriggerSource.ENTRYPOINT
+            val shouldOrderContentByReadStatus = options.getBooleanOrNull("shouldOrderContentByReadStatus") ?: true
+            BlazeSDK.playVideos(
                 dataSource = dataSource,
-                storyPlayerStyle = playerStyle) { result ->
+                videosPlayerStyle = playerStyle,
+                triggerSource = triggerSource,
+                shouldOrderContentByReadStatus = shouldOrderContentByReadStatus
+            ) { result ->
                 promise.handleResult(result)
             }
         } catch (e: Exception) {
@@ -308,18 +379,13 @@ class BlazeSdkModule(private val context: ReactApplicationContext): ReactContext
 
     @ReactMethod
     @DoNotStrip
-    fun playMoments(options: ReadableMap, promise: Promise) {
+    fun prepareVideos(options: ReadableMap, promise: Promise) {
         try {
             val dataSource = options.getMap(KEY_ENTRY_POINT_DATA_SOURCE)?.extractDataSource() ?: run {
-                promise.rejectWith("Error parsing data source for playMoments")
+                promise.rejectWith("Error parsing data source for prepareVideos")
                 return
             }
-
-            val playerStyle = options.getMap(KEY_ENTRY_POINT_PLAYER_THEME)
-                .extractMomentsPlayerStyle(context)
-            BlazeSDK.playMoments(
-                dataSource = dataSource,
-                momentsPlayerStyle = playerStyle) { result ->
+            BlazeSDK.prepareVideos(dataSource) { result ->
                 promise.handleResult(result)
             }
         } catch (e: Exception) {
@@ -327,6 +393,34 @@ class BlazeSdkModule(private val context: ReactApplicationContext): ReactContext
         }
     }
 
+    @ReactMethod
+    @DoNotStrip
+    fun dismissPlayer(promise: Promise) {
+        BlazeSDK.dismissCurrentPlayer()
+        promise.resolve(true)
+    }
+
+    @DoNotStrip
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    fun isInitialized(): Boolean {
+        return BlazeSDK.isInitialized()
+    }
+
+    @ReactMethod
+    @DoNotStrip
+    fun setExternalUserId(externalUserId: String?, promise: Promise) {
+        BlazeSDK.setExternalUserId(externalUserId) { result ->
+            promise.handleResult(result)
+        }
+    }
+
+    @ReactMethod
+    @DoNotStrip
+    fun setDoNotTrack(doNotTrack: Boolean, promise: Promise) {
+        BlazeSDK.setDoNotTrack(doNotTrack)
+        promise.resolve(doNotTrack)
+    }
+
     @ReactMethod
     @DoNotStrip
     fun handleUniversalLink(link: String, promise: Promise) {
@@ -403,12 +497,21 @@ class BlazeSdkModule(private val context: ReactApplicationContext): ReactContext
         const val KEY_INIT_APP_OVERRIDES_CTA_HANDLING = "appOverridesCTAHandling"
         const val KEY_INIT_DEFAULT_STORY_PLAYER_STYLE = "defaultStoryPlayerStyle"
         const val KEY_INIT_DEFAULT_MOMENT_PLAYER_STYLE = "defaultMomentsPlayerStyle"
+        const val KEY_INIT_DEFAULT_VIDEO_PLAYER_STYLE = "defaultVideosPlayerStyle"
         const val KEY_STORY_OPT_STORY_ID = "storyId"
         const val KEY_STORY_OPT_PAGE_ID = "pageId"
-        const val KEY_STORY_OPT_MOMENT_ID = "momentId"
+        const val KEY_MOMENT_OPT_MOMENT_ID = "momentId"
+        const val KEY_VIDEO_OPT_VIDEO_ID = "videoId"
         const val KEY_ENTRY_POINT_DATA_SOURCE = "dataSource"
         const val KEY_ENTRY_POINT_PLAYER_THEME = "playerStyle"
 
     }
 
+}
+
+val String.asEntryPointTriggerSource: BlazeEntryPointTriggerSource? get() = when (this) {
+    "notification" -> BlazeEntryPointTriggerSource.NOTIFICATION
+    "deepLink" -> BlazeEntryPointTriggerSource.DEEPLINK
+    "entryPoint" -> BlazeEntryPointTriggerSource.ENTRYPOINT
+    else -> null
 }

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

@@ -2,24 +2,34 @@ package com.blaze.rtnblazesdk
 
 import com.blaze.rtnblazesdk.moments.BlazeMomentsGridViewManager
 import com.blaze.rtnblazesdk.moments.BlazeMomentsRowViewManager
+import com.blaze.rtnblazesdk.shared.BlazeAsyncBridgeModule
 import com.blaze.rtnblazesdk.stories.BlazeStoriesGridViewManager
 import com.blaze.rtnblazesdk.stories.BlazeStoriesRowViewManager
+import com.blaze.rtnblazesdk.videos.BlazeVideosGridViewManager
+import com.blaze.rtnblazesdk.videos.BlazeVideosRowViewManager
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
 
 class BlazeSdkPackage : ReactPackage {
-    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+    override fun createViewManagers(
+            reactContext: ReactApplicationContext
+    ): List<ViewManager<*, *>> {
         return listOf<ViewManager<*, *>>(
-            BlazeStoriesGridViewManager(reactContext),
-            BlazeStoriesRowViewManager(reactContext),
-            BlazeMomentsGridViewManager(reactContext),
-            BlazeMomentsRowViewManager(reactContext)
+                BlazeStoriesGridViewManager(reactContext),
+                BlazeStoriesRowViewManager(reactContext),
+                BlazeMomentsGridViewManager(reactContext),
+                BlazeMomentsRowViewManager(reactContext),
+                BlazeVideosGridViewManager(reactContext),
+                BlazeVideosRowViewManager(reactContext)
         )
     }
 
     override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        return listOf<NativeModule>(BlazeSdkModule(reactContext))
+        return listOf<NativeModule>(
+                BlazeSdkModule(reactContext),
+                BlazeAsyncBridgeModule(reactContext)
+        )
     }
-}
+}

package/android/src/main/java/com/blaze/rtnblazesdk/ads/BlazeRTNContentExtraInfo.kt

@@ -0,0 +1,20 @@
+package com.blaze.rtnblazesdk.ads
+
+import androidx.annotation.Keep
+import com.blaze.blazesdk.ads.models.ui.BlazeContentExtraInfo
+
+@Keep
+data class BlazeRTNContentExtraInfo(
+    val previous: Map<String, String>?,
+    val current: Map<String, String>?,
+    val next: Map<String, String>?,
+)
+
+@Keep
+fun BlazeContentExtraInfo.toReactNativeModel(): BlazeRTNContentExtraInfo {
+    return BlazeRTNContentExtraInfo(
+        previous = this.previous,
+        current = this.current,
+        next = this.next
+    )
+}

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

@@ -21,7 +21,6 @@ import com.blaze.rtnblazesdk.BlazeSdkModuleRepo
 import com.blaze.rtnblazesdk.customization.BlazeReactWidgetItemCustomMapping
 import com.blaze.rtnblazesdk.customization.BlazeReactWidgetItemStyleOverrides
 import com.blaze.rtnblazesdk.customization.mergedWith
-import com.blaze.rtnblazesdk.events.BaseEvent
 import com.blaze.rtnblazesdk.events.WidgetCTAClickEvent
 import com.blaze.rtnblazesdk.events.WidgetDataLoadCompletedEvent
 import com.blaze.rtnblazesdk.events.WidgetDataLoadStartedEvent
@@ -42,6 +41,7 @@ import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.events.Event
 import com.facebook.react.uimanager.events.EventDispatcher
 
 abstract class BaseWidgetView @JvmOverloads constructor(
@@ -276,7 +276,7 @@ abstract class BaseWidgetView @JvmOverloads constructor(
         // Currently we don't do anything here.
     }
 
-    protected fun dispatchEvent(e: BaseEvent<*>) {
+    protected fun dispatchEvent(e: Event<*>) {
         try {
             val eventDispatcher: EventDispatcher? =
                 UIManagerHelper.getEventDispatcherForReactTag(context as ReactContext, id)

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

@@ -122,28 +122,18 @@ abstract class BlazeWidgetViewManager<TWidget : BaseWidgetView>(
         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?) {
+    @ReactProp(name = "playerStyle")
+    fun setPlayerStyle(view: TWidget, value: ReadableMap?) {
         view.reactWidgetPlayerStyleMap = value
     }
 
-    //---------- Props for Story widget ----------//
+    //---------- Props for Grids ----------//
 
     @Keep
-    @ReactProp(name = "blazeStoryPlayerStyle")
-    fun setBlazeStoryPlayerStyle(view: TWidget, value: ReadableMap?) {
-        view.reactWidgetPlayerStyleMap = value
+    @ReactProp(name = "isEmbeddedInScrollView")
+    fun setIsEmbeddedInScrollView(view: TWidget, value: Boolean) {
+        view.isEmbeddedInScrollView = value
     }
 
 }

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

@@ -6,11 +6,16 @@ import BlazeReactFirstTimeSlideTextStyle
 import BlazeReactImage
 import BlazeReactMargins
 import BlazeReactPlayerButtonCustomImageStates
+import BlazeReactPlayerButtonStyle
+import BlazeReactSeekBarStyle
 import android.content.Context
+import android.widget.ImageView
 import com.blaze.blazesdk.style.players.BlazeFirstTimeSlideCTAStyle
 import com.blaze.blazesdk.style.players.BlazeFirstTimeSlideInstructionStyle
 import com.blaze.blazesdk.style.players.BlazeFirstTimeSlideTextStyle
 import com.blaze.blazesdk.style.players.BlazePlayerButtonCustomImageStates
+import com.blaze.blazesdk.style.players.BlazeSeekBarStyle
+import com.blaze.blazesdk.style.players.IPlayerItemButtonStyle
 import com.blaze.blazesdk.style.shared.models.BlazeInsets
 import com.blaze.blazesdk.style.shared.models.blazeDp
 
@@ -147,3 +152,40 @@ fun String?.toColorResId(context: Context): Int? {
     return colorResId
 }
 
+fun <T : IPlayerItemButtonStyle> T.mergeButtonThemes(
+    customization: BlazeReactPlayerButtonStyle?,
+    context: Context
+): T {
+    customization ?: return this
+
+    customization.width?.let { this.width = it.blazeDp }
+    customization.height?.let { this.height = it.blazeDp }
+    safeParseColor(customization.color)?.let { this.color = it }
+    customization.isVisible?.let { this.isVisible = it }
+    customization.scaleType?.let { this.scaleType = ImageView.ScaleType.valueOf(it) }
+    customization.isVisibleForAds?.let { this.isVisibleForAds = it }
+    customization.customImage?.let { this.customImage = this.customImage.mergedWith(it, context) }
+
+    return this
+}
+
+fun BlazeSeekBarStyle.mergedWith(
+    customization: BlazeReactSeekBarStyle?,
+    context: Context
+): BlazeSeekBarStyle {
+    customization ?: return this
+
+    val merged = this
+
+    merged.isVisible = customization.isVisible ?: this.isVisible
+    merged.backgroundColor = safeParseColor(customization.backgroundColor) ?: this.backgroundColor
+    merged.progressColor = safeParseColor(customization.progressColor) ?: this.progressColor
+    merged.height = customization.height?.blazeDp ?: this.height
+    merged.cornerRadius = customization.cornerRadius?.toInt()?.blazeDp ?: this.cornerRadius
+    merged.thumbColor = safeParseColor(customization.thumbColor) ?: this.thumbColor
+    merged.thumbImageResId = customization.thumbImage?.toImageResId(context)
+    merged.thumbSize = customization.thumbSize?.blazeDp ?: this.thumbSize
+    merged.isThumbVisible = customization.isThumbVisible ?: this.isThumbVisible
+
+    return merged
+}

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

@@ -1,7 +1,6 @@
 package com.blaze.rtnblazesdk.customization
 
 import BlazeReactMomentsPlayerBodyTextStyle
-import BlazeReactMomentsPlayerButtonStyle
 import BlazeReactMomentsPlayerButtonsStyle
 import BlazeReactMomentsPlayerChipStyle
 import BlazeReactMomentsPlayerChipsStyle
@@ -14,12 +13,8 @@ import BlazeReactMomentsPlayerHeaderGradientStyle
 import BlazeReactMomentsPlayerHeadingTextStyle
 import BlazeReactMomentsPlayerSeekBarStyle
 import BlazeReactMomentsPlayerStyle
-import BlazeReactSeekBarStyle
 import android.content.Context
-import android.widget.ImageView
-import com.blaze.blazesdk.style.players.BlazeSeekBarStyle
 import com.blaze.blazesdk.style.players.moments.BlazeMomentsPlayerBodyTextStyle
-import com.blaze.blazesdk.style.players.moments.BlazeMomentsPlayerButtonStyle
 import com.blaze.blazesdk.style.players.moments.BlazeMomentsPlayerButtonsStyle
 import com.blaze.blazesdk.style.players.moments.BlazeMomentsPlayerChipStyle
 import com.blaze.blazesdk.style.players.moments.BlazeMomentsPlayerChipsStyle
@@ -44,7 +39,7 @@ fun BlazeMomentsPlayerStyle.mergedWith(
 
     merged.headingText = this.headingText.mergedWith(customization.headingText, context)
     merged.bodyText = this.bodyText.mergedWith(customization.bodyText, context)
-    customization.buttons?.let { merged.buttons = this.buttons.mergedWith(it, context) }
+    merged.buttons = this.buttons.mergedWith(customization.buttons, context)
     merged.chips = this.chips.mergedWith(customization.chips)
     merged.cta = this.cta.mergedWith(customization.cta, context)
     safeParseColor(customization.backgroundColor)?.let { merged.backgroundColor = it }
@@ -112,39 +107,18 @@ fun BlazeMomentsPlayerBodyTextStyle.mergedWith(
 
 
 fun BlazeMomentsPlayerButtonsStyle.mergedWith(
-    customization: BlazeReactMomentsPlayerButtonsStyle,
+    customization: BlazeReactMomentsPlayerButtonsStyle?,
     context: Context
 ): BlazeMomentsPlayerButtonsStyle {
-    customization.mute?.let { 
-        mute = mute.mergeButtonThemes(it, context)
-    }
-    customization.exit?.let {
-        exit = exit.mergeButtonThemes(it, context)
-    }
-    customization.share?.let {
-        share = share.mergeButtonThemes(it, context)
-    }
-    customization.like?.let {
-        like = like.mergeButtonThemes(it, context)
-    }
-    customization.play?.let {
-        play = play.mergeButtonThemes(it, context)
-    }
-    return this
-}
+    customization ?: return this
 
-fun BlazeMomentsPlayerButtonStyle.mergeButtonThemes(
-    customization: BlazeReactMomentsPlayerButtonStyle,
-    context: Context
-): BlazeMomentsPlayerButtonStyle {
-    customization.width?.let { this.width = it.blazeDp }
-    customization.height?.let { this.height = it.blazeDp }
-    safeParseColor(customization.color)?.let { this.color = it }
-    customization.isVisible?.let { this.isVisible = it }
-    customization.scaleType?.let { this.scaleType = ImageView.ScaleType.valueOf(it) }
-    customization.isVisibleForAds?.let { this.isVisibleForAds = it }
-    customization.customImage?.let { this.customImage = this.customImage.mergedWith(it, context) }
-    return this
+    val merged = this
+    merged.mute = merged.mute.mergeButtonThemes(customization.mute, context)
+    merged.exit = merged.exit.mergeButtonThemes(customization.exit, context)
+    merged.share = merged.share.mergeButtonThemes(customization.share, context)
+    merged.like = merged.like.mergeButtonThemes(customization.like, context)
+    merged.play = merged.play.mergeButtonThemes(customization.play, context)
+    return merged
 }
 
 fun BlazeMomentsPlayerCtaStyle.mergedWith(
@@ -236,27 +210,6 @@ fun BlazeMomentsPlayerSeekBarStyle.mergedWith(
     return merged
 }
 
-fun BlazeSeekBarStyle.mergedWith(
-    customization: BlazeReactSeekBarStyle?,
-    context: Context
-): BlazeSeekBarStyle {
-    customization ?: return this
-
-    val merged = this
-
-    merged.isVisible = customization.isVisible ?: this.isVisible
-    merged.backgroundColor = safeParseColor(customization.backgroundColor) ?: this.backgroundColor
-    merged.progressColor = safeParseColor(customization.progressColor) ?: this.progressColor
-    merged.height = customization.height?.blazeDp ?: this.height
-    merged.cornerRadius = customization.cornerRadius?.toInt()?.blazeDp ?: this.cornerRadius
-    merged.thumbColor = safeParseColor(customization.thumbColor) ?: this.thumbColor
-    merged.thumbImageResId = customization.thumbImage?.toImageResId(context)
-    merged.thumbSize = customization.thumbSize?.blazeDp ?: this.thumbSize
-    merged.isThumbVisible = customization.isThumbVisible ?: this.isThumbVisible
-
-    return merged
-}
-
 fun BlazeMomentsPlayerChipStyle.mergedWith(
     customization: BlazeReactMomentsPlayerChipStyle?,
 ): BlazeMomentsPlayerChipStyle {