react-native-tpstreams 0.1.1 → 0.1.3

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

@@ -35,7 +35,7 @@ class FragmentModule(reactContext: ReactApplicationContext) : ReactContextBaseJa
   }
 
   @ReactMethod
-  fun showCustomFragment(videoId: String, accessToken: String) {
+  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
@@ -47,6 +47,8 @@ class FragmentModule(reactContext: ReactApplicationContext) : ReactContextBaseJa
       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)
 
@@ -65,24 +67,29 @@ class FragmentModule(reactContext: ReactApplicationContext) : ReactContextBaseJa
 
   @ReactMethod
   fun closeCustomFragment() {
-    Log.e("FragmentModule", "closeCustomFragment() called")
-    // Ensure the currentActivity is a FragmentActivity
-    val activity = currentActivity as? FragmentActivity
-    activity?.let {
-      // Access the fragment manager
-      val fragmentManager = it.supportFragmentManager
-
-      // Check if there are any fragments in the back stack
-      if (fragmentManager.backStackEntryCount > 0) {
-        // Pop the last fragment off the back stack
-        fragmentManager.popBackStack()
+      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 in the back stack to remove")
+          Log.e("FragmentModule", "No fragments to remove")
       }
-    } ?: run {
-      // Handle the error if the activity is not a FragmentActivity
-      Log.e("ReactNativeJS", "Current activity is not a FragmentActivity")
-    }
   }
 
   @ReactMethod

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

@@ -21,6 +21,8 @@ class PlayerFragment : Fragment() {
   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)
@@ -28,6 +30,9 @@ class PlayerFragment : Fragment() {
     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)
+
     }
   }
 
@@ -56,8 +61,8 @@ class PlayerFragment : Fragment() {
     val parameters = TpInitParams.Builder()
       .setVideoId(videoId)
       .setAccessToken(accessToken)
-      .enableDownloadSupport(true)
-      .setAutoPlay(true)
+      .enableDownloadSupport(enableDownloadSupport)
+      .setAutoPlay(setAutoPlay)
       .build()
     player.load(parameters)
   }

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

@@ -14,6 +14,8 @@ class TpStreamsPlayerView @JvmOverloads constructor(
 
     private var videoId: String? = null
     private var accessToken: String? = null
+    private var enableDownload: Boolean = true
+    private var autoPlay :Boolean = true
     private var fragmentModule: FragmentModule? = null
 
     init {
@@ -37,10 +39,20 @@ class TpStreamsPlayerView @JvmOverloads constructor(
         updateFragment()
     }
 
+    fun setEnableDownload(enableDownload: Boolean?) {
+        this.enableDownload = enableDownload ?: true
+        updateFragment()
+    }
+
+    fun setAutoPlay(autoPlay: Boolean?) {
+        this.autoPlay = autoPlay ?: true
+        updateFragment()
+    }
+
     private fun updateFragment() {
         if (!videoId.isNullOrEmpty() && !accessToken.isNullOrEmpty()) {
             fragmentModule?.closeCustomFragment()
-            fragmentModule?.showCustomFragment(videoId!!, accessToken!!)
+            fragmentModule?.showCustomFragment(videoId!!, accessToken!!, enableDownload, autoPlay)
         }
     }
 

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

@@ -21,6 +21,17 @@ class TpStreamsPlayerViewManager : SimpleViewManager<TpStreamsPlayerView>() {
     fun setAccessToken(view: TpStreamsPlayerView, accessToken: String?) {
         accessToken?.let { view.setAccessToken(it) }
     }
+    
+    @ReactProp(name = "enableDownload")
+    fun setEnableDownload(view: TpStreamsPlayerView, enableDownload: Boolean?) {
+        view.setEnableDownload(enableDownload)
+    }
+
+    @ReactProp(name = "autoPlay")
+    fun setAutoPlay(view: TpStreamsPlayerView, autoPlay: Boolean?) {
+        view.setAutoPlay(autoPlay)
+    }
+
 }
 
 

package/lib/typescript/commonjs/src/types.d.ts

@@ -1,6 +1,8 @@
 export type TpStreamsPlayerProps = {
     videoId: string;
     accessToken: string;
+    enableDownload?: boolean;
+    autoPlay?: boolean;
     style?: import('react-native').ViewStyle;
 };
 //# sourceMappingURL=types.d.ts.map

package/lib/typescript/commonjs/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,cAAc,EAAE,SAAS,CAAC;CAC1C,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,cAAc,EAAE,SAAS,CAAC;CAC1C,CAAC"}

package/lib/typescript/module/src/types.d.ts

@@ -1,6 +1,8 @@
 export type TpStreamsPlayerProps = {
     videoId: string;
     accessToken: string;
+    enableDownload?: boolean;
+    autoPlay?: boolean;
     style?: import('react-native').ViewStyle;
 };
 //# sourceMappingURL=types.d.ts.map

package/lib/typescript/module/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,cAAc,EAAE,SAAS,CAAC;CAC1C,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,cAAc,EAAE,SAAS,CAAC;CAC1C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tpstreams",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Video Component for TPStreams",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",

package/src/types.ts

@@ -1,5 +1,7 @@
 export type TpStreamsPlayerProps = {
   videoId: string;
   accessToken: string;
+  enableDownload?: boolean;
+  autoPlay?: boolean;
   style?: import('react-native').ViewStyle;
 };