Feature/example app navigation

CHANGELOG.md

@@ -160,6 +160,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+- Added ActiveQualityChanged event support for iOS.
 - Added `'root'` as an alternative id for the root div element in Web applications, supporting fullscreen presentation mode in Expo-based apps.
 - Added `renderingTarget` property to `THEOplayer` API for Android, enabling the option to choose between either rendering to a `SurfaceView` (default) or `TextureView`.
 
@@ -182,6 +183,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [7.4.0] - 24-06-11
 
+### Changed
+
+- Updated the example app to a stack navigation based setup with sample screens for different features.
+
 ### Added
 
 - Added support for `SourceDescription.poster` for Android & iOS.

android/build.gradle

@@ -28,7 +28,8 @@ static def versionString(version) {
 // Extensions
 def enabledGoogleIMA = safeExtGet("THEOplayer_extensionGoogleIMA", 'false').toBoolean()
 def enabledGoogleDAI = safeExtGet("THEOplayer_extensionGoogleDAI", 'false').toBoolean()
-def enabledAds = enabledGoogleIMA || enabledGoogleDAI
+def enabledTHEOads = safeExtGet("THEOplayer_extensionTHEOads", 'false').toBoolean()
+def enabledAds = enabledGoogleIMA || enabledGoogleDAI || enabledTHEOads
 def enabledCast = safeExtGet("THEOplayer_extensionCast", 'false').toBoolean()
 def enabledMediaSession = safeExtGet("THEOplayer_extensionMediaSession", 'true').toBoolean()
 
@@ -61,6 +62,7 @@ android {
     // Extension buildConfig fields
     buildConfigField "boolean", "EXTENSION_GOOGLE_IMA", "${enabledGoogleIMA}"
     buildConfigField "boolean", "EXTENSION_GOOGLE_DAI", "${enabledGoogleDAI}"
+    buildConfigField "boolean", "EXTENSION_THEOADS", "${enabledTHEOads}"
     buildConfigField "boolean", "EXTENSION_ADS", "${enabledAds}"
     buildConfigField "boolean", "EXTENSION_CAST", "${enabledCast}"
     buildConfigField "boolean", "EXTENSION_MEDIASESSION", "${enabledMediaSession}"
@@ -139,6 +141,16 @@ dependencies {
     compileOnly "com.theoplayer.theoplayer-sdk-android:integration-ads-dai:${theoplayer_sdk_version}"
   }
 
+  if (enabledTHEOads) {
+    println('Enable THEOplayer THEOads extension.')
+    implementation "com.theoplayer.theoplayer-sdk-android:integration-ads:${theoplayer_sdk_version}"
+    implementation "com.theoplayer.theoplayer-sdk-android:integration-ads-theoads:${theoplayer_sdk_version}"
+  } else {
+    println('Disable THEOplayer THEOads extension.')
+    compileOnly "com.theoplayer.theoplayer-sdk-android:integration-ads:${theoplayer_sdk_version}"
+    compileOnly "com.theoplayer.theoplayer-sdk-android:integration-ads-theoads:${theoplayer_sdk_version}"
+  }
+
   if (enabledCast) {
     println('Enable THEOplayer cast extension.')
     implementation "com.theoplayer.theoplayer-sdk-android:integration-cast:${theoplayer_sdk_version}"

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

@@ -18,6 +18,8 @@ import com.theoplayer.android.api.ads.dai.GoogleDaiIntegration
 import com.theoplayer.android.api.ads.dai.GoogleDaiIntegrationFactory
 import com.theoplayer.android.api.ads.ima.GoogleImaIntegration
 import com.theoplayer.android.api.ads.ima.GoogleImaIntegrationFactory
+import com.theoplayer.android.api.ads.theoads.TheoAdsIntegration
+import com.theoplayer.android.api.ads.theoads.TheoAdsIntegrationFactory
 import com.theoplayer.android.api.cast.CastIntegration
 import com.theoplayer.android.api.cast.CastIntegrationFactory
 import com.theoplayer.android.api.event.EventListener
@@ -80,6 +82,7 @@ class ReactTHEOplayerContext private constructor(
 
   var daiIntegration: GoogleDaiIntegration? = null
   var imaIntegration: GoogleImaIntegration? = null
+  private var theoAdsIntegration: TheoAdsIntegration? = null
   var castIntegration: CastIntegration? = null
   var wasPlayingOnHostPause: Boolean = false
   private var isHostPaused: Boolean = false
@@ -295,6 +298,17 @@ class ReactTHEOplayerContext private constructor(
     } catch (e: Exception) {
       Log.w(TAG, "Failed to configure Google DAI integration ${e.message}")
     }
+    try {
+      if (BuildConfig.EXTENSION_THEOADS) {
+        theoAdsIntegration = TheoAdsIntegrationFactory.createTheoAdsIntegration(
+          playerView
+        ).also {
+          playerView.player.addIntegration(it)
+        }
+      }
+    } catch (e: Exception) {
+      Log.w(TAG, "Failed to configure THEOAds integration ${e.message}")
+    }
     try {
       if (BuildConfig.EXTENSION_CAST) {
         castIntegration = CastIntegrationFactory.createCastIntegration(

android/src/main/java/com/theoplayer/source/SourceAdapter.kt

@@ -17,6 +17,8 @@ import com.theoplayer.android.api.source.addescription.GoogleImaAdDescription
 import com.theoplayer.android.api.player.track.texttrack.TextTrackKind
 import com.theoplayer.android.api.source.metadata.ChromecastMetadataImage
 import com.theoplayer.BuildConfig
+import com.theoplayer.android.api.ads.theoads.TheoAdDescription
+import com.theoplayer.android.api.ads.theoads.TheoAdsLayoutOverride
 import com.theoplayer.android.api.error.ErrorCode
 import com.theoplayer.android.api.source.AdIntegration
 import com.theoplayer.android.api.source.dash.DashPlaybackConfiguration
@@ -52,7 +54,15 @@ private const val PROP_ADS = "ads"
 private const val PROP_DASH = "dash"
 private const val PROP_DASH_IGNORE_AVAILABILITYWINDOW = "ignoreAvailabilityWindow"
 private const val PROP_HEADERS = "headers"
+private const val PROP_BACKDROP_DOUBLE_BOX = "backdropDoubleBox"
+private const val PROP_BACKDROP_LSHAPE = "backdropLShape"
+private const val PROP_CUSTOM_ASSET_KEY = "customAssetKey"
+private const val PROP_OVERRIDE_LAYOUT = "overrideLayout"
+private const val PROP_NETWORK_CODE = "networkCode"
+private const val PROP_USE_ID3 = "useId3"
+
 private const val ERROR_IMA_NOT_ENABLED = "Google IMA support not enabled."
+private const val ERROR_THEOADS_NOT_ENABLED = "THEOads support not enabled."
 private const val ERROR_UNSUPPORTED_CSAI_INTEGRATION = "Unsupported CSAI integration"
 private const val ERROR_MISSING_CSAI_INTEGRATION = "Missing CSAI integration"
 
@@ -252,6 +262,9 @@ class SourceAdapter {
         AdIntegration.GOOGLE_IMA.adIntegration -> parseImaAdFromJS(
           jsonAdDescription
         )
+        AdIntegration.THEO_ADS.adIntegration -> parseTheoAdFromJS(
+          jsonAdDescription
+        )
         else -> {
           throw THEOplayerException(
             ErrorCode.AD_ERROR,
@@ -285,6 +298,31 @@ class SourceAdapter {
       .build()
   }
 
+  @Throws(JSONException::class)
+  private fun parseTheoAdFromJS(jsonAdDescription: JSONObject): TheoAdDescription {
+    if (!BuildConfig.EXTENSION_THEOADS) {
+      throw THEOplayerException(ErrorCode.AD_ERROR, ERROR_THEOADS_NOT_ENABLED)
+    }
+    return TheoAdDescription(
+      networkCode = jsonAdDescription.optString(PROP_NETWORK_CODE),
+      backdropDoubleBox = jsonAdDescription.optString(PROP_BACKDROP_DOUBLE_BOX),
+      backdropLShape = jsonAdDescription.optString(PROP_BACKDROP_LSHAPE),
+      customAssetKey = jsonAdDescription.optString(PROP_CUSTOM_ASSET_KEY),
+      overrideLayout = parseOverrideLayout(jsonAdDescription.optString(PROP_OVERRIDE_LAYOUT)),
+      useId3 = jsonAdDescription.optBoolean(PROP_USE_ID3),
+    )
+  }
+
+  private fun parseOverrideLayout(layout: String?): TheoAdsLayoutOverride? {
+    return when (layout) {
+      "single" -> TheoAdsLayoutOverride.SINGLE
+      "l-shape" -> TheoAdsLayoutOverride.LSHAPE
+      "double" -> TheoAdsLayoutOverride.DOUBLE
+      "single-if-mobile" -> null /* Not supported yet */
+      else -> null
+    }
+  }
+
   @Throws(JSONException::class)
   private fun parseTextTrackFromJS(jsonTextTrack: JSONObject): TextTrackDescription {
     val builder = TextTrackDescription.Builder(jsonTextTrack.optString(PROP_SRC))

example/android/gradle.properties

@@ -61,6 +61,7 @@ THEOplayer_logMediaSessionEvents = true
 THEOplayer_extensionGoogleIMA = true
 THEOplayer_extensionGoogleDAI = true
 THEOplayer_extensionCast = true
+THEOplayer_extensionTHEOads = true
 THEOplayer_extensionMediaSession = true
 
 # Optionally limit timeUpdate rate, which could improve performance.

example/babel.config.js

@@ -13,5 +13,7 @@ module.exports = {
         },
       },
     ],
+    '@babel/plugin-transform-export-namespace-from',
+    'react-native-reanimated/plugin',
   ],
 };

example/ios/PodConfig.rb

@@ -0,0 +1,32 @@
+def nielsen_source
+  source 'https://github.com/NielsenDigitalSDK/nielsenappsdk-ios-specs-dynamic.git'
+end
+
+def google_cast_redirect
+  pod 'react-native-google-cast', :git => 'https://github.com/Danesz/react-native-google-cast.git', branch: 'feature/guestmode_apple_silicon'
+end
+
+def nielsen_post_install(installer, targetName)
+  # modify XCFramework configuration files to update NielsenAppApi.framework -> NielsenTVAppApi.framework
+  installer.pods_project.targets.each do |target|
+    if target.name == targetName
+      target.build_configurations.each do |config|
+        xcconfig_path = config.base_configuration_reference.real_path
+        puts "post_install: Found #{File.basename(xcconfig_path)}"
+        xcconfig = File.read(xcconfig_path)
+        new_xcconfig = xcconfig.sub('-framework "NielsenAppApi"', '-framework "NielsenTVAppApi"')
+        File.open(xcconfig_path, "w") { |file| file << new_xcconfig }
+        puts "post_install: Updated #{File.basename(xcconfig_path)} file with a value: NielsenTVAppApi.framework"
+      end
+      # update Pods-ReactNativeTHEOplayer-tvOS-frameworks.sh file
+      frameworksh_path = "Pods/Target Support Files/#{target.name}/#{target.name}-frameworks.sh"
+      if File.exist?(frameworksh_path)
+        puts "post_install: Found #{File.basename(frameworksh_path)}"
+        text = File.read(frameworksh_path)
+        new_contents = text.gsub('NielsenAppApi.framework', 'NielsenTVAppApi.framework')
+        File.open(frameworksh_path, "w") {|file| file.puts new_contents}
+        puts "post_install: Updated #{File.basename(frameworksh_path)} file with a value: NielsenTVAppApi.framework"
+      end
+    end
+  end
+end

example/ios/Podfile

@@ -1,14 +1,17 @@
 require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
+require_relative './PodConfig'
 
 source 'https://github.com/react-native-tvos/react-native-tvos-podspecs.git'
 source 'https://cdn.cocoapods.org/'
+nielsen_source
 
 linkage = ENV['USE_FRAMEWORKS']
 if linkage != nil
   Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
   use_frameworks! :linkage => linkage.to_sym
 end
+install! 'cocoapods', :deterministic_uuids => false
 
 install! 'cocoapods', :deterministic_uuids => false
 
@@ -19,11 +22,12 @@ target 'ReactNativeTHEOplayer' do
   config = use_native_modules!
 
   use_react_native!(
-    :path => config[:reactNativePath]
+    :path => config[:reactNativePath],
+    :hermes_enabled => false
   )
 
   pod 'react-native-theoplayer', :path => '../..'
-  pod 'react-native-google-cast', :git => 'https://github.com/Danesz/react-native-google-cast.git', branch: 'feature/guestmode_apple_silicon'
+  google_cast_redirect
 
   target 'ReactNativeTHEOplayerTests' do
     inherit! :complete
@@ -53,4 +57,5 @@ end
 
 post_install do |installer|
   react_native_post_install(installer)
+  nielsen_post_install(installer, "Pods-ReactNativeTHEOplayer-tvOS")
 end