@wscsports/blaze-rtn-sdk 0.2.5 → 0.3.0

package/android/build.gradle

@@ -48,14 +48,18 @@ android {
         disable 'GradleCompatible'
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
+    def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+    if (agpVersion.tokenize('.')[0].toInteger() < 8) {
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_11
+            targetCompatibility JavaVersion.VERSION_11
+        }
 
-    kotlinOptions {
-        jvmTarget = '1.8'
+        kotlinOptions {
+            jvmTarget = JavaVersion.VERSION_11.majorVersion
+        }
     }
+
     buildFeatures {
         buildConfig = true
     }
@@ -64,20 +68,6 @@ android {
 repositories {
     google()
     mavenCentral()
-    maven {
-        name = "GitHubPackages"
-        url = uri("https://maven.pkg.github.com/WSCSports/blaze-android-release")
-        credentials {
-            /** you can add to gradle.properties the following keys
-             ** gprUsr=GITHUB_USER_ID & gprKey=PERSONAL_ACCESS_TOKEN
-             * GITHUB_USER_ID is your github user
-             * PERSONAL_ACCESS_TOKEN is your github personal token
-             **/
-
-            username = "$gprUsr" ?: System.getenv("GPR_USER")
-            password = "$gprKey" ?: System.getenv("GPR_API_KEY")
-        }
-    }
 }
 
 dependencies {
@@ -86,6 +76,6 @@ dependencies {
     // noinspection GradleDynamicVersion
     api 'com.facebook.react:react-native:+'
 
-    def blazeSDK = '0.70.1'
+    def blazeSDK = '0.90.0'
     implementation group: "com.blaze", name: "blazesdk", version: "${blazeSDK}"
 }

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.blaze.rtnblazesdk">
+    >
 
 </manifest>

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

@@ -1,16 +1,12 @@
 package com.blaze.rtnblazesdk
 
 import com.blaze.rtnblazesdk.base.BaseViewManager
-import com.blaze.rtnblazesdk.events.WidgetDataLoadCompletedEvent
-import com.blaze.rtnblazesdk.events.WidgetDataLoadStartedEvent
 import com.blaze.rtnblazesdk.moments.BlazeGridViewManagerImp
 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
 import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.ThemedReactContext
@@ -21,8 +17,7 @@ import com.facebook.react.uimanager.annotations.ReactProp
 @ReactModule(name = BlazeGridViewManagerImp.NAME)
 class BlazeMomentsGridViewManager(
     context: ReactApplicationContext?
-) :
-    BaseViewManager<BlazeMomentsGridView>(context),
+) : BaseViewManager<BlazeMomentsGridView>(context),
     RTNBlazeMomentsGridViewManagerInterface<BlazeMomentsGridView?> {
     private val mDelegate: ViewManagerDelegate<BlazeMomentsGridView>
 
@@ -43,23 +38,6 @@ class BlazeMomentsGridViewManager(
         return view
     }
 
-    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)
 
@@ -72,7 +50,7 @@ class BlazeMomentsGridViewManager(
 
     @ReactProp(name = "dataSource")
     override fun setDataSource(view: BlazeMomentsGridView?, value: ReadableMap?) {
-        view?.dataSource = value
+        view?.setDataSourceTypeFromMap(value)
     }
 
     @ReactProp(name = "presetTheme")
@@ -92,12 +70,17 @@ class BlazeMomentsGridViewManager(
 
     @ReactProp(name = "blazeWidgetLayout")
     override fun setBlazeWidgetLayout(view: BlazeMomentsGridView?, value: ReadableMap?) {
-        view?.reactWidgetLayout = value
+        view?.reactWidgetLayoutStyleMap = value
     }
 
     @ReactProp(name = "blazePlayerMomentTheme")
     override fun setBlazePlayerMomentTheme(view: BlazeMomentsGridView?, value: ReadableMap?) {
-        view?.reactPlayerMomentsTheme = value
+        view?.reactWidgetThemeMap = value
+    }
+
+    @ReactProp(name = "shouldOrderMomentsByReadStatus")
+    override fun setShouldOrderMomentsByReadStatus(view: BlazeMomentsGridView?, value: Boolean) {
+        view?.shouldOrderMomentsByReadStatus = value
     }
 
 }

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

@@ -1,16 +1,12 @@
 package com.blaze.rtnblazesdk
 
 import com.blaze.rtnblazesdk.base.BaseViewManager
-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.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
 import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.ThemedReactContext
@@ -39,23 +35,6 @@ class BlazeMomentsRowViewManager(context: ReactApplicationContext?) :
         return BlazeRowViewManagerImp.createViewInstance(context)
     }
 
-    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) {
         super.updateProperties(viewToUpdate, props)
         viewToUpdate.onPropsUpdate(props)
@@ -63,7 +42,7 @@ class BlazeMomentsRowViewManager(context: ReactApplicationContext?) :
 
     @ReactProp(name = "dataSource")
     override fun setDataSource(view: BlazeMomentsRowView?, value: ReadableMap?) {
-        view?.dataSource = value
+        view?.setDataSourceTypeFromMap(value)
     }
 
     @ReactProp(name = "presetTheme")
@@ -78,12 +57,17 @@ class BlazeMomentsRowViewManager(context: ReactApplicationContext?) :
 
     @ReactProp(name = "blazeWidgetLayout")
     override fun setBlazeWidgetLayout(view: BlazeMomentsRowView?, value: ReadableMap?) {
-        view?.reactWidgetLayout = value
+        view?.reactWidgetLayoutStyleMap = value
     }
 
     @ReactProp(name = "blazePlayerMomentTheme")
     override fun setBlazePlayerMomentTheme(view: BlazeMomentsRowView?, value: ReadableMap?) {
-        view?.reactPlayerMomentsTheme = value
+        view?.reactWidgetThemeMap = value
+    }
+
+    @ReactProp(name = "shouldOrderMomentsByReadStatus")
+    override fun setShouldOrderMomentsByReadStatus(view: BlazeMomentsRowView?, value: Boolean) {
+        view?.shouldOrderMomentsByReadStatus = value
     }
 
 }

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

@@ -1,57 +1,316 @@
 package com.blaze.rtnblazesdk
 
+import android.util.Log
+import com.blaze.blazesdk.BlazeSDK
+import com.blaze.blazesdk.core.analytics.models.BlazeAnalyticsEvent
+import com.blaze.blazesdk.core.delegates.BlazePlayerEntryPointDelegate
+import com.blaze.blazesdk.core.delegates.BlazePlayerType
+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.models.ui.BlazeLinkActionHandleType
+import com.blaze.blazesdk.features.stories.theme.player.StoryPlayerTheme
+import com.blaze.blazesdk.features.widgets.shared.BlazeGlobalDelegate
+import com.blaze.rtnblazesdk.events.SdkModuleJsEvent
+import com.blaze.rtnblazesdk.utils.extractDataSource
+import com.blaze.rtnblazesdk.utils.extractMomentsPlayerTheme
+import com.blaze.rtnblazesdk.utils.extractStoriesPlayerTheme
+import com.blaze.rtnblazesdk.utils.handleResult
+import com.blaze.rtnblazesdk.utils.rejectWith
+import com.facebook.react.bridge.NoSuchKeyException
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
 
-class BlazeSdkModule(context: ReactApplicationContext) : NativeBlazeSdkSpec(context) {
-    private val implementation: BlazeSdkModuleImp
+class BlazeSdkModule(private val context: ReactApplicationContext): NativeBlazeSdkSpec(context) {
 
-    init {
-        implementation = BlazeSdkModuleImp(context)
+    private val reactNativeSDKHelper = BlazeReactSDKHelper()
+    private var appOverridesCTAHandling: Boolean = false
+
+    private var globalStoryPlayerTheme: StoryPlayerTheme? = null
+    private var globalMomentPlayerTheme: MomentPlayerTheme? = null
+
+    private val globalDelegate = object : BlazeGlobalDelegate {
+        override fun onErrorThrown(error: BlazeResult.Error) {
+            val event = SdkModuleJsEvent.ErrorThrown(error)
+            sendJsEvent(event)
+        }
+
+        override fun onEventTriggered(eventData: BlazeAnalyticsEvent) {
+            val event = SdkModuleJsEvent.AnalyticEventTriggered(eventData)
+            sendJsEvent(event)
+        }
+    }
+
+    private val playerEntryPointDelegate = object : BlazePlayerEntryPointDelegate {
+        override fun onDataLoadComplete(
+            playerType: BlazePlayerType,
+            sourceId: String?,
+            itemsCount: Int,
+            result: BlazeResult<Unit>
+        ) {
+            val event = SdkModuleJsEvent.DataLoadCompleted(playerType, sourceId, itemsCount, result)
+            sendJsEvent(event)
+        }
+
+        override fun onDataLoadStarted(playerType: BlazePlayerType, sourceId: String?) {
+            val event = SdkModuleJsEvent.DataLoadStarted(playerType, sourceId)
+            sendJsEvent(event)
+        }
+
+        override fun onPlayerDidAppear(playerType: BlazePlayerType, sourceId: String?) {
+            val event = SdkModuleJsEvent.PlayerDidAppear(playerType, sourceId)
+            sendJsEvent(event)
+        }
+
+        override fun onPlayerDidDismiss(playerType: BlazePlayerType, sourceId: String?) {
+            val event = SdkModuleJsEvent.PlayerDidDismiss(playerType, sourceId)
+            sendJsEvent(event)
+        }
+
+        override fun onTriggerCTA(
+            playerType: BlazePlayerType,
+            sourceId: String?,
+            actionType: String,
+            actionParam: String
+        ): Boolean {
+            val event = SdkModuleJsEvent.TriggerCTA(playerType, sourceId, actionType, actionParam)
+            sendJsEvent(event)
+            return appOverridesCTAHandling
+        }
+
+        override fun onTriggerPlayerBodyTextLink(
+            playerType: BlazePlayerType,
+            sourceId: String?,
+            actionParam: String
+        ): BlazeLinkActionHandleType {
+            val event = SdkModuleJsEvent.TriggerPlayerBodyTextLink(playerType, sourceId, actionParam)
+            sendJsEvent(event)
+            return BlazeLinkActionHandleType.DEEPLINK
+        }
     }
 
-    override fun getName(): String {
-        return BlazeSdkModuleImp.NAME
+    init {
+        BlazeExternalModulesBinder.reactNativeSDKHelper = reactNativeSDKHelper
     }
 
     override fun init(options: ReadableMap, promise: Promise) {
-        implementation.init(options, promise)
+        val reactStoryPlayerTheme = options.getMap(KEY_INIT_GLOBAL_STORY_PLAYER_THEME)
+        val reactMomentPlayerTheme = options.getMap(KEY_INIT_GLOBAL_MOMENT_PLAYER_THEME)
+
+        val storyPlayerTheme = reactStoryPlayerTheme.extractStoriesPlayerTheme(context).also {
+            globalStoryPlayerTheme = it
+        }
+        val momentPlayerTheme = reactMomentPlayerTheme.extractMomentsPlayerTheme(context).also {
+            globalMomentPlayerTheme = it
+        }
+
+        try {
+            setAppOverrideCtaHandling(options)
+            BlazeSDK.init(
+                apiKey = options.getString(KEY_INIT_API_KEY)!!,
+                externalUserId = options.getString(KEY_INIT_EXTERNAL_USER_ID),
+                geoLocation = options.getString(KEY_INIT_GEO_LOCATION),
+                cachingSize = options.getInt(KEY_INIT_CACHING_SIZE),
+                globalStoryAppearanceLayout = storyPlayerTheme,
+                globalMomentsAppearanceTheme = momentPlayerTheme,
+                cachingLevel = CachingLevel.DEFAULT,
+                completionBlock = {
+                    promise.resolve(BlazeResult.Success(true).toString())
+                },
+                errorBlock = { e: BlazeResult.Error ->
+                    promise.handleResult(e)
+                },
+                globalDelegate = globalDelegate,
+                playerEntryPointDelegate = playerEntryPointDelegate,
+            )
+        } catch (e: Exception) {
+            promise.reject("BlazeSDK", e.toString())
+            Log.e("BlazeSdkModuleImp", "init: Exception - $e")
+        }
+    }
+
+    private fun setAppOverrideCtaHandling(options: ReadableMap) {
+        // getBoolean can throw exception while getString will return null if no such key
+        try {
+            appOverridesCTAHandling = options.getBoolean(KEY_INIT_APP_OVERRIDES_CTA_HANDLING)
+        } catch(e: NoSuchKeyException) {
+            Log.e("BlazeSdkModuleImp", "setAppOverrideCtaHandling: NoSuchKeyException - ${e.message}")
+        }
+    }
+
+    private fun sendJsEvent(event: SdkModuleJsEvent) {
+        context.emitDeviceEvent(event.eventName, event.params)
     }
 
     override fun playStory(options: ReadableMap, promise: Promise) {
-        implementation.playStory(options, promise)
+        try {
+            val storyId = options.getString(KEY_STORY_OPT_STORY_ID) ?: run {
+                promise.rejectWith("no story id")
+                return
+            }
+
+            val pageId = options.getString(KEY_STORY_OPT_PAGE_ID)
+            val playerTheme = options.getMap(KEY_ENTRY_POINT_PLAYER_THEME)
+                .extractStoriesPlayerTheme(context, defaultTheme = globalStoryPlayerTheme)
+            BlazeSDK.playStory(
+                storyId = storyId,
+                pageId = pageId,
+                storyPlayerTheme = playerTheme
+            ) { result ->
+                promise.handleResult(result)
+            }
+        } catch (e: Exception) {
+            promise.reject("BlazeSDK", e.toString())
+        }
     }
 
     override fun playMoment(options: ReadableMap, promise: Promise) {
-        implementation.playMoment(options, promise)
+
+        try {
+            val momentId = options.getString(KEY_STORY_OPT_MOMENT_ID) ?: run {
+                promise.rejectWith("no moment id")
+                return
+            }
+
+            val playerTheme = options.getMap(KEY_ENTRY_POINT_PLAYER_THEME)
+                .extractMomentsPlayerTheme(context, defaultTheme = globalMomentPlayerTheme)
+            BlazeSDK.playMoment(
+                momentId = momentId,
+                momentPlayerTheme = playerTheme) { result ->
+                promise.handleResult(result)
+            }
+        } catch (e: Exception) {
+            promise.rejectWith(e.toString())
+        }
+    }
+
+    override 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")
+                return
+            }
+            BlazeSDK.prepareStories(dataSource) { result ->
+                promise.handleResult(result)
+            }
+        } catch (e: Exception) {
+            promise.rejectWith(e.toString())
+        }
+
+    }
+
+    override 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())
+        }
     }
 
