expo-libvlc-player 0.1.7 → 0.1.8

package/README.md

@@ -113,7 +113,7 @@ The `VLCPlayerView` extends React Native `ViewProps` and implements its own:
 | ------------------- | ------------------------------------------------ | ------------------------------------------------------------------------------------------------------------- |
 | `onBuffering`       | Called after the `Buffering` player event        |                                                                                                               |
 | `onPlaying`         | Called after the `Playing` player event          |                                                                                                               |
-| `onPaused`          | Called after the `Paused` player event           |                                                                                                               |
+| `onPaused`          | Called after the `Paused` player event           | `{ background: boolean }`                                                                                     |
 | `onStopped`         | Called after the `Stopped` player event          |                                                                                                               |
 | `onPositionChanged` | Called after the `PositionChanged` player event  | `{ position: number }`                                                                                        |
 | `onEnded`           | Called after the `EndReached` player event       |                                                                                                               |
@@ -121,7 +121,6 @@ The `VLCPlayerView` extends React Native `ViewProps` and implements its own:
 | `onWarn`            | Called after the player encounters a conflict    | `{ warn: string }`                                                                                            |
 | `onError`           | Called after the `EncounteredError` player event | `{ error: string }`                                                                                           |
 | `onLoad`            | Called after the `Buffering` player event        | `{ width: number, height: number, aspectRatio: string, duration: number, tracks: object, seekable: boolean }` |
-| `onBackground`      | Called after the player enters the background    | `{ background: boolean }`                                                                                     |
 
 ## Disclaimer
 

package/android/build.gradle

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

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

