react-native-spalla-player 0.13.3 → 1.0.1

package/LICENSE

@@ -1,7 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Taghos Tecnologia
-
+Copyright (c) 2025 Rogerio Shimizu
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
@@ -18,4 +17,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

package/SpallaPlayer.podspec

@@ -0,0 +1,22 @@
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::Spec.new do |s|
+  s.name         = "SpallaPlayer"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
+  s.authors      = package["author"]
+
+  s.platforms    = { :ios => min_ios_version_supported }
+  s.source       = { :git => "https://github.com/rojas/react-native-spalla-player.git", :tag => "#{s.version}" }
+
+  s.source_files = "ios/**/*.{h,m,mm,swift,cpp}"
+  s.private_header_files = "ios/**/*.h"
+
+  s.dependency "SpallaSDK", "~> 2.2.5"
+
+  install_modules_dependencies(s)
+end

package/android/build.gradle

@@ -1,6 +1,7 @@
 buildscript {
-  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["SpallaPlayer_kotlinVersion"]
+  ext.getExtOrDefault = {name ->
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['SpallaPlayer_' + name]
+  }
 
   repositories {
     google()
@@ -9,68 +10,33 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:8.7.3'
+    classpath "com.android.tools.build:gradle:8.7.2"
     // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
   }
 }
 
-def reactNativeArchitectures() {
-  def value = rootProject.getProperties().get("reactNativeArchitectures")
-  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
-}
-
-def isNewArchitectureEnabled() {
-  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
-}
-
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
-
-def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["SpallaPlayer_" + name]
-}
+apply plugin: "com.facebook.react"
 
 def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["SpallaPlayer_" + name]).toInteger()
 }
 
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-}
-
-
-def supportsNamespace() {
-  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
-  def major = parsed[0].toInteger()
-  def minor = parsed[1].toInteger()
-
-  // Namespace support was added in 7.3.0
-  return (major == 7 && minor >= 3) || major >= 8
-}
-
-
 android {
-  if (supportsNamespace()) {
-    namespace "com.spallaplayer"
-
-    sourceSets {
-      main {
-        manifest.srcFile "src/main/AndroidManifestNew.xml"
-      }
-    }
-  }
+  namespace "com.spallaplayer"
 
   compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
-    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+  }
+
+  buildFeatures {
+    buildConfig true
   }
 
   buildTypes {
@@ -79,10 +45,6 @@ android {
     }
   }
 
-  buildFeatures {
-    buildConfig = true
-  }
-
   lintOptions {
     disable "GradleCompatible"
   }
@@ -91,26 +53,28 @@ android {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+
+  sourceSets {
+    main {
+      java.srcDirs += [
+        "generated/java",
+        "generated/jni"
+      ]
+    }
+  }
 }
 
 repositories {
   mavenCentral()
   google()
-  maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-  maven { url 'https://maven.theoplayer.com/releases' }
 }
 
 def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
-  // For < 0.71, this will be from the local maven repo
-  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
-  //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-native:+"
+  implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "androidx.mediarouter:mediarouter:1.2.0"
-  implementation "stream.spalla:spalla-android-sdk:1.10.0"
+  implementation "stream.spalla:spalla-android-sdk:1.10.1"
   implementation "com.google.android.gms:play-services-cast-framework:21.3.0"
 }
-
-

package/android/gradle.properties

@@ -1,5 +1,5 @@
-SpallaPlayer_kotlinVersion=1.7.0
-SpallaPlayer_minSdkVersion=21
-SpallaPlayer_targetSdkVersion=31
-SpallaPlayer_compileSdkVersion=31
-SpallaPlayer_ndkversion=21.4.7075529
+SpallaPlayer_kotlinVersion=2.0.21
+SpallaPlayer_minSdkVersion=24
+SpallaPlayer_targetSdkVersion=34
+SpallaPlayer_compileSdkVersion=35
+SpallaPlayer_ndkVersion=27.1.12297006

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.spallaplayer">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

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

@@ -0,0 +1,19 @@
+package com.spallaplayer
+
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+// This class is a requirement for Fabric's eventing system.
+// It defines the shape and behavior of the events your component sends.
+class RNSpallaPlayerEvent(
+  surfaceId: Int,
+  viewTag: Int,
+  private val eventName1: String,
+  private val eventData: WritableMap?
+) : Event<RNSpallaPlayerEvent>(surfaceId, viewTag) {
+
+  override fun getEventName(): String = eventName1
+
+  override fun getEventData() = eventData
+}

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

@@ -1,193 +1,107 @@
 package com.spallaplayer
 
-import com.facebook.react.bridge.LifecycleEventListener
+import android.util.Log
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.UIManager
-import com.facebook.react.uimanager.NativeViewHierarchyManager
 import com.facebook.react.uimanager.UIManagerHelper
