react-native-firework-sdk 1.1.0 → 1.2.0-beta.10

package/android/src/main/java/com/fireworksdk/bridge/reactnative/utils/FWDataUtils.kt

@@ -0,0 +1,119 @@
+package com.fireworksdk.bridge.reactnative.utils
+import com.facebook.react.bridge.*
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+
+
+object FWDataUtils {
+
+  @Throws(JSONException::class)
+  fun convertJsonObjectToWritableMap(jsonObject: JSONObject?): WritableMap? {
+    if (jsonObject == null) {
+      return null
+    }
+    val map: WritableMap = WritableNativeMap()
+    val iterator = jsonObject.keys()
+    while (iterator.hasNext()) {
+      val key = iterator.next()
+      when (val value = jsonObject[key]) {
+          is JSONObject -> {
+            map.putMap(key, convertJsonObjectToWritableMap(value))
+          }
+        is JSONArray -> {
+          map.putArray(key, convertJsonObjectToWritableArray(value))
+        }
+        is Boolean -> {
+          map.putBoolean(key, value)
+        }
+        is Int -> {
+          map.putInt(key, value)
+        }
+        is Double -> {
+          map.putDouble(key, value)
+        }
+        is String -> {
+          map.putString(key, value)
+        }
+        else -> {
+          map.putString(key, value.toString())
+        }
+      }
+    }
+    return map
+  }
+
+  @Throws(JSONException::class)
+  fun convertJsonObjectToWritableArray(jsonArray: JSONArray?): WritableArray? {
+    if (jsonArray == null) {
+      return null
+    }
+    val array: WritableArray = WritableNativeArray()
+    for (i in 0 until jsonArray.length()) {
+      when (val value = jsonArray[i]) {
+          is JSONObject -> {
+            array.pushMap(convertJsonObjectToWritableMap(value))
+          }
+        is JSONArray -> {
+          array.pushArray(convertJsonObjectToWritableArray(value))
+        }
+        is Boolean -> {
+          array.pushBoolean(value)
+        }
+        is Int -> {
+          array.pushInt(value)
+        }
+        is Double -> {
+          array.pushDouble(value)
+        }
+        is String -> {
+          array.pushString(value)
+        }
+        else -> {
+          array.pushString(value.toString())
+        }
+      }
+    }
+    return array
+  }
+
+  @Throws(JSONException::class)
+  fun convertReadableMapToJsonObject(readableMap: ReadableMap?): JSONObject? {
+    if (readableMap == null) {
+      return null
+    }
+    val `object` = JSONObject()
+    val iterator = readableMap.keySetIterator()
+    while (iterator.hasNextKey()) {
+      val key = iterator.nextKey()
+      when (readableMap.getType(key)) {
+        ReadableType.Null -> `object`.put(key, JSONObject.NULL)
+        ReadableType.Boolean -> `object`.put(key, readableMap.getBoolean(key))
+        ReadableType.Number -> `object`.put(key, readableMap.getDouble(key))
+        ReadableType.String -> `object`.put(key, readableMap.getString(key))
+        ReadableType.Map -> `object`.put(key, convertReadableMapToJsonObject(readableMap.getMap(key)))
+        ReadableType.Array -> `object`.put(key, convertReadableArrayToJsonObject(readableMap.getArray(key)))
+      }
+    }
+    return `object`
+  }
+
+  @Throws(JSONException::class)
+  fun convertReadableArrayToJsonObject(readableArray: ReadableArray?): JSONArray? {
+    if (readableArray == null) {
+      return null
+    }
+    val array = JSONArray()
+    for (i in 0 until readableArray.size()) {
+      when (readableArray.getType(i)) {
+        ReadableType.Null -> {}
+        ReadableType.Boolean -> array.put(readableArray.getBoolean(i))
+        ReadableType.Number -> array.put(readableArray.getDouble(i))
+        ReadableType.String -> array.put(readableArray.getString(i))
+        ReadableType.Map -> array.put(convertReadableMapToJsonObject(readableArray.getMap(i)))
+        ReadableType.Array -> array.put(convertReadableArrayToJsonObject(readableArray.getArray(i)))
+      }
+    }
+    return array
+  }
+}

