react-native-theoplayer 8.7.0 → 8.8.0

package/CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [8.8.0] - 24-11-19
+
+### Added
+
+- Added `HomeIndicatorViewController` to iOS, which can be used as an alternative `rootViewController` for the native App. It will automatically show/hide the home indicator when transitioning from/to fullscreen presentationMode.
+
+### Changed
+
+- Simplified the `viewController` reparenting mechanism on iOS that is applied when changing the presentationMode to/from fullscreen.
+- The `MediaPlaybackService` on Android is never restarted if a MediaButton event is received after the app was closed.
+- Added a consumer R8 config file on Android, telling R8 not to throw errors or warnings because of classes that are expected to be missing.
+
 ## [8.7.0] - 24-11-05
 
 ### Fixed

package/android/build.gradle

@@ -66,6 +66,8 @@ android {
     buildConfigField "boolean", "EXTENSION_ADS", "${enabledAds}"
     buildConfigField "boolean", "EXTENSION_CAST", "${enabledCast}"
     buildConfigField "boolean", "EXTENSION_MEDIASESSION", "${enabledMediaSession}"
+
+    consumerProguardFiles 'proguard-rules.pro'
   }
 
   buildTypes {

package/android/proguard-rules.pro

@@ -0,0 +1,3 @@
+# Do no warn if any of the API classes we resolve with compileOnly are missing because the feature
+# is disabled: it is expected.
+-dontwarn com.theoplayer.android.api.**

package/android/src/main/java/com/theoplayer/ReactTHEOplayerContext.kt

@@ -239,7 +239,8 @@ class ReactTHEOplayerContext private constructor(
     // Create and initialize the media session
     val mediaSession = MediaSessionCompat(reactContext, TAG)
 
-    // Do not let MediaButtons restart the player when the app is not visible
+    // Do not let MediaButtons restart the player when media session is not active.
+    // https://developer.android.com/media/legacy/media-buttons#restarting-inactive-mediasessions
     mediaSession.setMediaButtonReceiver(null)
 
     // Create a MediaSessionConnector and attach the THEOplayer instance.

package/android/src/main/java/com/theoplayer/media/MediaPlaybackService.kt

@@ -152,6 +152,10 @@ class MediaPlaybackService : Service() {
 
       // Set mediaSession active
       setActive(BuildConfig.EXTENSION_MEDIASESSION)
+
+      // Do not let MediaButtons restart the player when media session is not active.
+      // https://developer.android.com/media/legacy/media-buttons#restarting-inactive-mediasessions
+      mediaSession.setMediaButtonReceiver(null)
     }
   }
 

package/ios/THEOplayerRCTView.swift

@@ -9,6 +9,7 @@ public class THEOplayerRCTView: UIView {
     public private(set) var player: THEOplayer?
     public private(set) var mainEventHandler: THEOplayerRCTMainEventHandler
     public private(set) var broadcastEventHandler: THEOplayerRCTBroadcastEventHandler
+    let theoPlayerViewController = UIViewController()
     var textTrackEventHandler: THEOplayerRCTTextTrackEventHandler
     var mediaTrackEventHandler: THEOplayerRCTMediaTrackEventHandler
     var metadataTrackEventHandler: THEOplayerRCTSideloadedMetadataTrackEventHandler
@@ -76,6 +77,14 @@ public class THEOplayerRCTView: UIView {
         if let player = self.player {
             player.frame = self.frame
             player.autoresizingMask = [.flexibleBottomMargin, .flexibleHeight, .flexibleLeftMargin, .flexibleRightMargin, .flexibleTopMargin, .flexibleWidth]
+          
+            // wrap theoPlayerViewController around the view
+            if theoPlayerViewController.parent == nil,
+               let parentViewController = self.findViewController() {
+                parentViewController.addChild(self.theoPlayerViewController)
+                self.theoPlayerViewController.didMove(toParent: parentViewController)
+                self.theoPlayerViewController.view = self
+            }
         }
     }
     

package/ios/presentationMode/THEOplayerRCTPresentationModeManager.swift

@@ -14,7 +14,6 @@ public class THEOplayerRCTPresentationModeManager {
   
     private var containerView: UIView?                  // view containing the playerView and it's siblings (e.g. UI)
     private var inlineParentView: UIView?               // target view for inline representation
-    private var movingChildVCs: [UIViewController] = []  // list of playerView's child VCs that need to be reparented while moving the playerView
         
     // MARK: Events
     var onNativePresentationModeChange: RCTDirectEventBlock?
@@ -39,35 +38,21 @@ public class THEOplayerRCTPresentationModeManager {
     
     // MARK: - logic
     
-    private func storeMovingVCs(for view: UIView) {
-        if let viewController = view.findViewController() {
-            viewController.children.forEach { childVC in
-                self.movingChildVCs.append(childVC)
-            }
-        }
-    }
-    
-    private func clearMovingVCs() {
-        self.movingChildVCs = []
-    }
-    
-    private func moveView(_ movingView: UIView, to targetView: UIView, with movingViewControllers: [UIViewController]) {
-        // detach the moving viewControllers from their parent
-        movingViewControllers.forEach { movedVC in
-            movedVC.removeFromParent()
-        }
+    private func moveView(_ movingView: UIView, to targetView: UIView) {
+        guard let theoPlayerViewController = (self.view as? THEOplayerRCTView)?.theoPlayerViewController else { return }
+      
+        // detach the viewController from its parent
+        theoPlayerViewController.removeFromParent()
         
         // move the actual view
         movingView.removeFromSuperview()
         targetView.addSubview(movingView)
         targetView.bringSubviewToFront(movingView)
         
-        // attach the moving viewControllers to their new parent
+        // attach the viewController to its new parent
         if let targetViewController = targetView.findViewController() {
-            movingViewControllers.forEach { movedVC in
-                targetViewController.addChild(movedVC)
-                movedVC.didMove(toParent: targetViewController)
-            }
+            targetViewController.addChild(theoPlayerViewController)
+            theoPlayerViewController.didMove(toParent: targetViewController)
         }
     }
     
@@ -75,19 +60,32 @@ public class THEOplayerRCTPresentationModeManager {
         self.containerView = self.view?.findParentViewOfType(RCTView.self)
         self.inlineParentView = self.containerView?.findParentViewOfType(RCTView.self)
         
+        // move the player
         if let containerView = self.containerView,
            let fullscreenParentView = self.view?.findParentViewOfType(RCTRootContentView.self) {
-            self.storeMovingVCs(for: containerView)
-            self.moveView(containerView, to: fullscreenParentView, with: self.movingChildVCs)
+            self.moveView(containerView, to: fullscreenParentView)
+
+            // start hiding home indicator
+            if let customRootViewController = fullscreenParentView.findViewController() as? HomeIndicatorViewController {
+                customRootViewController.prefersAutoHidden = true
+                customRootViewController.setNeedsUpdateOfHomeIndicatorAutoHidden()
+            }
         }
         self.rnInlineMode = .fullscreen
     }
     
     private func exitFullscreen() {
+        // stop hiding home indicator
+        if let fullscreenParentView = self.view?.findParentViewOfType(RCTRootContentView.self),
+           let customRootViewController = fullscreenParentView.findViewController() as? HomeIndicatorViewController {
+            customRootViewController.prefersAutoHidden = false
+            customRootViewController.setNeedsUpdateOfHomeIndicatorAutoHidden()
+        }
+      
+        // move the player
         if let containerView = self.containerView,
            let inlineParentView = self.inlineParentView {
-            self.moveView(containerView, to: inlineParentView, with: self.movingChildVCs)
-            self.clearMovingVCs()
+            self.moveView(containerView, to: inlineParentView)
         }
         self.rnInlineMode = .inline
     }

package/ios/viewController/HomeIndicatorViewController.swift

@@ -0,0 +1,14 @@
+// HomeIndicatorViewController.swift
+
+import UIKit
+
+@objc
+public class HomeIndicatorViewController: UIViewController {
+  public var prefersAutoHidden = false
+  
+  public override var prefersHomeIndicatorAutoHidden: Bool {
+    get {
+      return self.prefersAutoHidden
+    }
+  }
+}

package/lib/commonjs/manifest.json

@@ -1 +1 @@
-{"version":"8.7.0","buildDate":"2024-11-05T13:50:34.649Z"}
+{"version":"8.8.0","buildDate":"2024-11-19T15:05:29.967Z"}

package/lib/module/manifest.json

@@ -1 +1 @@
-{"version":"8.7.0","buildDate":"2024-11-05T13:50:34.649Z"}
+{"version":"8.8.0","buildDate":"2024-11-19T15:05:29.967Z"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-theoplayer",
-  "version": "8.7.0",
+  "version": "8.8.0",
   "description": "A THEOplayer video component for react-native.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/react-native-theoplayer.podspec

@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => "13.4", :tvos => "13.4" }
   s.source       = { :git => "https://www.theoplayer.com/.git", :tag => "#{s.version}" }
 
-  s.source_files = 'ios/*.{h,m,swift}', 'ios/ads/*.swift', 'ios/casting/*.swift', 'ios/contentprotection/*.swift', 'ios/pip/*.swift', 'ios/backgroundAudio/*.swift', 'ios/cache/*.swift', 'ios/sideloadedMetadata/*.swift', 'ios/eventBroadcasting/*.swift' , 'ios/ui/*.swift', 'ios/presentationMode/*.swift'
+  s.source_files = 'ios/*.{h,m,swift}', 'ios/ads/*.swift', 'ios/casting/*.swift', 'ios/contentprotection/*.swift', 'ios/pip/*.swift', 'ios/backgroundAudio/*.swift', 'ios/cache/*.swift', 'ios/sideloadedMetadata/*.swift', 'ios/eventBroadcasting/*.swift' , 'ios/ui/*.swift', 'ios/presentationMode/*.swift', 'ios/viewController/*.swift'
   s.resources = ['ios/*.css']
 
   # ReactNative Dependency

package/src/manifest.json

@@ -1 +1 @@
-{"version":"8.7.0","buildDate":"2024-11-05T13:50:34.649Z"}
+{"version":"8.8.0","buildDate":"2024-11-19T15:05:29.967Z"}