@wscsports/blaze-rtn-sdk 0.1.1 → 0.2.3

package/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
     }
 
-    ext.kotlinVersion = "1.9.10"
+    ext.blaze_kotlin_version = safeExtGet('kotlinVersion', '1.7.20')
 
     repositories {
         google()
@@ -13,16 +13,16 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:7.4.2")
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath("com.android.tools.build:gradle:8.1.4")
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$blaze_kotlin_version"
     }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: "kotlin-android"
+apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 33)
+    compileSdkVersion safeExtGet('compileSdkVersion', 34)
     namespace "com.blaze.rtnblazesdk"
 
     def versionJsonFile = file('../package.json')
@@ -31,7 +31,7 @@ android {
 
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 24)
-        targetSdkVersion safeExtGet('targetSdkVersion', 33)
+        targetSdkVersion safeExtGet('targetSdkVersion', 34)
         versionCode 1
         versionName packageVersion
 
@@ -56,7 +56,9 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
-
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 repositories {
@@ -79,12 +81,11 @@ repositories {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$blaze_kotlin_version"
       
     // noinspection GradleDynamicVersion
     api 'com.facebook.react:react-native:+'
 
-    def blazeSDK = '0.30.35'
+    def blazeSDK = '0.60.12'
     implementation group: "com.blaze", name: "blazesdk", version: "${blazeSDK}"
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 }

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

@@ -8,6 +8,7 @@ import com.blaze.rtnblazesdk.moments.BlazeMomentsGridView
 import com.blaze.rtnblazesdk.viewmanagers.RTNBlazeMomentsGridViewManagerDelegate
 import com.blaze.rtnblazesdk.viewmanagers.RTNBlazeMomentsGridViewManagerInterface
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.module.annotations.ReactModule
@@ -42,16 +43,23 @@ class BlazeMomentsGridViewManager(
         return view
     }
 
-    override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {
-        return MapBuilder.of<String, Any>(
-            WidgetDataLoadStartedEvent.EVENT_NAME,
-            MapBuilder.of("registrationName", "onWidgetDataLoadStarted"),
-            WidgetDataLoadCompletedEvent.EVENT_NAME,
-            MapBuilder.of("registrationName", "onWidgetDataLoadCompleted")
-        )
+    override fun receiveCommand(
+        view: BlazeMomentsGridView,
+        commandId: Int,
+        args: ReadableArray?
+    ) {
+        when (commandId) {
+            COMMAND_RELOAD_DATA_ID -> view.reloadData()
+
+            COMMAND_UPDATE_DATA_SOURCE_ID -> if (args != null && args.size() > 0) {
+                val dataSource = args.getMap(0)
+                if (dataSource != null) {
+                    view.updateDataSource(dataSource)
+                }
+            }
+        }
     }
 
-
     override fun updateProperties(viewToUpdate: BlazeMomentsGridView, props: ReactStylesDiffMap) {
         super.updateProperties(viewToUpdate, props)
 

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

@@ -5,10 +5,10 @@ import com.blaze.rtnblazesdk.events.WidgetDataLoadCompletedEvent
 import com.blaze.rtnblazesdk.events.WidgetDataLoadStartedEvent
 import com.blaze.rtnblazesdk.moments.BlazeMomentsRowView
 import com.blaze.rtnblazesdk.moments.BlazeRowViewManagerImp
-import com.blaze.rtnblazesdk.stories.BlazeStoriesRowView
 import com.blaze.rtnblazesdk.viewmanagers.RTNBlazeMomentsRowViewManagerDelegate
 import com.blaze.rtnblazesdk.viewmanagers.RTNBlazeMomentsRowViewManagerInterface
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.module.annotations.ReactModule
@@ -39,13 +39,21 @@ class BlazeMomentsRowViewManager(context: ReactApplicationContext?) :
         return BlazeRowViewManagerImp.createViewInstance(context)
     }
 
-    override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {
-        return MapBuilder.of<String, Any>(
-            WidgetDataLoadStartedEvent.EVENT_NAME,
-            MapBuilder.of("registrationName", "onWidgetDataLoadStarted"),
-            WidgetDataLoadCompletedEvent.EVENT_NAME,
-            MapBuilder.of("registrationName", "onWidgetDataLoadCompleted")
-        )
+    override fun receiveCommand(
+        view: BlazeMomentsRowView,
+        commandId: Int,
+        args: ReadableArray?
+    ) {
+        when (commandId) {
+            COMMAND_RELOAD_DATA_ID -> view.reloadData()
+
+            COMMAND_UPDATE_DATA_SOURCE_ID -> if (args != null && args.size() > 0) {
+                val dataSource = args.getMap(0)
+                if (dataSource != null) {
+                    view.updateDataSource(dataSource)
+                }
+            }
+        }
     }
 
     override fun updateProperties(viewToUpdate: BlazeMomentsRowView, props: ReactStylesDiffMap) {

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

@@ -50,4 +50,8 @@ class BlazeSdkModule(context: ReactApplicationContext) : NativeBlazeSdkSpec(cont
     override fun handleUniversalLink(link: String, promise: Promise) {
         return implementation.handleUniversalLink(link, promise)
     }
+
+    override fun updateGeoRestriction(geoLocation: String?, promise: Promise) {
+        return implementation.updateGeoRestriction(geoLocation, promise)
+    }
 }

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

@@ -2,14 +2,14 @@ package com.blaze.rtnblazesdk
 
 import android.app.Application
 import com.blaze.blazesdk.BlazeSDK
+import com.blaze.blazesdk.core.analytics.models.BlazeAnalyticsEvent
 import com.blaze.blazesdk.core.external_modules.BlazeExternalModulesBinder
 import com.blaze.blazesdk.core.managers.CachingLevel
 import com.blaze.blazesdk.core.models.BlazeResult
 import com.blaze.blazesdk.features.moments.theme.player.MomentPlayerTheme
 import com.blaze.blazesdk.features.stories.theme.player.StoryPlayerTheme
-import com.blaze.blazesdk.features.widgets.labels.BlazeDataSourceType
-import com.blaze.blazesdk.features.widgets.labels.BlazeWidgetLabel
 import com.blaze.blazesdk.features.widgets.shared.GlobalDelegates
+import com.blaze.rtnblazesdk.base.extractDataSource
 import com.blaze.rtnblazesdk.utils.handleResult
 import com.blaze.rtnblazesdk.utils.rejectWith
 import com.facebook.react.bridge.Arguments
@@ -31,13 +31,11 @@ class BlazeSdkModuleImp(private val context: ReactApplicationContext) {
         val storyPlayerTheme = StoryPlayerTheme()
         val momentPlayerTheme = MomentPlayerTheme()
         try {
-
-
-
             BlazeSDK.init(
                 apiKey = options.getString("apiKey")!!,
                 application = (context.applicationContext as Application),
                 externalUserId = null,
+                geoLocation = options.getString("geoLocation"),
                 cachingSize = options.getInt("cachingSize"),
                 globalStoryAppearanceLayout = storyPlayerTheme,
                 globalMomentsAppearanceTheme = momentPlayerTheme,
@@ -111,7 +109,7 @@ class BlazeSdkModuleImp(private val context: ReactApplicationContext) {
 
     fun playMoments(options: ReadableMap, promise: Promise) {
         try {
-            val dataSource = extractDataSource(options) ?: run {
+            val dataSource = options.extractDataSource() ?: run {
                 promise.rejectWith("Error parsing data source")
                 return
             }
@@ -125,51 +123,80 @@ class BlazeSdkModuleImp(private val context: ReactApplicationContext) {
 
     fun handleUniversalLink(link: String, promise: Promise) {
         try {
-            BlazeSDK.handleUniversalLink(link)
-            promise.resolve(link)
+            BlazeSDK.handleUniversalLink(link){ result ->
+                promise.handleResult(result)
+            }
         } catch (e: Exception) {
             promise.rejectWith(e.toString())
         }
     }
 
-    private fun extractDataSource(options: ReadableMap): BlazeDataSourceType? {
-        val labelsDataSource = options.getString("labels")
-        val idsDataSource = options.getArray("ids")?.toArrayList() as? List<String>
-        val dataSource =
-            if (labelsDataSource != null) {
-                BlazeDataSourceType.Labels(BlazeWidgetLabel.singleLabel(labelsDataSource))
-            } else if (
-                idsDataSource != null
-            ) {
-                BlazeDataSourceType.Ids(idsDataSource)
-            } else {
-                null
+    fun updateGeoRestriction(geoLocation: String?, promise: Promise) {
+        val updatedGeoLocation = if (geoLocation.isNullOrEmpty()) null else geoLocation
+        try {
+            BlazeSDK.updateGeoRestriction(updatedGeoLocation){ result ->
+                promise.handleResult(result)
             }
-        return dataSource
+        } catch (e: Exception) {
+            promise.rejectWith(e.toString())
+        }
     }
 
     private fun registerGlobalDelegateMethods() {
 
         GlobalDelegates.onStoryPlayerDidAppear = {
-            context.emitDeviceEvent("Blaze.onStoryPlayerDidAppear")
+            onStoryPlayerDidAppear()
         }
+
         GlobalDelegates.onStoryPlayerDismissed = {
-            context.emitDeviceEvent("Blaze.onStoryPlayerDismissed")
+            onStoryPlayerDismissed()
         }
+
         GlobalDelegates.onMomentsPlayerDidAppear = {
-            context.emitDeviceEvent("Blaze.onMomentsPlayerDidAppear")
+            onMomentsPlayerDidAppear()
         }
+
         GlobalDelegates.onMomentsPlayerDismissed = {
-            context.emitDeviceEvent("Blaze.onMomentsPlayerDismissed")
+            onMomentsPlayerDismissed()
         }
+
         GlobalDelegates.onErrorThrown = { error ->
-            val params = Arguments.createMap()
-            params.putString("domain", error.domain.toString())
-            params.putString("reason", error.reason.toString())
-            params.putString("message", error.message)
-            context.emitDeviceEvent("Blaze.onErrorThrown", params)
+            onErrorThrown(error)
         }
 
+        GlobalDelegates.onEventTriggered = { eventData ->
+            onEventTriggered(eventData)
+        }
+    }
+
+    private fun onStoryPlayerDidAppear() {
+        context.emitDeviceEvent("Blaze.onStoryPlayerDidAppear")
+    }
+
+    private fun onStoryPlayerDismissed() {
+        context.emitDeviceEvent("Blaze.onStoryPlayerDismissed")
+    }
+
+    private fun onMomentsPlayerDidAppear() {
+        context.emitDeviceEvent("Blaze.onMomentsPlayerDidAppear")
+    }
+
+    private fun onMomentsPlayerDismissed() {
+        context.emitDeviceEvent("Blaze.onMomentsPlayerDismissed")
+    }
+
+    private fun onErrorThrown(error: BlazeResult.Error) {
+        val params = Arguments.createMap()
+        params.putString("domain", error.domain.toString())
+        params.putString("reason", error.reason.toString())
+        params.putString("message", error.message)
+        context.emitDeviceEvent("Blaze.onErrorThrown", params)
+    }
+
+    private fun onEventTriggered(eventData: BlazeAnalyticsEvent) {
+        val eventJson = eventData.asJsonString ?: return
+
+        context.emitDeviceEvent("Blaze.onEventTriggered", eventJson)
     }
 
     companion object {

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

@@ -6,6 +6,7 @@ import com.blaze.rtnblazesdk.stories.BlazeStoriesGridView
 import com.blaze.rtnblazesdk.viewmanagers.RTNBlazeStoriesGridViewManagerDelegate
 import com.blaze.rtnblazesdk.viewmanagers.RTNBlazeStoriesGridViewManagerInterface
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.ReactStylesDiffMap
@@ -22,6 +23,23 @@ class BlazeStoriesGridViewManager(
     RTNBlazeStoriesGridViewManagerInterface<BlazeStoriesGridView?> {
     private val mDelegate: ViewManagerDelegate<BlazeStoriesGridView>
 
+    override fun receiveCommand(
+        view: BlazeStoriesGridView,
+        commandId: Int,
+        args: ReadableArray?
+    ) {
+        when (commandId) {
+            COMMAND_RELOAD_DATA_ID -> view.reloadData()
+
+            COMMAND_UPDATE_DATA_SOURCE_ID -> if (args != null && args.size() > 0) {
+                val dataSource = args.getMap(0)
+                if (dataSource != null) {
+                    view.updateDataSource(dataSource)
+                }
+            }
+        }
+    }
+
     init {
         mDelegate = RTNBlazeStoriesGridViewManagerDelegate(this)
     }

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

@@ -8,6 +8,7 @@ import com.blaze.rtnblazesdk.stories.BlazeStoriesRowView
 import com.blaze.rtnblazesdk.viewmanagers.RTNBlazeStoriesRowViewManagerDelegate
 import com.blaze.rtnblazesdk.viewmanagers.RTNBlazeStoriesRowViewManagerInterface
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.module.annotations.ReactModule
@@ -22,6 +23,24 @@ class BlazeStoriesRowViewManager(context: ReactApplicationContext?) :
     RTNBlazeStoriesRowViewManagerInterface<BlazeStoriesRowView?> {
     private val mDelegate: ViewManagerDelegate<BlazeStoriesRowView>
 
+    override fun receiveCommand(
+        view: BlazeStoriesRowView,
+        commandId: Int,
+        args: ReadableArray?
+    ) {
+        when (commandId) {
+            COMMAND_RELOAD_DATA_ID -> view.reloadData()
+
+            COMMAND_UPDATE_DATA_SOURCE_ID -> if (args != null && args.size() > 0) {
+                val dataSource = args.getMap(0)
+                if (dataSource != null) {
+                    view.updateDataSource(dataSource)
+                }
+            }
+        }
+    }
+
+
     init {
         mDelegate = RTNBlazeStoriesRowViewManagerDelegate(this)
     }
@@ -38,15 +57,6 @@ class BlazeStoriesRowViewManager(context: ReactApplicationContext?) :
         return BlazeRowViewManagerImp.createViewInstance(context)
     }
 
-    override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {
-        return MapBuilder.of<String, Any>(
-            WidgetDataLoadStartedEvent.EVENT_NAME,
-            MapBuilder.of("registrationName", "onWidgetDataLoadStarted"),
-            WidgetDataLoadCompletedEvent.EVENT_NAME,
-            MapBuilder.of("registrationName", "onWidgetDataLoadCompleted")
-        )
-    }
-
     override fun updateProperties(viewToUpdate: BlazeStoriesRowView, props: ReactStylesDiffMap) {
         super.updateProperties(viewToUpdate, props)
         viewToUpdate.onPropsUpdate(props)

package/android/src/main/java/com/blaze/rtnblazesdk/NativeBlazeSdkSpec.java

@@ -58,4 +58,8 @@ public abstract class NativeBlazeSdkSpec extends ReactContextBaseJavaModule impl
     @ReactMethod
     @DoNotStrip
     public abstract void handleUniversalLink(String link, Promise promise);
+
+    @ReactMethod
+    @DoNotStrip
+    public abstract void updateGeoRestriction(String geoLocation, Promise promise);
 }

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

@@ -5,7 +5,9 @@ import com.blaze.rtnblazesdk.events.WidgetDataLoadCompletedEvent
 import com.blaze.rtnblazesdk.events.WidgetDataLoadStartedEvent
 import com.blaze.rtnblazesdk.events.WidgetItemClickedEvent
 import com.blaze.rtnblazesdk.events.WidgetPlayerDismissedEvent
+import com.blaze.rtnblazesdk.stories.BlazeStoriesRowView
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.SimpleViewManager
@@ -18,15 +20,15 @@ abstract class BaseViewManager<TView : BaseWidgetView>(
     override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {
         return MapBuilder.of<String, Any>(
             WidgetDataLoadStartedEvent.EVENT_NAME,
-            MapBuilder.of("registrationName", "onWidgetDataLoadStarted"),
+            MapBuilder.of("registrationName", "onWidgetDataLoadStartedInternal"),
             WidgetDataLoadCompletedEvent.EVENT_NAME,
-            MapBuilder.of("registrationName", "onWidgetDataLoadCompleted"),
+            MapBuilder.of("registrationName", "onWidgetDataLoadCompletedInternal"),
             WidgetPlayerDismissedEvent.EVENT_NAME,
-            MapBuilder.of("registrationName", "onWidgetPlayerDismissed"),
+            MapBuilder.of("registrationName", "onWidgetPlayerDismissedInternal"),
             WidgetItemClickedEvent.EVENT_NAME,
-            MapBuilder.of("registrationName", "onItemClicked"),
+            MapBuilder.of("registrationName", "onItemClickedInternal"),
             WidgetCTAClickEvent.EVENT_NAME,
-            MapBuilder.of("registrationName", "onTriggerCTA"),
+            MapBuilder.of("registrationName", "onTriggerCTAInternal"),
         )
     }
 
@@ -34,4 +36,20 @@ abstract class BaseViewManager<TView : BaseWidgetView>(
         return BlazeWidgetViewShadowNode()
     }
 
+    companion object {
+        const val COMMAND_RELOAD_DATA = "reloadData"
+        const val COMMAND_UPDATE_DATA_SOURCE = "updateDataSource"
+        
+        //COMMAND IDs
+        const val COMMAND_RELOAD_DATA_ID = 0
+        const val COMMAND_UPDATE_DATA_SOURCE_ID = 1
+    }
+
+    override fun getCommandsMap(): MutableMap<String, Int> {
+        return mutableMapOf(
+            COMMAND_RELOAD_DATA to Companion.COMMAND_RELOAD_DATA_ID,
+            COMMAND_UPDATE_DATA_SOURCE to Companion.COMMAND_UPDATE_DATA_SOURCE_ID,
+        )
+    }
+
 }

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

@@ -11,7 +11,6 @@ import com.blaze.rtnblazesdk.customization.mergedWith
 import com.blaze.rtnblazesdk.events.BaseEvent
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.events.EventDispatcher
 import toBlazeReactPlayerStoryTheme
@@ -39,23 +38,6 @@ abstract class BaseWidgetView @JvmOverloads constructor(
         }
     }
 
-    protected fun extractDataSource(dataSource: ReadableMap?): BlazeDataSourceType? {
-        val rawDataSource = dataSource ?: return null
-        val labelsDataSource = rawDataSource.getMap("labels")?.getString("value") ?: return null
-        val idsDataSource = rawDataSource.getArray("ids")?.toArrayList() as? List<String>
-        val dataSource =
-            if (labelsDataSource != null){
-                BlazeDataSourceType.Labels(BlazeWidgetLabel.singleLabel(labelsDataSource))
-            }else if(
-                idsDataSource != null
-            ){
-                BlazeDataSourceType.Ids(idsDataSource)
-            } else{
-                null
-            }
-        return dataSource
-    }
-
     protected fun applyWidgetLayoutCustomization(
         reactWidgetLayout: ReadableMap?,
         widgetLayout: BlazeWidgetLayout,
@@ -87,4 +69,21 @@ abstract class BaseWidgetView @JvmOverloads constructor(
         return momentPlayerTheme.mergedWith(customization = customization,context)
     }
 
-}
+}
+
+    fun ReadableMap?.extractDataSource(): BlazeDataSourceType? {
+    val rawDataSource = this ?: return null
+    val labelsDataSource = rawDataSource.getMap("labels")?.getString("value") ?: return null
+    val idsDataSource = rawDataSource.getArray("ids")?.toArrayList() as? List<String>
+    val dataSource =
+        if (labelsDataSource != null) {
+            BlazeDataSourceType.Labels(BlazeWidgetLabel.singleLabel(labelsDataSource))
+        } else if (
+            idsDataSource != null
+        ) {
+            BlazeDataSourceType.Ids(idsDataSource)
+        } else {
+            null
+        }
+    return dataSource
+    }

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

@@ -0,0 +1,43 @@
+package com.blaze.rtnblazesdk.customization
+
+import android.graphics.Color
+
+object BlazeColorParser {
+
+    /**
+     * Parses a color string in either RGB (#RRGGBB) or RGBA (#RRGGBBAA) format and returns the corresponding
+     * Android color int. If the string is not in a valid format, returns the fallback color.
+     *
+     * @param colorString The color string to parse. Expected in the format "#RRGGBB" or "#RRGGBBAA".
+     * @param fallback The fallback color int to return in case the color string is invalid. Default is null.
+     * @return The parsed color int, or the fallback color if the input is invalid.
+     */
+    internal fun rgbaToColorInt(colorString: String, fallback: Int? = null): Int? {
+        return try {
+            // Remove any "#" prefix and trim whitespace
+            val hexString = colorString.trim().trimStart('#')
+
+            // Format the string correctly for parsing
+            val formattedString = when (hexString.length) {
+                6 -> { // RGB format
+                    "FF$hexString" // Prepend full opacity for ARGB
+                }
+                8 -> { // RGBA format
+                    val alpha = hexString.takeLast(2)
+                    val color = hexString.dropLast(2)
+                    "$alpha$color" // Rearrange to ARGB format
+                }
+                else -> {
+                    return fallback // Return fallback if format is incorrect
+                }
+            }
+
+            // Parse the ARGB color string to an int
+            Color.parseColor("#$formattedString")
+        } catch (e: IllegalArgumentException) {
+            // In case of exception, return fallback value or null
+            fallback
+        }
+    }
+
+}

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

@@ -101,7 +101,7 @@ fun safeParseColor(hexString: String?): Int? {
     hexString ?: return null
 
     return try {
-        Color.parseColor(hexString)
+        BlazeColorParser.rgbaToColorInt(colorString = hexString)
     } catch (e: Throwable) {
         null
     }

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

@@ -12,11 +12,13 @@ import BlazeReactMomentsGradient
 import BlazeReactMomentsSeekBar
 import BlazeReactMomentsText
 import BlazeReactWidgetMomentTheme
+import PlayerReactFooterGradientPositioning
 import android.content.Context
 import com.blaze.blazesdk.core.base_classes.models.Padding
 import com.blaze.blazesdk.core.first_time_slide.models.MomentPlayerFirstTimeSlide
 import com.blaze.blazesdk.core.first_time_slide.models.MomentPlayerFirstTimeSlideInstructions
 import com.blaze.blazesdk.core.theme.player.BlazeScaleType
+import com.blaze.blazesdk.core.theme.player.PlayerFooterGradientPositioning
 import com.blaze.blazesdk.features.moments.theme.player.MomentPlayerGradientFooterTheme
 import com.blaze.blazesdk.features.moments.theme.player.MomentPlayerGradientHeaderTheme
 import com.blaze.blazesdk.features.moments.theme.player.MomentPlayerItemButtonExitTheme
@@ -261,6 +263,16 @@ fun MomentPlayerGradientFooterTheme.mergedWith(
     merged.isVisible = customization.isVisible ?: this.isVisible
     merged.startColor = safeParseColor(customization.startColor) ?: this.startColor
     merged.endColor = safeParseColor(customization.endColor) ?: this.endColor
+    merged.endPositioning = merged.endPositioning.mergeWith(customization.endPositioning)
 
     return merged
+}
+
+fun PlayerFooterGradientPositioning.mergeWith(customization: PlayerReactFooterGradientPositioning?): PlayerFooterGradientPositioning {
+    customization ?: return this
+
+    return when (customization) {
+        PlayerReactFooterGradientPositioning.BOTTOM_TO_PLAYER -> PlayerFooterGradientPositioning.BOTTOM_TO_PLAYER
+        PlayerReactFooterGradientPositioning.BOTTOM_TO_CONTAINER -> PlayerFooterGradientPositioning.BOTTOM_TO_CONTAINER
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.blaze.rtnblazesdk.customization
 
+import BlazeReactCTAPositioning
 import BlazeReactPaddings
 import BlazeReactPlayerStoryTheme
 import BlazeReactStoryButton
@@ -14,11 +15,15 @@ import BlazeReactStoryIconThumbnail
 import BlazeReactStoryLastUpdateText
 import BlazeReactStoryProgressBarStyle
 import BlazeReactStoryText
+import BlazeReactTextCase
 import android.content.Context
 import com.blaze.blazesdk.core.base_classes.models.Padding
 import com.blaze.blazesdk.core.first_time_slide.models.StoryPlayerFirstTimeSlide
 import com.blaze.blazesdk.core.first_time_slide.models.StoryPlayerFirstTimeSlideInstructions
 import com.blaze.blazesdk.core.theme.player.BlazeScaleType
+import com.blaze.blazesdk.core.theme.player.PlayerCtaPositioning
+import com.blaze.blazesdk.core.theme.player.PlayerFooterGradientPositioning
+import com.blaze.blazesdk.core.theme.player.PlayerTextCase
 import com.blaze.blazesdk.features.stories.models.blaze.StoryPlayerItemIconThumbnail
 import com.blaze.blazesdk.features.stories.theme.player.StoryPlayerGradientTheme
 import com.blaze.blazesdk.features.stories.theme.player.StoryPlayerItemButtonExitTheme
@@ -126,9 +131,19 @@ fun StoryPlayerItemLastUpdateTheme.mergedWith(
     merged.fontResId = customization.font?.toFontResId(context)
     merged.textColor = safeParseColor(customization.textColor) ?: this.textColor
     merged.textSize = customization.textSize ?: merged.textSize
+    merged.textCase = merged.textCase.mergeWith(customization.textCase)
     return merged
 }
 
+fun PlayerTextCase.mergeWith(customization: BlazeReactTextCase?): PlayerTextCase {
+    customization ?: return this
+
+    return when (customization) {
+        BlazeReactTextCase.UPPERCASE -> PlayerTextCase.UPPERCASE
+        BlazeReactTextCase.LOWERCASE -> PlayerTextCase.LOWERCASE
+    }
+}
+
 fun StoryPlayerItemButtonsTheme.mergedWith(
     customization: BlazeReactStoryButtons?,
     context: Context
@@ -179,10 +194,21 @@ fun StoryPlayerItemCtaTheme.mergedWith(
     merged.cornerRadius = (customization.cornerRadius ?: this.cornerRadius).toFloat()
     merged.textSize = customization.textSize ?: this.textSize
     merged.fontResId = customization.font?.toFontResId(context)
+    merged.layoutPositioning = merged.layoutPositioning.mergeWith(customization.position)
 
     return merged
 }
 
+fun PlayerCtaPositioning.mergeWith(customization: BlazeReactCTAPositioning?): PlayerCtaPositioning {
+    customization ?: return this
+
+    return when (customization) {
+        BlazeReactCTAPositioning.CTA_BELLOW_SHARE -> PlayerCtaPositioning.CTA_BELOW_SHARE
+        BlazeReactCTAPositioning.CTA_NEXT_TO_SHARE -> PlayerCtaPositioning.CTA_NEXT_TO_SHARE
+    }
+}
+
+
 fun StoryPlayerItemChipsTheme.mergedWith(
     customization: BlazeReactStoryChips?,
 ): StoryPlayerItemChipsTheme {