react-native-tpstreams 0.1.6 → 0.1.7

package/android/src/main/java/com/tpstreams/FragmentModule.kt

@@ -1,190 +1,190 @@
-package com.tpstreams
-
-import android.content.Context
-import android.os.Bundle
-import androidx.fragment.app.FragmentActivity
-import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.bridge.ReactContextBaseJavaModule
-import com.facebook.react.bridge.ReactApplicationContext
-import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.modules.core.DeviceEventManagerModule
-import com.tpstream.player.data.Asset
-import com.tpstream.player.offline.TpStreamDownloadManager
-import com.tpstream.player.TPStreamsSDK
-
-class FragmentModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
-
-  lateinit var viewModel: DownloadListViewModel
-  private var assets = listOf<Asset>()
-
-  override fun initialize() {
-    super.initialize()
-    (currentActivity as? FragmentActivity)?.let {
-      viewModel = DownloadListViewModel.init(it)
-    }
-    Log.d("FragmentModule", "initialize: ")
-  }
-
-  override fun getName(): String {
-    return "FragmentModule"
-  }
-
-  @ReactMethod
-  fun showCustomFragment(videoId: String, accessToken: String, enableDownload: Boolean, autoPlay: Boolean) {
-    Log.e("FragmentModule", "showCustomFragment() called")
-    // Ensure the currentActivity is a FragmentActivity
-    val activity = currentActivity as? FragmentActivity
-    activity?.let {
-      // Begin the fragment transaction
-      val fragmentTransaction = it.supportFragmentManager.beginTransaction()
-
-      // Create a new fragment instance
-      val bundle = Bundle()
-      bundle.putString("VIDEO_ID", videoId)
-      bundle.putString("ACCESS_TOKEN", accessToken)
-      bundle.putBoolean("ENABLE_DOWNLOAD_SUPPORT", enableDownload)
-      bundle.putBoolean("AUTO_PLAY", autoPlay)
-      val fragment = PlayerFragment()
-      fragment.setArguments(bundle)
-
-      // Find a container to add the fragment
-      val fragmentContainerId = android.R.id.content // or you could specify your own container ID
-
-      // Add the fragment
-      fragmentTransaction.replace(fragmentContainerId, fragment)
-      fragmentTransaction.addToBackStack(null)  // Optional: Add fragment to back stack
-      fragmentTransaction.commit()
-    } ?: run {
-      // Handle the error if the activity is not a FragmentActivity
-      Log.e("ReactNativeJS", "Current activity is not a FragmentActivity")
-    }
-  }
-
-  @ReactMethod
-  fun closeCustomFragment() {
-      Log.e("FragmentModule", "closeCustomFragment() called")
-  
-      // Ensure currentActivity is a FragmentActivity
-      val activity = currentActivity as? FragmentActivity
-      if (activity == null || activity.isFinishing || activity.isDestroyed) {
-          Log.e("FragmentModule", "Activity is null, finishing, or destroyed")
-          return
-      }
-  
-      val fragmentManager = activity.supportFragmentManager
-      val playerFragment = fragmentManager.findFragmentByTag("PLAYER_FRAGMENT") as? PlayerFragment
-  
-      if (playerFragment != null) {
-          Log.d("FragmentModule", "Removing PlayerFragment")
-          fragmentManager.beginTransaction()
-              .remove(playerFragment)
-              .commitAllowingStateLoss() // Avoid IllegalStateException
-      } else if (fragmentManager.backStackEntryCount > 0) {
-          Log.d("FragmentModule", "Popping back stack")
-          fragmentManager.popBackStack()
-      } else {
-          Log.e("FragmentModule", "No fragments to remove")
-      }
-  }
-
-  @ReactMethod
-  fun observeDownloadData() {
-    // Ensure this code runs on the main thread
-    currentActivity?.runOnUiThread {
-      val activity = currentActivity as? FragmentActivity
-      activity?.let {
-        // Observe LiveData only on the main thread
-        viewModel.getDownloadData().observe(it) { assets ->
-          this.assets = assets ?: emptyList()
-          // Emit event to React Native
-          val eventMap = Arguments.createMap()
-          val assetsList = Arguments.createArray()
-
-          assets?.forEachIndexed { index , asset ->
-            val assetMap = Arguments.createMap()
-            assetMap.putString("id", index.toString())
-            assetMap.putString("videoId", asset.id)
-            assetMap.putString("title", asset.title)
-            assetMap.putString("percentage", asset.video.percentageDownloaded.toString())
-            assetMap.putString("status", asset.video.downloadState?.name ?: "Unknown")
-            assetMap.putString("duration", asset.video.duration.toString())
-
-            assetsList.pushMap(assetMap)
-          }
-
-          eventMap.putArray("assets", assetsList)
-          reactApplicationContext
-            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-            .emit("onDownloadDataChanged", eventMap)
-        }
-      } ?: run {
-        Log.e("FragmentModule", "Current activity is not a FragmentActivity")
-      }
-    }
-  }
-
-  @ReactMethod
-  fun pauseDownload(videoId: String) {
-    val asset = assets.first { it.id == videoId }
-    viewModel.pauseDownload(asset)
-  }
-
-  @ReactMethod
-  fun resumeDownload(videoId: String) {
-    val asset = assets.first { it.id == videoId }
-    viewModel.resumeDownload(asset)
-  }
-
-  @ReactMethod
-  fun cancelDownload(videoId: String) {
-    val asset = assets.first { it.id == videoId }
-    viewModel.cancelDownload(asset)
-  }
-
-  @ReactMethod
-  fun deleteDownload(videoId: String) {
-    val asset = assets.first { it.id == videoId }
-    viewModel.deleteDownload(asset)
-  }
-
-}
-
-class DownloadListViewModel(context: Context): ViewModel() {
-
-  private var tpStreamDownloadManager: TpStreamDownloadManager = TpStreamDownloadManager(context)
-
-  fun getDownloadData(): LiveData<List<Asset>?> {
-    return tpStreamDownloadManager.getAllDownloads()
-  }
-
-  fun pauseDownload(offlineAssetInfo: Asset) {
-    tpStreamDownloadManager.pauseDownload(offlineAssetInfo)
-  }
-
-  fun resumeDownload(offlineAssetInfo: Asset) {
-    tpStreamDownloadManager.resumeDownload(offlineAssetInfo)
-  }
-
-  fun cancelDownload(offlineAssetInfo: Asset) {
-    tpStreamDownloadManager.cancelDownload(offlineAssetInfo)
-  }
-
-  fun deleteDownload(offlineAssetInfo: Asset) {
-    tpStreamDownloadManager.deleteDownload(offlineAssetInfo)
-  }
-
-  companion object {
-    fun init(fragmentActivity: FragmentActivity) : DownloadListViewModel {
-      return ViewModelProvider(fragmentActivity, object : ViewModelProvider.Factory {
-        override fun <T : ViewModel> create(modelClass: Class<T>): T {
-          return DownloadListViewModel(fragmentActivity) as T
-        }
-      })[DownloadListViewModel::class.java]
-    }
-  }
-}
+package com.tpstreams
+
+import android.content.Context
+import android.os.Bundle
+import androidx.fragment.app.FragmentActivity
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactApplicationContext
+import android.util.Log
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.modules.core.DeviceEventManagerModule
+import com.tpstream.player.data.Asset
+import com.tpstream.player.offline.TpStreamDownloadManager
+import com.tpstream.player.TPStreamsSDK
+
+class FragmentModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
+
+  lateinit var viewModel: DownloadListViewModel
+  private var assets = listOf<Asset>()
+
+  override fun initialize() {
+    super.initialize()
+    (currentActivity as? FragmentActivity)?.let {
+      viewModel = DownloadListViewModel.init(it)
+    }
+    Log.d("FragmentModule", "initialize: ")
+  }
+
+  override fun getName(): String {
+    return "FragmentModule"
+  }
+
+  @ReactMethod
+  fun showCustomFragment(videoId: String, accessToken: String, enableDownload: Boolean, autoPlay: Boolean) {
+    Log.e("FragmentModule", "showCustomFragment() called")
+    // Ensure the currentActivity is a FragmentActivity
+    val activity = currentActivity as? FragmentActivity
+    activity?.let {
+      // Begin the fragment transaction
+      val fragmentTransaction = it.supportFragmentManager.beginTransaction()
+
+      // Create a new fragment instance
+      val bundle = Bundle()
+      bundle.putString("VIDEO_ID", videoId)
+      bundle.putString("ACCESS_TOKEN", accessToken)
+      bundle.putBoolean("ENABLE_DOWNLOAD_SUPPORT", enableDownload)
+      bundle.putBoolean("AUTO_PLAY", autoPlay)
+      val fragment = PlayerFragment()
+      fragment.setArguments(bundle)
+
+      // Find a container to add the fragment
+      val fragmentContainerId = android.R.id.content // or you could specify your own container ID
+
+      // Add the fragment
+      fragmentTransaction.replace(fragmentContainerId, fragment)
+      fragmentTransaction.addToBackStack(null)  // Optional: Add fragment to back stack
+      fragmentTransaction.commit()
+    } ?: run {
+      // Handle the error if the activity is not a FragmentActivity
+      Log.e("ReactNativeJS", "Current activity is not a FragmentActivity")
+    }
+  }
+
+  @ReactMethod
+  fun closeCustomFragment() {
+      Log.e("FragmentModule", "closeCustomFragment() called")
+  
+      // Ensure currentActivity is a FragmentActivity
+      val activity = currentActivity as? FragmentActivity
+      if (activity == null || activity.isFinishing || activity.isDestroyed) {
+          Log.e("FragmentModule", "Activity is null, finishing, or destroyed")
+          return
+      }
+  
+      val fragmentManager = activity.supportFragmentManager
+      val playerFragment = fragmentManager.findFragmentByTag("PLAYER_FRAGMENT") as? PlayerFragment
+  
+      if (playerFragment != null) {
+          Log.d("FragmentModule", "Removing PlayerFragment")
+          fragmentManager.beginTransaction()
+              .remove(playerFragment)
+              .commitAllowingStateLoss() // Avoid IllegalStateException
+      } else if (fragmentManager.backStackEntryCount > 0) {
+          Log.d("FragmentModule", "Popping back stack")
+          fragmentManager.popBackStack()
+      } else {
+          Log.e("FragmentModule", "No fragments to remove")
+      }
+  }
+
+  @ReactMethod
+  fun observeDownloadData() {
+    // Ensure this code runs on the main thread
+    currentActivity?.runOnUiThread {
+      val activity = currentActivity as? FragmentActivity
+      activity?.let {
+        // Observe LiveData only on the main thread
+        viewModel.getDownloadData().observe(it) { assets ->
+          this.assets = assets ?: emptyList()
+          // Emit event to React Native
+          val eventMap = Arguments.createMap()
+          val assetsList = Arguments.createArray()
+
+          assets?.forEachIndexed { index , asset ->
+            val assetMap = Arguments.createMap()
+            assetMap.putString("id", index.toString())
+            assetMap.putString("videoId", asset.id)
+            assetMap.putString("title", asset.title)
+            assetMap.putString("percentage", asset.video.percentageDownloaded.toString())
+            assetMap.putString("status", asset.video.downloadState?.name ?: "Unknown")
+            assetMap.putString("duration", asset.video.duration.toString())
+
+            assetsList.pushMap(assetMap)
+          }
+
+          eventMap.putArray("assets", assetsList)
+          reactApplicationContext
+            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+            .emit("onDownloadDataChanged", eventMap)
+        }
+      } ?: run {
+        Log.e("FragmentModule", "Current activity is not a FragmentActivity")
+      }
+    }
+  }
+
+  @ReactMethod
+  fun pauseDownload(videoId: String) {
+    val asset = assets.first { it.id == videoId }
+    viewModel.pauseDownload(asset)
+  }
+
+  @ReactMethod
+  fun resumeDownload(videoId: String) {
+    val asset = assets.first { it.id == videoId }
+    viewModel.resumeDownload(asset)
+  }
+
+  @ReactMethod
+  fun cancelDownload(videoId: String) {
+    val asset = assets.first { it.id == videoId }
+    viewModel.cancelDownload(asset)
+  }
+
+  @ReactMethod
+  fun deleteDownload(videoId: String) {
+    val asset = assets.first { it.id == videoId }
+    viewModel.deleteDownload(asset)
+  }
+
+}
+
+class DownloadListViewModel(context: Context): ViewModel() {
+
+  private var tpStreamDownloadManager: TpStreamDownloadManager = TpStreamDownloadManager(context)
+
+  fun getDownloadData(): LiveData<List<Asset>?> {
+    return tpStreamDownloadManager.getAllDownloads()
+  }
+
+  fun pauseDownload(offlineAssetInfo: Asset) {
+    tpStreamDownloadManager.pauseDownload(offlineAssetInfo)
+  }
+
+  fun resumeDownload(offlineAssetInfo: Asset) {
+    tpStreamDownloadManager.resumeDownload(offlineAssetInfo)
+  }
+
+  fun cancelDownload(offlineAssetInfo: Asset) {
+    tpStreamDownloadManager.cancelDownload(offlineAssetInfo)
+  }
+
+  fun deleteDownload(offlineAssetInfo: Asset) {
+    tpStreamDownloadManager.deleteDownload(offlineAssetInfo)
+  }
+
+  companion object {
+    fun init(fragmentActivity: FragmentActivity) : DownloadListViewModel {
+      return ViewModelProvider(fragmentActivity, object : ViewModelProvider.Factory {
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
+          return DownloadListViewModel(fragmentActivity) as T
+        }
+      })[DownloadListViewModel::class.java]
+    }
+  }
+}