+
     override fun dismissPlayer(promise: Promise) {
-        implementation.dismissPlayer(promise)
+        BlazeSDK.dismissPlayer()
+        promise.resolve(true)
     }
 
     override fun isInitialized(): Boolean {
-        return implementation.isInitialized()
+        return BlazeSDK.isInitialized()
     }
 
     override fun setExternalUserId(externalUserId: String?, promise: Promise) {
-        return implementation.setExternalUserId(externalUserId, promise)
+        BlazeSDK.setExternalUserId(externalUserId) { result ->
+            promise.handleResult(result)
+        }
     }
 
-    override fun playMoments(options: ReadableMap, promise: Promise) {
-        return implementation.playMoments(options, promise)
+    override fun setDoNotTrack(doNotTrack: Boolean, promise: Promise) {
+        BlazeSDK.setDoNotTrack(doNotTrack)
+        promise.resolve(doNotTrack)
     }
 
-    override fun setDoNotTrack(doNotTrackUser: Boolean, promise: Promise) {
-        return implementation.setDoNotTrack(doNotTrackUser, promise)
+    override 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")
+                return
+            }
+
+            val playerTheme = options.getMap(KEY_ENTRY_POINT_PLAYER_THEME)
+                .extractStoriesPlayerTheme(context, defaultTheme = globalStoryPlayerTheme)
+            BlazeSDK.playStories(
+                dataSource = dataSource,
+                storyPlayerTheme = playerTheme) { result ->
+                promise.handleResult(result)
+            }
+        } catch (e: Exception) {
+            promise.rejectWith(e.toString())
+        }
+    }
+
+    override 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
+            }
+
+            val playerTheme = options.getMap(KEY_ENTRY_POINT_PLAYER_THEME)
+                .extractMomentsPlayerTheme(context, defaultTheme = globalMomentPlayerTheme)
+            BlazeSDK.playMoments(
+                dataSource = dataSource,
+                momentsPlayerTheme = playerTheme) { result ->
+                promise.handleResult(result)
+            }
+        } catch (e: Exception) {
+            promise.rejectWith(e.toString())
+        }
     }
 
     override fun handleUniversalLink(link: String, promise: Promise) {
-        return implementation.handleUniversalLink(link, promise)
+        try {
+            BlazeSDK.handleUniversalLink(link){ result ->
+                promise.handleResult(result)
+            }
+        } catch (e: Exception) {
+            promise.rejectWith(e.toString())
+        }
     }
 
     override fun updateGeoRestriction(geoLocation: String?, promise: Promise) {
-        return implementation.updateGeoRestriction(geoLocation, promise)
+        val updatedGeoLocation = if (geoLocation.isNullOrEmpty()) null else geoLocation
+        try {
+            BlazeSDK.updateGeoRestriction(updatedGeoLocation){ result ->
+                promise.handleResult(result)
+            }
+        } catch (e: Exception) {
+            promise.rejectWith(e.toString())
+        }
     }