@@ -43,6 +43,8 @@ object VlcPlayerManager {
     fun onAppForegrounded() {
         views.forEach { playerView ->
             playerView.get()?.let { view ->
+                view.isBackgrounded = false
+
                 view.mediaPlayer?.let { player ->
                     player.attachViews(
                         view.videoLayout,
@@ -68,8 +70,6 @@ object VlcPlayerManager {
         views.forEach { playerView ->
             playerView.get()?.let { view ->
                 view.isBackgrounded = true
-                val background = mapOf("background" to view.isBackgrounded)
-                view.onBackground(background)
 
                 view.mediaPlayer?.let { player ->
                     if (view.playInBackground != true && player.isPlaying()) {

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

@@ -17,7 +17,6 @@ private const val WARN_EVENT = "onWarn"
 private const val ERROR_EVENT = "onError"
 private const val POSITION_CHANGED_EVENT = "onPositionChanged"
 private const val LOAD_EVENT = "onLoad"
-private const val BACKGROUND_EVENT = "onBackground"
 
 val playerEvents = arrayOf(
     BUFFERING_EVENT,
@@ -29,8 +28,7 @@ val playerEvents = arrayOf(
     WARN_EVENT,
     ERROR_EVENT,
     POSITION_CHANGED_EVENT,
-    LOAD_EVENT,
-    BACKGROUND_EVENT
+    LOAD_EVENT
 )
 
 class VlcPlayerModule : Module() {

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

@@ -62,7 +62,6 @@ class VlcPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     private val onError by EventDispatcher()
     private val onPositionChanged by EventDispatcher()
     private val onLoad by EventDispatcher<WritableMap>()
-    internal val onBackground by EventDispatcher()
 
     private lateinit var audioFocusManager: AudioFocusManager
 
@@ -163,7 +162,8 @@ class VlcPlayerView(context: Context, appContext: AppContext) : ExpoView(context
                     }
 
                     Event.Paused -> {
-                        onPaused(mapOf())
+                        val background = mapOf("background" to isBackgrounded)
+                        onPaused(background)
                         audioFocusManager.updateAudioFocus()
                     }
 
@@ -333,9 +333,6 @@ class VlcPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     }
 
     fun play() {
-        isBackgrounded = false
-        val background = mapOf("background" to isBackgrounded)
-        onBackground(background)
         mediaPlayer?.play()
     }
 

package/ios/VlcPlayerManager.swift

@@ -22,12 +22,15 @@ class VlcPlayerManager {
     }
   }
 
+  func onAppForegrounded() {
+    for view in views.allObjects {
+      view.isBackgrounded = false
+    }
+  }
+
   func onAppBackgrounded() {
     for view in views.allObjects {
       view.isBackgrounded = true
-      let background = ["background": view.isBackgrounded]
-      view.onBackground(background)
-      view.onBackground([:])
 
       guard let player = view.mediaPlayer else { continue }
 

package/ios/VlcPlayerModule.swift

@@ -11,7 +11,6 @@ private let warnEvent = "onWarn"
 private let errorEvent = "onError"
 private let positionChangedEvent = "onPositionChanged"
 private let loadEvent = "onLoad"
-private let backgroundEvent = "onBackground"
 
 let playerEvents = [
     bufferingEvent,
@@ -23,8 +22,7 @@ let playerEvents = [
     warnEvent,
     errorEvent,
     positionChangedEvent,
-    loadEvent,
-    backgroundEvent,
+    loadEvent
 ]
 
 public class VlcPlayerModule: Module {
@@ -111,6 +109,10 @@ public class VlcPlayerModule: Module {
             }
         }
 
+        OnAppEntersForeground {
+            VlcPlayerManager.shared.onAppForegrounded()
+        }
+
         OnAppEntersBackground {
             VlcPlayerManager.shared.onAppBackgrounded()
         }

package/ios/VlcPlayerView.swift

@@ -37,7 +37,6 @@ class VlcPlayerView: ExpoView, VLCMediaPlayerDelegate {
     private let onError = EventDispatcher()
     private let onPositionChanged = EventDispatcher()
     private let onLoad = EventDispatcher()
-    let onBackground = EventDispatcher()
 
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
@@ -169,7 +168,8 @@ class VlcPlayerView: ExpoView, VLCMediaPlayerDelegate {
                 }
             }
         case .paused:
-            onPaused([:])
+            let background = ["background": isBackgrounded]
+            onPaused(background)
             VlcPlayerManager.shared.setAppropriateAudioSessionOrWarn()
         case .stopped:
             onStopped([:])
@@ -312,9 +312,6 @@ class VlcPlayerView: ExpoView, VLCMediaPlayerDelegate {
     }
 
     func play() {
-        isBackgrounded = false
-        let background = ["background": isBackgrounded]
-        onBackground(background)
         mediaPlayer?.play()
     }
 

package/lint-staged.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+  "**/*.js?(x)": "eslint --fix",
+  "**/*.ts?(x)": [() => "tsc --noEmit --skipLibCheck", "eslint --fix"],
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-libvlc-player",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "LibVLC Player for Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -15,12 +15,6 @@
     "open:ios": "xed example/ios",
     "open:android": "open -a \"Android Studio\" example/android"
   },
-  "lint-staged": {
-    "**/*.{ts,tsx,d.ts}": [
-      "eslint --fix",
-      "tsc --noEmit --skipLibCheck --jsx preserve"
-    ]
-  },
   "keywords": [
     "react-native",
     "vlc",

package/src/VlcPlayer.types.ts

@@ -37,7 +37,14 @@ export type BufferingListener = () => void;
 /**
  * @hidden
  */
-export type PlayingPausedListener = () => void;
+export type PlayingListener = () => void;
+
+/**
+ * @hidden
+ */
+export type PausedListener = (event: { nativeEvent: Paused }) => void;
+
+export type Paused = { background: boolean };
 
 /**
  * @hidden
@@ -82,13 +89,6 @@ export type PositionChanged = { position: number };
  */
 export type LoadListener = (event: { nativeEvent: VideoInfo }) => void;
 
-/**
- * @hidden
- */
-export type BackgroundListener = (event: { nativeEvent: Background }) => void;
-
-export type Background = { background: boolean };
-
 export interface Track {
   id: number;
   name: string;
@@ -137,8 +137,8 @@ export interface VlcPlayerViewNativeProps {
   playInBackground?: boolean;
   autoplay?: boolean;
   onBuffering?: BufferingListener;
-  onPlaying?: PlayingPausedListener;
-  onPaused?: PlayingPausedListener;
+  onPlaying?: PlayingListener;
+  onPaused?: PausedListener;
   onStopped?: StoppedListener;
   onEnded?: EndedListener;
   onRepeat?: RepeatListener;
@@ -146,7 +146,6 @@ export interface VlcPlayerViewNativeProps {
   onError?: ErrorListener;
   onPositionChanged?: PositionChangedListener;
   onLoad?: LoadListener;
-  onBackground?: BackgroundListener;
 }
 
 export type AudioMixingMode =
@@ -270,7 +269,7 @@ export interface VlcPlayerViewProps extends ViewProps {
   /**
    * Event that fires when player pauses
    */
-  onPaused?: () => void;
+  onPaused?: (event: Paused) => void;
   /**
    * Event that fires when player stops
    */
@@ -299,8 +298,4 @@ export interface VlcPlayerViewProps extends ViewProps {
    * Event that fires when player loads
    */
   onLoad?: (event: VideoInfo) => void;
-  /**
-   * Event that fires when player enters the background
-   */
-  onBackground?: (event: Background) => void;
 }

package/src/VlcPlayerView.tsx

@@ -5,11 +5,11 @@ import {
   VlcPlayerViewNativeProps,
   VlcPlayerViewProps,
   VLCPlayerViewRef,
+  type Paused,
   type Warn,
   type Error,
   type PositionChanged,
   type VideoInfo,
-  type Background,
 } from "./VlcPlayer.types";
 import { convertNativeProps } from "./utils/props";
 
@@ -30,6 +30,12 @@ const VlcPlayerView = forwardRef<VLCPlayerViewRef, VlcPlayerViewProps>(
       loggedRenderingChildrenWarning = true;
     }
 
+    const onPaused = ({ nativeEvent }: { nativeEvent: Paused }) => {
+      if (props.onPaused) {
+        props.onPaused(nativeEvent);
+      }
+    };
+
     const onWarn = ({ nativeEvent }: { nativeEvent: Warn }) => {
       if (props.onWarn) {
         props.onWarn(nativeEvent);
@@ -58,21 +64,15 @@ const VlcPlayerView = forwardRef<VLCPlayerViewRef, VlcPlayerViewProps>(
       }
     };
 
-    const onBackground = ({ nativeEvent }: { nativeEvent: Background }) => {
-      if (props.onBackground) {
-        props.onBackground(nativeEvent);
-      }
-    };
-
     return (
       <NativeView
         {...nativeProps}
         ref={ref}
+        onPaused={onPaused}
         onWarn={onWarn}
         onError={onError}
         onPositionChanged={onPositionChanged}
         onLoad={onLoad}
-        onBackground={onBackground}
       />
     );
   },