Release/v8.6.0

.github/workflows/pr_android.yml

@@ -7,6 +7,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        api-level: [ 34 ]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -31,16 +34,51 @@ jobs:
         run: |
           npm i -g corepack
           npm ci
-          cd example
+          cd e2e
           npm ci
 
-      - name: Build application
-        working-directory: example/android
-        run: ./gradlew assembleRelease
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Gradle cache
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: AVD cache
+        uses: actions/cache@v4
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-${{ matrix.api-level }}
+
+      - name: create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true' #check previous step output
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          target: google_apis
+          arch: x86_64
+          cores: 2
+          ram-size: 3072M
+          force-avd-creation: true
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: echo "Generated AVD snapshot for caching."
 
-      - name: Upload application
-        uses: actions/upload-artifact@v4
+      - name: Run e2e tests
+        uses: reactivecircus/android-emulator-runner@v2
         with:
-          name: app
-          path: example/android/app/build/outputs/apk/release/app-release.apk
-          retention-days: 3
+          api-level: ${{ matrix.api-level }}
+          target: google_apis
+          arch: x86_64
+          cores: 2
+          ram-size: 3072M
+          force-avd-creation: true
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: npm run test:e2e:android:release
+          working-directory: e2e

.github/workflows/pr_ios.yml

@@ -25,25 +25,37 @@ jobs:
           node-version: '18'
           cache: 'npm'
 
+      - name: Cache CocoaPods
+        uses: actions/cache@v4
+        with:
+          path: e2e/ios/Pods
+          key: pods-${{ runner.os }}-${{ hashFiles('Podfile.lock') }}
+          restore-keys: |
+            pods-${{ runner.os }}-
+
+      - name: Run patch scripts
+        working-directory: e2e
+        run: bash ./scripts/patch_ios_podspec.sh
+
       - name: Run npm install
         run: |
           npm i -g corepack
           npm ci
-          cd example
+          cd e2e
           npm ci
 
-      - name: Run pod install
-        working-directory: example/ios
+      - name: Run pod install & update dependencies
+        working-directory: e2e/ios
         run: |
-          pod install
+          pod update
 
       - name: Start iOS simulator
         uses: futureware-tech/simulator-action@v3
         with:
           model: 'iPhone 14'
           os_version: '>=16.0'
 
-      - name: Build application
-        working-directory: example
-        run: npx react-native build-ios --mode Debug
+      - name: Run e2e tests
+        working-directory: e2e
+        run: npm run test:e2e:ios
 

.gitignore

@@ -43,6 +43,7 @@ android.iml
 # Cocoapods
 #
 example/ios/Pods
+e2e/ios/Pods
 
 # node.js
 #

CHANGELOG.md

@@ -5,6 +5,16 @@ 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.6.0] - 24-10-25
+
+### Added
+
+- Added `AdEvent.AD_CLICKED` and `AdEvent.AD_TAPPED` ad events for iOS and Android. The events are dispatched when a user taps or clicks on an ad that has a `clickThrough` link.
+
+### Changed
+
+- Upgrade example app to support React Native v0.75.
+
 ## [8.5.0] - 24-10-21
 
 ### Added

android/build.gradle

@@ -108,9 +108,9 @@ repositories {
   maven { url "https://maven.theoplayer.com/releases" }
 }
 