+
+    companion object {
+
+        const val KEY_INIT_API_KEY = "apiKey"
+        const val KEY_INIT_EXTERNAL_USER_ID = "externalUserId"
+        const val KEY_INIT_GEO_LOCATION = "geoLocation"
+        const val KEY_INIT_CACHING_SIZE = "cachingSize"
+        const val KEY_INIT_APP_OVERRIDES_CTA_HANDLING = "appOverridesCTAHandling"
+        const val KEY_INIT_GLOBAL_STORY_PLAYER_THEME = "globalPlayerStoryTheme"
+        const val KEY_INIT_GLOBAL_MOMENT_PLAYER_THEME = "globalPlayerMomentTheme"
+        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_ENTRY_POINT_DATA_SOURCE = "dataSource"
+        const val KEY_ENTRY_POINT_PLAYER_THEME = "playerTheme"
+
+    }
+
+
 }

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

@@ -6,7 +6,6 @@ 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
@@ -23,23 +22,6 @@ 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)
     }
@@ -69,7 +51,7 @@ class BlazeStoriesGridViewManager(
 
     @ReactProp(name = "dataSource")
     override fun setDataSource(view: BlazeStoriesGridView?, value: ReadableMap?) {
-        view?.dataSource = value
+        view?.setDataSourceTypeFromMap(value)
     }
 
     @ReactProp(name = "presetTheme")
@@ -89,12 +71,12 @@ class BlazeStoriesGridViewManager(
 
     @ReactProp(name = "blazeWidgetLayout")
     override fun setBlazeWidgetLayout(view: BlazeStoriesGridView?, value: ReadableMap?) {
-        view?.reactWidgetLayout = value
+        view?.reactWidgetLayoutStyleMap = value
     }
 
     @ReactProp(name = "blazePlayerStoryTheme")
     override fun setBlazePlayerStoryTheme(view: BlazeStoriesGridView?, value: ReadableMap?) {
-        view?.reactPlayerStoryTheme = value
+        view?.reactWidgetThemeMap = value
     }
 
 

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

@@ -1,16 +1,12 @@
 package com.blaze.rtnblazesdk
 
 import com.blaze.rtnblazesdk.base.BaseViewManager
-import com.blaze.rtnblazesdk.events.WidgetDataLoadCompletedEvent
-import com.blaze.rtnblazesdk.events.WidgetDataLoadStartedEvent
 import com.blaze.rtnblazesdk.stories.BlazeRowViewManagerImp
 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
 import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.ThemedReactContext
@@ -23,24 +19,6 @@ 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)
     }
@@ -64,7 +42,7 @@ class BlazeStoriesRowViewManager(context: ReactApplicationContext?) :
 
     @ReactProp(name = "dataSource")
     override fun setDataSource(view: BlazeStoriesRowView?, value: ReadableMap?) {
-        view?.dataSource = value
+        view?.setDataSourceTypeFromMap(value)
     }
 
     @ReactProp(name = "presetTheme")
@@ -79,11 +57,11 @@ class BlazeStoriesRowViewManager(context: ReactApplicationContext?) :
 
     @ReactProp(name = "blazeWidgetLayout")
     override fun setBlazeWidgetLayout(view: BlazeStoriesRowView?, value: ReadableMap?) {
-        view?.reactWidgetLayout = value
+        view?.reactWidgetLayoutStyleMap = value
     }
 
     @ReactProp(name = "blazePlayerStoryTheme")
     override fun setBlazePlayerStoryTheme(view: BlazeStoriesRowView?, value: ReadableMap?) {
-        view?.reactPlayerStoryTheme = value
+        view?.reactWidgetThemeMap = value
     }
 }