expo-libvlc-player 7.1.0 → 7.1.2

package/android/src/main/java/expo/modules/libvlcplayer/constants/MediaPlayerConstants.kt

@@ -15,6 +15,7 @@ object MediaPlayerConstants {
     const val EXTRA_CONTROL_FORWARD: Int = 4
     const val SEEK_STEP_MS: Long = 10_000L
 
+    const val ATTACH_DELAY_MS: Long = 250L
     const val PAUSE_DELAY_MS: Long = 1_000L
     const val EXP_DELAY_MULTIPLIER: Double = 1.5
     const val RETRY_DELAY_MS: Double = 300.0

package/android/src/main/java/expo/modules/libvlcplayer/managers/PictureInPictureManager.kt

@@ -277,7 +277,7 @@ class PictureInPictureManager(
         pipView?.let { view ->
             // Black screen workaround
             view.detachPlayerLayout()
-            view.post { view.attachPlayerLayout(pictureLayout) }
+            view.postDelayed({ view.attachPlayerLayout(pictureLayout) }, MediaPlayerConstants.ATTACH_DELAY_MS)
         }
     }
 

package/expo-module.config.json

@@ -1,9 +1,9 @@
 {
-  "platforms": ["apple", "android"],
-  "apple": {
-    "modules": ["LibVlcPlayerModule"]
-  },
+  "platforms": ["android", "apple"],
   "android": {
     "modules": ["expo.modules.libvlcplayer.LibVlcPlayerModule"]
+  },
+  "apple": {
+    "modules": ["LibVlcPlayerModule"]
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-libvlc-player",
-  "version": "7.1.0",
+  "version": "7.1.2",
   "description": "LibVLC Player for Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -8,12 +8,13 @@
     "build": "node scripts/build.js",
     "clean": "node scripts/clean.js",
     "lint": "eslint src/",
-    "prepare": "node scripts/prepare.js",
+    "open:android": "node scripts/open-android.js",
     "open:ios": "node scripts/open-ios.js",
-    "open:android": "node scripts/open-android.js"
+    "prepare": "node scripts/prepare.js"
   },
   "keywords": [
     "react-native",
+    "vlc",
     "expo",
     "libvlc",
     "player",
@@ -45,8 +46,5 @@
     "expo": "*",
     "react": "*",
     "react-native": "*"
-  },
-  "allowScripts": {
-    "fsevents@2.3.3": true
   }
 }

package/plugin/build/withExpoLibVlcPlayer.js

@@ -5,6 +5,19 @@ const LOCAL_NETWORK_USAGE = "Allow $(PRODUCT_NAME) to access your local network"
 const AUDIO_BACKGROUND_MODE = "audio";
 const PICTURE_CONFIG_MANIFEST = "android:supportsPictureInPicture";
 const withExpoLibVlcPlayer = (config, { localNetworkPermission, supportsPictureInPicture } = {}) => {
+    (0, config_plugins_1.withAndroidManifest)(config, (config) => {
+        const needsConfigMod = typeof supportsPictureInPicture === "boolean";
+        if (needsConfigMod) {
+            const activity = config_plugins_1.AndroidConfig.Manifest.getMainActivityOrThrow(config.modResults);
+            if (supportsPictureInPicture) {
+                activity.$[PICTURE_CONFIG_MANIFEST] = "true";
+            }
+            else {
+                Reflect.deleteProperty(activity.$, PICTURE_CONFIG_MANIFEST);
+            }
+        }
+        return config;
+    });
     config_plugins_1.IOSConfig.Permissions.createPermissionsPlugin({
         NSLocalNetworkUsageDescription: LOCAL_NETWORK_USAGE,
     })(config, {
@@ -24,19 +37,6 @@ const withExpoLibVlcPlayer = (config, { localNetworkPermission, supportsPictureI
         }
         return config;
     });
-    (0, config_plugins_1.withAndroidManifest)(config, (config) => {
-        const needsConfigMod = typeof supportsPictureInPicture === "boolean";
-        if (needsConfigMod) {
-            const activity = config_plugins_1.AndroidConfig.Manifest.getMainActivityOrThrow(config.modResults);
-            if (supportsPictureInPicture) {
-                activity.$[PICTURE_CONFIG_MANIFEST] = "true";
-            }
-            else {
-                Reflect.deleteProperty(activity.$, PICTURE_CONFIG_MANIFEST);
-            }
-        }
-        return config;
-    });
     return config;
 };
 exports.default = withExpoLibVlcPlayer;

package/plugin/src/withExpoLibVlcPlayer.ts

@@ -19,39 +19,39 @@ const withExpoLibVlcPlayer: ConfigPlugin<WithExpoLibVlcPlayerProps> = (
   config,
   { localNetworkPermission, supportsPictureInPicture } = {}
 ) => {
-  IOSConfig.Permissions.createPermissionsPlugin({
-    NSLocalNetworkUsageDescription: LOCAL_NETWORK_USAGE,
-  })(config, {
-    NSLocalNetworkUsageDescription: localNetworkPermission,
-  });
-
-  withInfoPlist(config, (config) => {
+  withAndroidManifest(config, (config) => {
     const needsConfigMod = typeof supportsPictureInPicture === "boolean";
 
     if (needsConfigMod) {
-      const backgroundModes = config.modResults.UIBackgroundModes ?? [];
-      const filteredModes = backgroundModes.filter((mode) => mode !== AUDIO_BACKGROUND_MODE);
+      const activity = AndroidConfig.Manifest.getMainActivityOrThrow(config.modResults);
 
       if (supportsPictureInPicture) {
-        config.modResults.UIBackgroundModes = [...filteredModes, AUDIO_BACKGROUND_MODE];
+        activity.$[PICTURE_CONFIG_MANIFEST] = "true";
       } else {
-        config.modResults.UIBackgroundModes = filteredModes;
+        Reflect.deleteProperty(activity.$, PICTURE_CONFIG_MANIFEST);
       }
     }
 
     return config;
   });
 
-  withAndroidManifest(config, (config) => {
+  IOSConfig.Permissions.createPermissionsPlugin({
+    NSLocalNetworkUsageDescription: LOCAL_NETWORK_USAGE,
+  })(config, {
+    NSLocalNetworkUsageDescription: localNetworkPermission,
+  });
+
+  withInfoPlist(config, (config) => {
     const needsConfigMod = typeof supportsPictureInPicture === "boolean";
 
     if (needsConfigMod) {
-      const activity = AndroidConfig.Manifest.getMainActivityOrThrow(config.modResults);
+      const backgroundModes = config.modResults.UIBackgroundModes ?? [];
+      const filteredModes = backgroundModes.filter((mode) => mode !== AUDIO_BACKGROUND_MODE);
 
       if (supportsPictureInPicture) {
-        activity.$[PICTURE_CONFIG_MANIFEST] = "true";
+        config.modResults.UIBackgroundModes = [...filteredModes, AUDIO_BACKGROUND_MODE];
       } else {
-        Reflect.deleteProperty(activity.$, PICTURE_CONFIG_MANIFEST);
+        config.modResults.UIBackgroundModes = filteredModes;
       }
     }