react-native-spalla-player 0.19.0 → 0.19.1

package/android/build.gradle

@@ -109,7 +109,7 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "androidx.mediarouter:mediarouter:1.2.0"
-  implementation "stream.spalla:spalla-android-sdk:1.13.0"
+  implementation "stream.spalla:spalla-android-sdk:1.13.1"
   implementation "com.google.android.gms:play-services-cast-framework:21.3.0"
   implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.36.0'
 }

package/android/src/main/java/com/spallaplayer/SpallaPlayerContainerView.kt

@@ -2,10 +2,8 @@ package com.spallaplayer
 
 import android.content.Context
 import android.util.Log
-import android.widget.FrameLayout
 import com.spalla.sdk.android.core.player.view.SpallaPlayerView
 import android.view.ViewGroup;
-import androidx.core.view.isNotEmpty
 
 class SpallaPlayerContainerView(context: Context) : ViewGroup(context) {
     val spallaPlayerView: SpallaPlayerView = SpallaPlayerView(context)

package/android/src/main/java/com/spallaplayer/SpallaPlayerViewManager.kt

@@ -7,17 +7,36 @@ import androidx.core.app.PictureInPictureModeChangedInfo
 import androidx.core.util.Consumer
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactContext
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
-import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.uimanager.events.RCTEventEmitter
 import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent
-import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.*
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.AdBegin
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.AdBreakBegin
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.AdBreakEnd
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.AdEnd
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.AdError
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.DurationUpdate
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.Ended
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.Error
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.MetadataLoaded
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.Pause
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.PictureInPictureModeChanged
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.Play
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.PlaybackRateSelected
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.Playing
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.SubtitleSelected
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.SubtitlesAvailable
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.TimeUpdate
+import com.spalla.sdk.android.core.player.entities.SpallaPlayerEvent.Waiting
 import com.spalla.sdk.android.core.player.listeners.SpallaPlayerFullScreenListener
 import com.spalla.sdk.android.core.player.listeners.SpallaPlayerListener
 import com.spalla.sdk.android.core.player.view.SpallaPlayerView
+import com.spalla.sdk.android.domain.entities.AdsModel
 import java.util.Timer
 import java.util.TimerTask
 
@@ -36,6 +55,7 @@ class RNSpallaPlayerManager() : ViewGroupManager<SpallaPlayerContainerView>(),
   private var isPlaying: Boolean = false
   private var pipTriggered: Boolean = false
   private var customImaParams: Map<String, String>? = null
+  private var customAds: List<AdsModel>? = null
 
   override fun getName() = "RNSpallaPlayer"
 
@@ -64,8 +84,6 @@ class RNSpallaPlayerManager() : ViewGroupManager<SpallaPlayerContainerView>(),
 
   override fun createViewInstance(context: ThemedReactContext): SpallaPlayerContainerView {
     _reactContext = context
-    //context.addLifecycleEventListener(this)
-
     // Register this manager for direct PiP access
     SpallaPlayerPipModule.registerPlayerManager(this)
 
@@ -181,10 +199,33 @@ class RNSpallaPlayerManager() : ViewGroupManager<SpallaPlayerContainerView>(),
     this.customImaParams = customImaParams?.toHashMap()?.mapValues { it.value.toString() }
   }
 
+  @ReactProp(name = "customAds")
+  fun setCustomAds(view: SpallaPlayerContainerView, customAds: ReadableArray?) {
+    val ads = mutableListOf<AdsModel>()
+    customAds?.let {
+      for (i in 0 until it.size()) {
+        val adMap = it.getMap(i)
+        val url = adMap?.getString("url")
+        val offset = if (adMap?.hasKey("offset") == true) adMap.getString("offset") else null
+        if (url != null) {
+          ads.add(AdsModel(url = url, offset = offset))
+        }
+      }
+    }
+    this.customAds = ads.ifEmpty { null }
+  }
+
   private fun checkAndLoadPlayer(view: SpallaPlayerContainerView) {
     if (contentId != null && startTime != null && hideUI != null) {
       view.post {
-        view.spallaPlayerView.load(contentId!!, true, startTime!!, subtitle, hideUI!!, customImaParams)
+        view.spallaPlayerView.load(
+          contentId!!,
+          true,
+          startTime!!,
+          subtitle,
+          hideUI!!,
+          customImaParams,
+          customAds)
       }
     }
   }
@@ -192,7 +233,6 @@ class RNSpallaPlayerManager() : ViewGroupManager<SpallaPlayerContainerView>(),
   override fun onEvent(event: SpallaPlayerEvent) {
     val map: WritableMap = Arguments.createMap()
 
-    //Log.v("RNSpallaPlayerManager", "onEvent: $event")
     when (event) {
       is DurationUpdate -> {
         map.putString("event", "durationUpdate")

package/ios/RNSpallaPlayer.m

@@ -19,6 +19,8 @@ RCT_EXPORT_VIEW_PROPERTY(playbackRate, NSNumber)
 
 RCT_EXPORT_VIEW_PROPERTY(customImaParams, NSDictionary)
 
+RCT_EXPORT_VIEW_PROPERTY(customAds, NSArray)
+
 RCT_EXPORT_METHOD(play: (nonnull NSNumber *) reactTag {
   
   [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *,UIView *> *viewRegistry) {

package/ios/SpallaPlayerWrapper.swift

@@ -63,6 +63,22 @@ import SpallaSDK
     }
   }
   
+  @objc var customAds: NSArray? = nil {
+    didSet {
+      var ads: [SpallaSDK.AdsModel] = []
+      customAds?.forEach { element in
+        if let parsed = element as? [String: String] {
+          if let url = parsed["url"] {
+            ads.append(AdsModel(url: parsed["url"], offset: parsed["offset"]))
+          }
+        }
+      }
+      parsedAds = ads
+    }
+  }
+  
+  private var parsedAds: [AdsModel]? = nil
+  
   @objc var onPlayerEvent: RCTBubblingEventBlock?
   
   convenience public init() {
@@ -93,11 +109,11 @@ import SpallaSDK
   
   required init?(coder: NSCoder) {
     fatalError("init(coder:) has not been implemented")
-  }
+  } 
   
   func setupPlayer() {
     if let contentId {
-      viewController.setup(with: contentId, hideUI: hideUI, startTime: startTime.doubleValue, subtitle: subtitle, customImaParams: customImaParams ?? [:])
+      viewController.setup(with: contentId, hideUI: hideUI, startTime: startTime.doubleValue, subtitle: subtitle, customImaParams: customImaParams ?? [:], customAds: parsedAds ?? [])
     }
   }
   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-spalla-player",
-  "version": "0.19.0",
+  "version": "0.19.1",
   "description": "Spalla SDK for RN",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",

package/react-native-spalla-player.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
-  s.dependency "SpallaSDK", "~> 2.6.0"
+  s.dependency "SpallaSDK", "~> 2.6.2"
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.