expo-libvlc-player 2.0.2 → 2.0.4

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: "com.android.library"
 
 group = "expo.modules.libvlcplayer"
-version = "2.0.2"
+version = "2.0.4"
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -27,7 +27,7 @@ android {
     namespace "expo.modules.libvlcplayer"
     defaultConfig {
         versionCode 1
-        versionName "2.0.2"
+        versionName "2.0.4"
         consumerProguardFiles("proguard-rules.pro")
     }
     lintOptions {

package/android/src/main/java/expo/modules/libvlcplayer/LibVlcPlayerView.kt

@@ -34,14 +34,17 @@ class LibVlcPlayerView(
     context: Context,
     appContext: AppContext,
 ) : ExpoView(context, appContext) {
-    private val playerView: VLCVideoLayout = VLCVideoLayout(context)
+    private val playerView: VLCVideoLayout =
+        VLCVideoLayout(context).also {
+            addView(it)
+        }
 
     private var libVLC: LibVLC? = null
     internal var mediaPlayer: MediaPlayer? = null
-    internal var media: Media? = null
+    private var media: Media? = null
     private var shouldCreate: Boolean = false
 
-    internal var mediaLength: Long = 0L
+    private var mediaLength: Long = 0L
     internal var oldVolume: Int = MAX_PLAYER_VOLUME
     internal var firstPlay: Boolean = false
 
@@ -103,11 +106,15 @@ class LibVlcPlayerView(
 
     fun attachPlayer() {
         mediaPlayer?.let { player ->
-            if (playerView.getParent() == null) {
+            val parent = playerView.getParent()
+
+            if (parent == null) {
                 addView(playerView)
             }
 
-            if (!player.getVLCVout().areViewsAttached()) {
+            val attached = player.getVLCVout().areViewsAttached()
+
+            if (!attached) {
                 player.attachViews(playerView, DISPLAY_MANAGER, ENABLE_SUBTITLES, USE_TEXTURE_VIEW)
             }
         }
@@ -119,7 +126,6 @@ class LibVlcPlayerView(
     }
 
     fun destroyPlayer() {
-        media?.release()
         media = null
         mediaPlayer?.release()
         mediaPlayer = null
@@ -409,7 +415,7 @@ class LibVlcPlayerView(
         }
     }
 
-    internal fun ArrayList<String>.hasAudioOption(): Boolean {
+    private fun ArrayList<String>.hasAudioOption(): Boolean {
         val options =
             setOf(
                 "--no-audio",

package/ios/LibVlcPlayerView.swift

@@ -80,6 +80,8 @@ class LibVlcPlayerView: ExpoView {
 
     func destroyPlayer() {
         mediaPlayer?.media = nil
+        mediaPlayer?.delegate = nil
+        mediaPlayer?.drawable = nil
         mediaPlayer = nil
     }
 
@@ -368,7 +370,7 @@ class LibVlcPlayerView: ExpoView {
     }
 }
 
-extension Array where Element == String {
+private extension Array where Element == String {
     func hasAudioOption() -> Bool {
         let options: Set<String> = [
             "--no-audio", "-no-audio", ":no-audio",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-libvlc-player",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "LibVLC Player for Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",