package/android/src/main/java/com/tpstreams/PlayerFragment.kt

@@ -1,96 +1,163 @@
-package com.tpstreams
-
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import com.tpstream.player.TPStreamPlayerListener
-import com.tpstream.player.TpInitParams
-import com.tpstream.player.TpStreamPlayer
-import com.tpstream.player.ui.InitializationListener
-import com.tpstream.player.ui.TPStreamPlayerView
-import com.tpstream.player.ui.TpStreamPlayerFragment
-
-class PlayerFragment : Fragment() {
-
-  lateinit var player: TpStreamPlayer
-  lateinit var playerView: TPStreamPlayerView
-  lateinit var playerFragment: TpStreamPlayerFragment
-  private var videoId :String = ""
-  private var accessToken :String = ""
-  private var enableDownloadSupport :Boolean = true
-  private var setAutoPlay :Boolean = true
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    val bundle = arguments
-    if (bundle != null) {
-      videoId = bundle.getString("VIDEO_ID") ?: ""
-      accessToken = bundle.getString("ACCESS_TOKEN") ?: ""
-      enableDownloadSupport = bundle.getBoolean("ENABLE_DOWNLOAD_SUPPORT", true)
-      setAutoPlay = bundle.getBoolean("AUTO_PLAY", true)
-
-    }
-  }
-
-  override fun onCreateView(
-    inflater: LayoutInflater, container: ViewGroup?,
-    savedInstanceState: Bundle?
-  ): View? {
-    return inflater.inflate(R.layout.fragment_player, container, false)
-  }
-
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    super.onViewCreated(view, savedInstanceState)
-    playerFragment = childFragmentManager.findFragmentById(R.id.tpstream_player_fragment) as TpStreamPlayerFragment
-    playerFragment.setOnInitializationListener(object: InitializationListener {
-
-      override fun onInitializationSuccess(player: TpStreamPlayer) {
-        this@PlayerFragment.player = player
-        playerView = playerFragment.tpStreamPlayerView
-        loadPLayer()
-        addPlayerListener()
-      }
-    })
-  }
-
-  fun loadPLayer() {
-    val parameters = TpInitParams.Builder()
-      .setVideoId(videoId)
-      .setAccessToken(accessToken)
-      .enableDownloadSupport(enableDownloadSupport)
-      .setAutoPlay(setAutoPlay)
-      .build()
-    player.load(parameters)
-  }
-
-  private fun addPlayerListener(){
-    player.setListener( object : TPStreamPlayerListener {
-      override fun onPlaybackStateChanged(playbackState: Int) {
-        Log.d("TAG", "onPlaybackStateChanged: $playbackState")
-      }
-
-      override fun onAccessTokenExpired(videoId: String, callback: (String) -> Unit) {
-        callback(accessToken)
-      }
-
-      override fun onMarkerCallback(timesInSeconds: Long) {
-        Toast.makeText(requireContext(),"Time $timesInSeconds", Toast.LENGTH_SHORT).show()
-      }
-    })
-  }
-
-  override fun onResume() {
-    super.onResume()
-    Log.d("ReactNativeJS", "onResume: ")
-  }
-
-  override fun onDestroy() {
-    super.onDestroy()
-    Log.d("ReactNativeJS", "onDestroy: ")
-  }
-
-}
+package com.tpstreams
+
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import com.tpstream.player.TPStreamPlayerListener
+import com.tpstream.player.TpInitParams
+import com.tpstream.player.TpStreamPlayer
+import com.tpstream.player.ui.InitializationListener
+import com.tpstream.player.ui.TPStreamPlayerView
+import com.tpstream.player.ui.TpStreamPlayerFragment
+
+class PlayerFragment : Fragment() {
+
+  lateinit var player: TpStreamPlayer
+  lateinit var playerView: TPStreamPlayerView
+  lateinit var playerFragment: TpStreamPlayerFragment
+  private var videoId :String = ""
+  private var accessToken :String = ""
+  private var enableDownloadSupport :Boolean = true
+  private var setAutoPlay :Boolean = true
+
+  companion object {
+    var instance: PlayerFragment? = null
+  }
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    val bundle = arguments
+    if (bundle != null) {
+      videoId = bundle.getString("VIDEO_ID") ?: ""
+      accessToken = bundle.getString("ACCESS_TOKEN") ?: ""
+      enableDownloadSupport = bundle.getBoolean("ENABLE_DOWNLOAD_SUPPORT", true)
+      setAutoPlay = bundle.getBoolean("AUTO_PLAY", true)
+
+    }
+  }
+
+  override fun onCreateView(
+    inflater: LayoutInflater, container: ViewGroup?,
+    savedInstanceState: Bundle?
+  ): View? {
+    return inflater.inflate(R.layout.fragment_player, container, false)
+  }
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    instance = this
+    playerFragment = childFragmentManager.findFragmentById(R.id.tpstream_player_fragment) as TpStreamPlayerFragment
+    playerFragment.setOnInitializationListener(object: InitializationListener {
+
+      override fun onInitializationSuccess(player: TpStreamPlayer) {
+        this@PlayerFragment.player = player
+        playerView = playerFragment.tpStreamPlayerView
+        loadPLayer()
+        addPlayerListener()
+      }
+    })
+  }
+
+  fun loadPLayer() {
+    val parameters = TpInitParams.Builder()
+      .setVideoId(videoId)
+      .setAccessToken(accessToken)
+      .enableDownloadSupport(enableDownloadSupport)
+      .setAutoPlay(setAutoPlay)
+      .build()
+    requireActivity().runOnUiThread {
+      player.load(parameters)
+    }
+  }
+
+  private fun addPlayerListener(){
+    player.setListener( object : TPStreamPlayerListener {
+      override fun onPlaybackStateChanged(playbackState: Int) {
+        Log.d("TAG", "onPlaybackStateChanged: $playbackState")
+      }
+
+      override fun onAccessTokenExpired(videoId: String, callback: (String) -> Unit) {
+        callback(accessToken)
+      }
+
+      override fun onMarkerCallback(timesInSeconds: Long) {
+        requireActivity().runOnUiThread {
+          Toast.makeText(requireContext(),"Time $timesInSeconds", Toast.LENGTH_SHORT).show()
+        }
+      }
+    })
+  }
+  // Core Player Controls
+  fun play() {
+    requireActivity().runOnUiThread {
+        player.play()
+    }
+  }
+
+  fun pause() {
+    requireActivity().runOnUiThread {
+        player.pause()
+    }
+  }
+
+  fun seekTo(position: Long) {
+    requireActivity().runOnUiThread {
+        player.seekTo(position)
+    }
+  }
+
+  fun release() {
+    requireActivity().runOnUiThread {
+        player.release()
+    }
+  }
+
+  fun load(params: TpInitParams) {
+    requireActivity().runOnUiThread {
+        player.load(params)
+    }
+  }
+
+  // Playback & State Management
+  fun getCurrentTime(): Double = player.getCurrentTime().toDouble()
+
+  fun getDuration(): Double = player.getDuration().toDouble()
+
+  fun getBufferedTime(): Double = player.getBufferedTime().toDouble()
+
+  fun getPlaybackState(): Int = player.getPlaybackState()
+
+  fun getPlayWhenReady(): Boolean = player.getPlayWhenReady()
+
+  fun setPlayWhenReady(playWhenReady: Boolean) {
+    requireActivity().runOnUiThread {
+        player.setPlayWhenReady(playWhenReady)
+    }
+  }
+
+
+  // Speed & Volume
+  fun getPlaybackSpeed(): Float = player.getPlayBackSpeed()
+
+  fun setPlaybackSpeed(speed: Float) {
+    requireActivity().runOnUiThread {
+        player.setPlaybackSpeed(speed)
+    }
+  }
+
+  override fun onResume() {
+    super.onResume()
+    Log.d("ReactNativeJS", "onResume: ")
+  }
+
+  override fun onDestroy() {
+    super.onDestroy()
+    instance = null
+    Log.d("ReactNativeJS", "onDestroy: ")
+  }
+
+}