-import com.facebook.react.uimanager.UIManagerModule
 import com.facebook.react.uimanager.common.UIManagerType
 import com.spalla.sdk.android.core.SpallaSDK
 import com.spalla.sdk.android.core.player.view.SpallaPlayerView
 
+class SpallaPlayerModule(
+  val reactContext: ReactApplicationContext
+): ReactContextBaseJavaModule(reactContext) {
 
-class SpallaPlayerModule(reactContext: ReactApplicationContext) :
-  ReactContextBaseJavaModule(reactContext),
-  LifecycleEventListener {
-  private val _reactContext: ReactApplicationContext
-
-  init {
-    reactContext.addLifecycleEventListener(this)
-    _reactContext = reactContext
-  }
-
-  override fun getName(): String {
-    return "RNSpallaPlayer"
+  companion object {
+    val REACT_NAME: String = "SpallaPlayerModule"
   }
 
-  override fun onHostResume() {
-  }
-
-  override fun onHostPause() {
+  override fun getName() = REACT_NAME
 
+  @ReactMethod
+  fun play(tag: Double) {
+    reactContext.runOnUiQueueThread {
+      val view = getSpallaPlayerView(tag)
+      view?.play()
+    }
   }
 
-  override fun onHostDestroy() {
+  @ReactMethod
+  fun pause(tag: Double) {
+    reactContext.runOnUiQueueThread {
+      val view = getSpallaPlayerView(tag)
+      view?.pause()
+    }
   }
 
   @ReactMethod
-  fun play(tag: Int) {
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      val uiManager = UIManagerHelper.getUIManager(_reactContext, UIManagerType.FABRIC)
-      if (uiManager is UIManager) {
-        uiManager.resolveView(tag)?.let { view ->
-          if (view is SpallaPlayerContainerView) {
-            view.spallaPlayerView.play()
-          } else {
-            throw ClassCastException(
-              "Cannot play: view with tag #$tag is not a SpallaPlayerView"
-            )
-          }
-        }
-      }
-    } else {
-      val uiManager: UIManagerModule? =
-        _reactContext.getNativeModule(UIManagerModule::class.java)
-      uiManager?.prependUIBlock { nativeViewHierarchyManager: NativeViewHierarchyManager ->
-        val playerView = nativeViewHierarchyManager.resolveView(tag)
-        if (playerView is SpallaPlayerContainerView) {
-          playerView.spallaPlayerView.play()
-        } else {
-          throw ClassCastException(
-            String.format(
-              "Cannot play: view with tag #%d is not a SpallaPlayerView",
-              tag
-            )
-          )
-        }
-      }
+  fun seekTo(tag: Double, time: Double) {
+    reactContext.runOnUiQueueThread {
+      val view = getSpallaPlayerView(tag)
+      view?.seekTo(time)
     }
   }
 
   @ReactMethod
-  fun pause(tag: Int) {
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      val uiManager = UIManagerHelper.getUIManager(_reactContext, UIManagerType.FABRIC)
-      if (uiManager is UIManager) {
-        uiManager.resolveView(tag)?.let { view ->
-          if (view is SpallaPlayerContainerView) {
-            view.spallaPlayerView.pause()
-          } else {
-            throw ClassCastException(
-              "Cannot pause: view with tag #$tag is not a SpallaPlayerView"
-            )
-          }
-        }
-      }
-    } else {
-      val uiManager: UIManagerModule? =
-        _reactContext.getNativeModule(UIManagerModule::class.java)
-      uiManager?.prependUIBlock { nativeViewHierarchyManager: NativeViewHierarchyManager ->
-        val playerView = nativeViewHierarchyManager.resolveView(tag)
-        if (playerView is SpallaPlayerContainerView) {
-          playerView.spallaPlayerView.pause()
-        } else {
-          throw ClassCastException(
-            String.format(
-              "Cannot play: view with tag #%d is not a SpallaPplayerView",
-              tag
-            )
-          )
-        }
-      }
+  fun selectSubtitle(tag: Double, subtitle: String?) {
+    reactContext.runOnUiQueueThread {
+      val view = getSpallaPlayerView(tag)
+      view?.selectSubtitle(subtitle)
     }
-
-
   }
 
   @ReactMethod
-  fun seekTo(tag: Int, time: Double) {
-    _reactContext.getNativeModule(UIManagerModule::class.java)!!
-      .prependUIBlock { nativeViewHierarchyManager: NativeViewHierarchyManager ->
-        val playerView = nativeViewHierarchyManager.resolveView(tag)
-        if (playerView is SpallaPlayerContainerView) {
-          playerView.spallaPlayerView.seekTo(time)
-        } else {
-          throw ClassCastException(
-            String.format(
-              "Cannot play: view with tag #%d is not a SpallaPplayerView",
-              tag
-            )
-          )
-        }
-      }
+  fun selectPlaybackRate(tag: Double, rate: Double) {
+    reactContext.runOnUiQueueThread {
+      val view = getSpallaPlayerView(tag)
+      view?.selectPlaybackRate(rate)
+    }
   }
 
   @ReactMethod
-  fun selectSubtitle(tag: Int, subtitle: String?) {
-    _reactContext.getNativeModule(UIManagerModule::class.java)!!
-      .prependUIBlock { nativeViewHierarchyManager: NativeViewHierarchyManager ->
-        val playerView = nativeViewHierarchyManager.resolveView(tag)
-        if (playerView is SpallaPlayerContainerView) {
-          playerView.spallaPlayerView.selectSubtitle(subtitle)
-        } else {
-          throw ClassCastException(
-            String.format(
-              "Cannot play: view with tag #%d is not a SpallaPplayerView",
-              tag
-            )
-          )
-        }
-      }
+  fun unmount(tag: Double) {
+    try {
+      pause(tag)
+    } catch (e: Exception) {
+      Log.e("SpallaPlayerModule", "Error in unmount method", e)
+    }
   }
 
   @ReactMethod
-  fun selectPlaybackRate(tag: Int, rate: Double) {
-    _reactContext.getNativeModule(UIManagerModule::class.java)!!
-      .prependUIBlock { nativeViewHierarchyManager: NativeViewHierarchyManager ->
-        val playerView = nativeViewHierarchyManager.resolveView(tag)
-        if (playerView is SpallaPlayerContainerView) {
-          playerView.spallaPlayerView.selectPlaybackRate(rate)
-        } else {
-          throw ClassCastException(
-            String.format(
-              "Cannot play: view with tag #%d is not a SpallaPplayerView",
-              tag
-            )
-          )
-        }
+  fun initialize(token: String?, applicationId: String?) {
+    try {
+      if (token.isNullOrBlank()) {
+        throw IllegalArgumentException("Token cannot be null or empty")
       }
+      SpallaSDK.initialize(reactContext, token)
+    } catch (e: Exception) {
+      Log.e("SpallaPlayerModule", "Failed to initialize SpallaSDK", e)
+    }
   }
 
-  @ReactMethod
-  fun unmount(tag: Int) {
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      val uiManager = UIManagerHelper.getUIManager(_reactContext, UIManagerType.FABRIC)
+  fun getSpallaPlayerView(tag: Double): SpallaPlayerView? {
+    try {
+      val uiManager = UIManagerHelper.getUIManager(reactContext, UIManagerType.FABRIC)
       if (uiManager is UIManager) {
-        uiManager.resolveView(tag)?.let { view ->
-          if (view is SpallaPlayerContainerView) {
-            view.spallaPlayerView.pause()
-          }
-        }
-      }
-    } else {
-      val uiManager: UIManagerModule? =
-        _reactContext.getNativeModule(UIManagerModule::class.java)
-      uiManager?.prependUIBlock { nativeViewHierarchyManager: NativeViewHierarchyManager ->
-        val playerView = nativeViewHierarchyManager.resolveView(tag)
-        if (playerView is SpallaPlayerContainerView) {
-          playerView.spallaPlayerView.pause()
+        val view = uiManager.resolveView(tag.toInt())
+        if (view is SpallaPlayerView) {
+          return view
+        } else if (view != null) {
+          Log.e(
+            "SpallaPlayerModule",
+            "Cannot play: view with tag #$tag is not a SpallaPlayerView"
+          )
+        } else {
+          Log.e("SpallaPlayerModule", "Cannot find view with tag #$tag")
         }
+      } else {
+        Log.e("SpallaPlayerModule", "UIManager is not available")
       }
+    } catch (e: Exception) {
+      Log.e("SpallaPlayerModule", "Error in play method", e)
     }
+    return null
   }
-
-  @ReactMethod
-  fun initialize(token: String, applicationId: String?) {
-    SpallaSDK.initialize(_reactContext, token)
-  }
-
-
 }

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

@@ -5,14 +5,26 @@ import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
 import com.spallaplayer.components.RNGoogleCastButtonManager
+import java.util.ArrayList
 
+class SpallaPlayerViewPackage : ReactPackage {
+  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+    val viewManagers: MutableList<ViewManager<*, *>> = ArrayList()
+    viewManagers.add(SpallaPlayerViewManager())
+    viewManagers.add(RNGoogleCastButtonManager())
+    return viewManagers
+  }
 
-class SpallaPlayerPackage : ReactPackage {
+  @Deprecated("Migrate to [BaseReactPackage] and implement [getModule] instead.")
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
     return listOf(SpallaPlayerModule(reactContext))
   }
 
-  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-    return listOf(RNSpallaPlayerManager(), RNGoogleCastButtonManager())
+  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+    return when (name) {
+      SpallaPlayerModule.REACT_NAME -> SpallaPlayerModule(reactContext)
+      else -> null
+    }
   }
+
 }