package/android/src/main/java/com/fireworksdk/bridge/reactnative/utils/FWEventUtils.kt

@@ -1,15 +1,52 @@
 package com.fireworksdk.bridge.reactnative.utils
 
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.bridge.WritableMap
+import android.util.Log
+import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.facebook.react.uimanager.events.RCTEventEmitter
 import com.fireworksdk.bridge.models.*
+import com.fireworksdk.bridge.reactnative.FWInitializationProvider
+import com.fireworksdk.bridge.reactnative.module.FireworkSDKModule
+import com.fireworksdk.bridge.reactnative.pages.FWContainerActivity
+import com.fireworksdk.bridge.utils.FWDateUtils
+import com.fireworksdk.bridge.utils.FWLogUtils
 import com.loopnow.fireworklibrary.data.Product
+import java.util.*
 
 object FWEventUtils {
 
+  fun pushNativeContainer(reactContext: ReactContext, props: ReadableMap?, promise: Promise?) {
+    FWLogUtils.d { "FWNavigatorModule pushNativeContainer: $props" }
+    val activity = FWInitializationProvider.INSTANCE.resumedActivity
+
+    if (activity == null) {
+      promise?.resolve(false)
+      return
+    }
+
+    sendLogMessageEvent(reactContext, "[Android] Enter pushNativeContainer ${
+      FWDateUtils.getDateString(
+        Date()
+      )}")
+
+    UiThreadUtil.runOnUiThread {
+
+      sendLogMessageEvent(reactContext, "[Android] Before Starting container activity ${
+        FWDateUtils.getDateString(
+          Date()
+        )}")
+
+      activity.startActivity(FWContainerActivity.createIntent(activity, FireworkSDKModule.appComponentName, props?.toHashMap()))
+
+      sendLogMessageEvent(reactContext, "[Android] After Starting container activity ${
+        FWDateUtils.getDateString(
+          Date()
+        )}")
+    }
+
+    promise?.resolve(true)
+  }
+
   fun sendInitSuccessEvent(reactContext: ReactContext) {
     sendEvent(reactContext, FWEventName.SDKIni.rawValue, Arguments.createMap())
   }
@@ -109,6 +146,16 @@ object FWEventUtils {
       .emit(eventName, params)
   }
 
+  fun sendLogMessageEvent(reactContext: ReactContext, message: String?) {
+    FWLogUtils.d { message }
+
+    if (Log.DEBUG >= FWLogUtils.logLevel) {
+      val eventMap = Arguments.createMap()
+      eventMap.putString("message", message)
+      sendEvent(reactContext, FWEventName.LogMessage.rawValue, eventMap)
+    }
+  }
+
   fun receiveVideoFeedLoadFinishedSuccessEvent(reactContext: ReactContext, targetTag: Int) {
     receiveEvent(reactContext, targetTag, FWFeedViewEventName.VideoFeedLoadFinished.rawValue, null)
   }

package/android/src/main/java/com/fireworksdk/bridge/utils/FWBundleUtils.kt

@@ -0,0 +1,86 @@
+package com.fireworksdk.bridge.utils
+
+import android.os.Bundle
+import android.os.Parcelable
+
+
+object FWBundleUtils {
+
+  fun mapToBundle(map: Map<String, Any?>?): Bundle? {
+    if (map == null) {
+      return null
+    }
+    val bundle = Bundle()
+    for ((key, value) in map) {
+      if (value is Double) {
+        bundle.putDouble(key, value)
+      } else if (value is Int) {
+        bundle.putInt(key, value)
+      } else if (value is String) {
+        bundle.putString(key, value)
+      } else if (value is Boolean) {
+        bundle.putBoolean(key, value)
+      } else if (value is List<*>) {
+        val list = value as List<Any>
+        val first = list[0]
+        if (first == null || first is Double) {
+          bundle.putDoubleArray(key, listToDoubleArray(list))
+        } else if (first is Int) {
+          bundle.putIntArray(key, listToIntArray(list))
+        } else if (first is String) {
+          bundle.putStringArray(key, listToStringArray(list))
+        } else if (first is Map<*, *>) {
+          bundle.putParcelableArrayList(key, listToParcelableArrayList(list))
+        }
+      } else if (value is Map<*, *>) {
+        bundle.putBundle(key, mapToBundle(value as Map<String, Any>))
+      }
+    }
+    return bundle
+  }
+
+  private fun listToDoubleArray(list: List<Any>?): DoubleArray? {
+    if (list == null) {
+      return null
+    }
+    val doubles = DoubleArray(list.size)
+    for (i in list.indices) {
+      doubles[i] = list[i] as Double
+    }
+    return doubles
+  }
+
+  private fun listToIntArray(list: List<Any>?): IntArray? {
+    if (list == null) {
+      return null
+    }
+    val integers = IntArray(list.size)
+    for (i in list.indices) {
+      integers[i] = list[i] as Int
+    }
+    return integers
+  }
+
+  private fun listToStringArray(list: List<Any>?): Array<String?>? {
+    if (list == null) {
+      return null
+    }
+    val strings = arrayOfNulls<String>(list.size)
+    for (i in list.indices) {
+      strings[i] = list[i].toString()
+    }
+    return strings
+  }
+
+  private fun listToParcelableArrayList(list: List<Any>?): ArrayList<Parcelable?>? {
+    if (list == null) {
+      return null
+    }
+    val arrayList: ArrayList<Parcelable?> = ArrayList()
+    for (item in list) {
+      val map = item as Map<String, Any>
+      arrayList.add(mapToBundle(map))
+    }
+    return arrayList
+  }
+}

package/android/src/main/java/com/fireworksdk/bridge/utils/FWDateUtils.kt

@@ -0,0 +1,15 @@
+package com.fireworksdk.bridge.utils
+
+import org.jetbrains.annotations.NotNull
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.*
+
+object FWDateUtils {
+
+  fun getDateString(@NotNull date: Date): String {
+    val dateFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.getDefault())
+    dateFormat.timeZone = TimeZone.getDefault()
+    return dateFormat.format(date)
+  }
+}

