expo-libvlc-player 3.1.0 → 3.1.2

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: "com.android.library"
 
 group = "expo.modules.libvlcplayer"
-version = "3.1.0"
+version = "3.1.2"
 
 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 "3.1.0"
+        versionName "3.1.2"
         consumerProguardFiles("proguard-rules.pro")
     }
     lintOptions {

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

@@ -19,7 +19,7 @@ private const val ES_ADDED_EVENT = "onESAdded"
 private const val RECORD_CHANGED_EVENT = "onRecordChanged"
 private const val SNAPSHOT_TAKEN_EVENT = "onSnapshotTaken"
 private const val FIRST_PLAY_EVENT = "onFirstPlay"
-private const val FOREROUND_EVENT = "onForeground"
+private const val FOREGROUND_EVENT = "onForeground"
 private const val BACKGROUND_EVENT = "onBackground"
 
 val playerEvents =
@@ -37,7 +37,7 @@ val playerEvents =
         RECORD_CHANGED_EVENT,
         SNAPSHOT_TAKEN_EVENT,
         FIRST_PLAY_EVENT,
-        FOREROUND_EVENT,
+        FOREGROUND_EVENT,
         BACKGROUND_EVENT,
     )
 
@@ -47,11 +47,19 @@ class LibVlcPlayerModule : Module() {
             Name("ExpoLibVlcPlayer")
 
             OnCreate {
-                MediaPlayerManager.onModuleCreated(appContext)
+                MediaPlayerManager.onModuleCreate(appContext)
             }
 
             OnDestroy {
-                MediaPlayerManager.onModuleDestroyed()
+                MediaPlayerManager.onModuleDestroy()
+            }
+
+            OnActivityEntersForeground {
+                MediaPlayerManager.onModuleForeground()
+            }
+
+            OnActivityEntersBackground {
+                MediaPlayerManager.onModuleBackground()
             }
 
             View(LibVlcPlayerView::class) {
@@ -154,13 +162,5 @@ class LibVlcPlayerModule : Module() {
                     view.dismiss()
                 }
             }
-
-            OnActivityEntersForeground {
-                MediaPlayerManager.onPlayerForeground()
-            }
-
-            OnActivityEntersBackground {
-                MediaPlayerManager.onPlayerBackground()
-            }
         }
 }

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

@@ -5,11 +5,19 @@ import expo.modules.kotlin.exception.Exceptions
 import java.lang.ref.WeakReference
 
 object MediaPlayerManager {
+    lateinit var audioFocusManager: AudioFocusManager
+
     internal var playerViews: MutableList<WeakReference<LibVlcPlayerView>> = mutableListOf()
 
-    lateinit var audioFocusManager: AudioFocusManager
+    fun registerPlayerView(view: LibVlcPlayerView) {
+        playerViews.find { it.get() == view } ?: run { playerViews.add(WeakReference(view)) }
+    }
+
+    fun unregisterPlayerView(view: LibVlcPlayerView) {
+        playerViews.removeAll { it.get() == view }
+    }
 
-    fun onModuleCreated(appContext: AppContext) {
+    fun onModuleCreate(appContext: AppContext) {
         val context = appContext.reactContext ?: throw Exceptions.ReactContextLost()
 
         if (!this::audioFocusManager.isInitialized) {
@@ -17,21 +25,13 @@ object MediaPlayerManager {
         }
     }
 
-    fun onModuleDestroyed() {
+    fun onModuleDestroy() {
         playerViews.forEach { playerView ->
             playerView.get()?.destroyPlayer()
         }
     }
 
-    fun registerPlayerView(view: LibVlcPlayerView) {
-        playerViews.find { it.get() == view } ?: run { playerViews.add(WeakReference(view)) }
-    }
-
-    fun unregisterPlayerView(view: LibVlcPlayerView) {
-        playerViews.removeAll { it.get() == view }
-    }
-
-    fun onPlayerForeground() {
+    fun onModuleForeground() {
         playerViews.forEach { playerView ->
             playerView.get()?.let { view ->
                 view.onForeground(Unit)
@@ -39,7 +39,7 @@ object MediaPlayerManager {
         }
     }
 
-    fun onPlayerBackground() {
+    fun onModuleBackground() {
         playerViews.forEach { playerView ->
             playerView.get()?.let { view ->
                 view.onBackground(Unit)

package/ios/LibVlcPlayerModule.swift

@@ -38,12 +38,20 @@ public class LibVlcPlayerModule: Module {
     public func definition() -> ModuleDefinition {
         Name("ExpoLibVlcPlayer")
 
-        AsyncFunction("triggerAlert") { () in
-            LocalNetworkAlert.shared.triggerLocalNetworkPrivacyAlert()
+        AsyncFunction("triggerAlert") {
+            LocalNetworkManager.shared.triggerLocalNetworkPrivacyAlert()
         }
 
         OnDestroy {
-            MediaPlayerManager.shared.onModuleDestroyed()
+            MediaPlayerManager.shared.onModuleDestroy()
+        }
+
+        OnAppEntersForeground {
+            MediaPlayerManager.shared.onModuleForeground()
+        }
+
+        OnAppEntersBackground {
+            MediaPlayerManager.shared.onModuleBackground()
         }
 
         View(LibVlcPlayerView.self) {
@@ -141,13 +149,5 @@ public class LibVlcPlayerModule: Module {
                 view.dismiss()
             }
         }
-
-        OnAppEntersForeground {
-            MediaPlayerManager.shared.onPlayerForeground()
-        }
-
-        OnAppEntersBackground {
-            MediaPlayerManager.shared.onPlayerBackground()
-        }
     }
 }

package/ios/{LocalNetworkAlert.swift → LocalNetworkManager.swift}

@@ -1,5 +1,5 @@
-class LocalNetworkAlert {
-    static let shared = LocalNetworkAlert()
+class LocalNetworkManager {
+    static let shared = LocalNetworkManager()
 
     /// Attempts to trigger the local network privacy alert.
     ///

package/ios/MediaPlayerManager.swift

@@ -5,12 +5,6 @@ class MediaPlayerManager {
 
     let playerViews = NSHashTable<LibVlcPlayerView>.weakObjects()
 
-    func onModuleDestroyed() {
-        for view in playerViews.allObjects {
-            view.destroyPlayer()
-        }
-    }
-
     func registerPlayerView(_ view: LibVlcPlayerView) {
         playerViews.add(view)
     }
@@ -19,13 +13,19 @@ class MediaPlayerManager {
         playerViews.remove(view)
     }
 
-    func onPlayerForeground() {
+    func onModuleDestroy() {
+        for view in playerViews.allObjects {
+            view.destroyPlayer()
+        }
+    }
+
+    func onModuleForeground() {
         for view in playerViews.allObjects {
             view.onForeground()
         }
     }
 
-    func onPlayerBackground() {
+    func onModuleBackground() {
         for view in playerViews.allObjects {
             view.onBackground()
 

package/package.json

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