-// The minimum supported THEOplayer version is 8.1.0
-def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[8.1.0, 9.0.0)')
-def theoplayer_mediasession_version = safeExtGet('THEOplayer_mediasession', '[8.1.0, 9.0.0)')
+// The minimum supported THEOplayer version is 8.3.0
+def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[8.3.0, 9.0.0)')
+def theoplayer_mediasession_version = safeExtGet('THEOplayer_mediasession', '[8.0.0, 9.0.0)')
 
 dependencies {
   //noinspection GradleDynamicVersion

android/src/main/java/com/theoplayer/ads/AdEventAdapter.kt

@@ -115,8 +115,8 @@ class AdEventAdapter(private val adsApi: AdsApiWrapper, eventEmitter: AdEventEmi
         GoogleImaAdEventType.AD_BREAK_STARTED, AdsEventTypes.AD_BREAK_BEGIN -> "adbreakbegin"
         GoogleImaAdEventType.AD_BREAK_ENDED, AdsEventTypes.AD_BREAK_END -> "adbreakend"
         GoogleImaAdEventType.AD_BREAK_FETCH_ERROR -> "aderror"
-        GoogleImaAdEventType.CLICKED -> "adclicked"
-        GoogleImaAdEventType.TAPPED -> "adtapped"
+        GoogleImaAdEventType.CLICKED, AdsEventTypes.AD_CLICKED -> "adclicked"
+        GoogleImaAdEventType.TAPPED, AdsEventTypes.AD_TAPPED -> "adtapped"
         GoogleImaAdEventType.ICON_TAPPED -> "adicontapped"
         GoogleImaAdEventType.ICON_FALLBACK_IMAGE_CLOSED -> "adiconfallbackimageclosed"
         AdsEventTypes.ADD_AD -> "addad"

android/src/main/java/com/theoplayer/presentation/PresentationManager.kt

@@ -40,6 +40,8 @@ class PresentationManager(
 
   var currentPresentationMode: PresentationMode = PresentationMode.INLINE
     private set
+  var currentPresentationModeChangeContext: PresentationModeChangeContext? = null
+    private set
 
   var pipConfig: PipConfig = PipConfig()
 
@@ -54,12 +56,14 @@ class PresentationManager(
     }
     onPictureInPictureModeChanged = object : BroadcastReceiver() {
       override fun onReceive(context: Context?, intent: Intent?) {
-        // Dispatch event on every PiP mode change
+        val transitioningToPip = intent
+          ?.getBooleanExtra("isTransitioningToPip", false) ?: false
         val inPip = intent?.getBooleanExtra("isInPictureInPictureMode", false) ?: false
-        if (inPip) {
-          onEnterPip()
-        } else {
-          onExitPip()
+        // Dispatch event on every PiP mode change
+        when {
+          transitioningToPip -> onEnterPip(true)
+          inPip -> onEnterPip()
+          else -> onExitPip()
         }
       }
     }
@@ -104,9 +108,11 @@ class PresentationManager(
       PresentationMode.INLINE -> {
         setFullscreen(false)
       }
+
       PresentationMode.FULLSCREEN -> {
         setFullscreen(true)
       }
+
       PresentationMode.PICTURE_IN_PICTURE -> {
         setFullscreen(false)
         enterPip()
@@ -144,8 +150,13 @@ class PresentationManager(
     }
   }
 
-  private fun onEnterPip() {
-    updatePresentationMode(PresentationMode.PICTURE_IN_PICTURE)
+  private fun onEnterPip(transitioningToPip: Boolean = false) {
+    updatePresentationMode(
+      PresentationMode.PICTURE_IN_PICTURE,
+      if (transitioningToPip)
+        PresentationModeChangeContext(PresentationModeChangePipContext.TRANSITIONING_TO_PIP)
+      else null
+    )
   }
 
   private fun onExitPip() {
@@ -241,11 +252,14 @@ class PresentationManager(
     presentationMode: PresentationMode,
     context: PresentationModeChangeContext? = null
   ) {
-    if (presentationMode == currentPresentationMode) {
+    if (presentationMode == currentPresentationMode &&
+      context == currentPresentationModeChangeContext
+    ) {
       return
     }
     val prevPresentationMode = currentPresentationMode
     currentPresentationMode = presentationMode
+    currentPresentationModeChangeContext = context
     eventEmitter.emitPresentationModeChange(presentationMode, prevPresentationMode, context)
 
     // Resume playing when going to PiP and player was playing

android/src/main/java/com/theoplayer/presentation/PresentationModeChangeContext.kt

@@ -9,7 +9,10 @@ enum class PresentationModeChangePipContext {
   CLOSED,
 
   // The PiP window transitioned back into the app.
-  RESTORED
+  RESTORED,
+
+  // The app transitioning to PiP frame
+  TRANSITIONING_TO_PIP
 }
 
 data class PresentationModeChangeContext(

android/src/main/java/com/theoplayer/util/PayloadBuilder.kt

@@ -109,6 +109,7 @@ class PayloadBuilder {
     val contextPayload = Arguments.createMap()
     context.pip?.let { pipCtx ->
       contextPayload.putString(EVENT_PROP_PIP, when (pipCtx) {
+        PresentationModeChangePipContext.TRANSITIONING_TO_PIP -> "transitioning-to-pip"
         PresentationModeChangePipContext.RESTORED -> "restored"
         else -> "closed"
       })

doc/pip.md

@@ -96,6 +96,27 @@ override fun onPictureInPictureModeChanged(
 }
 ```
 
+### Enabling early transitioning to PiP event
+
+You might want to enable [transitioning to PiP](<https://developer.android.com/reference/android/app/PictureInPictureUiState#isTransitioningToPip()>) event for Android 15+ (API 35+). To enable it make sure that
+the compile SDK version is set to 35 in your build.gradle `compileSdkVersion = 35`. Also the appropriate intent should be sent from the `MainActivity` to let react-native know when the app starts the PiP animation:
+
+```kotlin
+override fun onPictureInPictureUiStateChanged(pipState: PictureInPictureUiState) {
+    super.onPictureInPictureUiStateChanged(pipState)
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM &&
+        pipState.isTransitioningToPip
+    ) {
+        Intent("onPictureInPictureModeChanged").also {
+            it.putExtra("isTransitioningToPip", true)
+            sendBroadcast(it)
+        }
+    }
+}
+```
+
+Then it should set the `context?.pip` to `PresentationModeChangePipContext.TRANSITIONING_TO_PIP` in the event `PlayerEventType.PRESENTATIONMODE_CHANGE`.
+
 ### PiP controls
 
 The PiP window will show the default controls to configure, maximize and close the PiP window.

e2e/android/app/_BUCK

@@ -0,0 +1,55 @@
+# To learn about Buck see [Docs](https://buckbuild.com/).
+# To run your application with Buck:
+# - install Buck
+# - `npm start` - to start the packager
+# - `cd android`
+# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"`
+# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
+# - `buck install -r android/app` - compile, install and run application
+#
+
+load(":build_defs.bzl", "create_aar_targets", "create_jar_targets")
+
+lib_deps = []
+
+create_aar_targets(glob(["libs/*.aar"]))
+
+create_jar_targets(glob(["libs/*.jar"]))
+
+android_library(
+    name = "all-libs",
+    exported_deps = lib_deps,
+)
+
+android_library(
+    name = "app-code",
+    srcs = glob([
+        "src/main/java/**/*.java",
+    ]),
+    deps = [
+        ":all-libs",
+        ":build_config",
+        ":res",
+    ],
+)
+
+android_build_config(
+    name = "build_config",
+    package = "com.reactnativetheoplayer",
+)
+
+android_resource(
+    name = "res",
+    package = "com.reactnativetheoplayer",
+    res = "src/main/res",
+)
+
+android_binary(
+    name = "app",
+    keystore = "//android/keystores:debug",
+    manifest = "src/main/AndroidManifest.xml",
+    package_type = "debug",
+    deps = [
+        ":app-code",
+    ],
+)