package/android/src/main/java/com/fireworksdk/bridge/utils/FWVideoPlayerUtils.kt

@@ -1,5 +1,6 @@
 package com.fireworksdk.bridge.utils
 
+import android.content.Context
 import android.graphics.Color
 import com.loopnow.fireworklibrary.VideoPlayerProperties
 import com.fireworksdk.bridge.constants.FWVideoPlayerConstant
@@ -44,7 +45,11 @@ object FWVideoPlayerUtils {
     }
   }
 
-  fun setPlaylistGroupFeedConfig(feedView: PlaylistGroupFeedView?, config: FWVideoFeedConfigModel?) {
+  fun setPlaylistGroupFeedConfig(context: Context, feedView: PlaylistGroupFeedView?, config: FWVideoFeedConfigModel?) {
+    config?.customLayoutName?.let {
+      val layout = context.resources.getIdentifier(it, "layout", context.packageName)
+      feedView?.setCustomLayout(layout)
+    }
     val backgroundColor = config?.backgroundColor
     if (!backgroundColor.isNullOrBlank()) {
       feedView?.setBackgroundColor(Color.parseColor(backgroundColor))
@@ -62,7 +67,12 @@ object FWVideoPlayerUtils {
     VideoFeedProperties.displayAdLabel = config?.showAdBadge == true
   }
 
-  fun setVideoFeedConfig(feedView: VideoFeedView?, config: FWVideoFeedConfigModel?) {
+  fun setVideoFeedConfig(context: Context, feedView: VideoFeedView?, config: FWVideoFeedConfigModel?) {
+    config?.customLayoutName?.let {
+      val layout = context.resources.getIdentifier(it, "layout", context.packageName)
+      feedView?.setCustomLayout(layout)
+    }
+
     val backgroundColor = config?.backgroundColor
     if (!backgroundColor.isNullOrBlank()) {
       feedView?.setBackgroundColor(Color.parseColor(backgroundColor))

package/android/src/main/res/layout/fw_bridge_fragment_container.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/fw_bridge_container"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>

package/ios/Components/VideoFeed.swift

@@ -31,7 +31,7 @@ public enum VideoFeedMode: Int {
 
 @objc
 public enum VideFeedSourceType: Int {
-    case discover, channel, playlist, playlistGroup
+    case discover, channel, playlist, playlistGroup, dynamicContent
 }
 
 public protocol VideoFeedViewDelegate: AnyObject {
@@ -48,6 +48,7 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
     @objc public var channel: String = ""
     @objc public var playlist: String = ""
     @objc public var playlistGroup: String = ""
+    @objc public var dynamicContentParameters: NSDictionary = NSDictionary()
     @objc public var mode: VideoFeedMode = .row
     @objc public var feedViewConfig: VideoFeedConfiguration? {
         didSet {
@@ -81,6 +82,9 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
             return .channelPlaylist(channelID: channel, playlistID: playlist)
         case .playlistGroup:
             return .playlistGroup(groupID: playlistGroup)
+        case .dynamicContent:
+            let parameters = dynamicContentParameters as? [String: [String]]
+            return .dynamicContent(channelID: channel, parameters: parameters ?? [:])
         }
     }
     
@@ -153,28 +157,6 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
 }
 
 extension VideoFeed {
-    private func convertToFWAdBadgeConfiguration(_ adBadgeConfiguration: AdBadgeConfiguration?) -> FireworkVideo.AdBadgeConfiguration? {
-        guard let adBadgeConfiguration = adBadgeConfiguration else {
-            return nil
-        }
-        
-        var fwAdBadgeConfiguration = FireworkVideo.AdBadgeConfiguration()
-        if let textColor = adBadgeConfiguration.textColor {
-            fwAdBadgeConfiguration.textColor = textColor.uicolor()
-        }
-        if let backgroundColor = adBadgeConfiguration.backgroundColor {
-            fwAdBadgeConfiguration.backgroundColor = backgroundColor.uicolor()
-        }
-        switch adBadgeConfiguration.badgeTextType {
-            case .sponsored:
-                fwAdBadgeConfiguration.badgeText = FireworkVideo.AdBadgeConfiguration.BadgeText.sponsored
-            default:
-                fwAdBadgeConfiguration.badgeText = FireworkVideo.AdBadgeConfiguration.BadgeText.ad
-        }
-        
-        return fwAdBadgeConfiguration
-    }
-    
     private func convertToVideoFeedConentConfiguration() -> VideoFeedContentConfiguration {
         var videoConfig = VideoFeedContentConfiguration()
         //set default value so that behavior will the same with Android
@@ -196,8 +178,7 @@ extension VideoFeed {
         if let shareBaseUrl = gShareBaseURL {
             videoConfig.playerView.shareButton.behavior.baseURL = URL(string:shareBaseUrl)
         }
-        let adBadge = self.convertToFWAdBadgeConfiguration(gAdBadgeConfiguration)
-        if let adBadge = adBadge  {
+        if let adBadge = FireworkSDKModule.convertToFWAdBadgeConfiguration(gAdBadgeConfiguration)  {
             videoConfig.adBadge = adBadge
         }
         

package/ios/Components/VideoFeedManager.m

@@ -22,6 +22,7 @@ RCT_CUSTOM_VIEW_PROPERTY(source, VideFeedSourceType, VideoFeed) {
 RCT_EXPORT_VIEW_PROPERTY(channel, NSString)
 RCT_EXPORT_VIEW_PROPERTY(playlist, NSString)
 RCT_EXPORT_VIEW_PROPERTY(playlistGroup, NSString)
+RCT_EXPORT_VIEW_PROPERTY(dynamicContentParameters, NSDictionary)
 
 RCT_CUSTOM_VIEW_PROPERTY(mode, VideoFeedMode, VideoFeed) {
     if (json) {