Merge pull request #427 from THEOplayer/feature/new_arch

Feature/new arch

Author: tvanlaerhoven

.bundle/config

@@ -0,0 +1,2 @@
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_FORCE_RUBY_PLATFORM: 1

.github/workflows/pr_android.yml

@@ -17,7 +17,8 @@ jobs:
     strategy:
       matrix:
         api-level: [ 34 ]
-    name: Build for API Level ${{ matrix.api-level }}
+        newArchEnabled: [ false, true ]
+    name: Build for API Level ${{ matrix.api-level }} using ${{matrix.newArchEnabled  == true && 'New' || 'Old' }} Architecture
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -77,6 +78,13 @@ jobs:
           disable-animations: true
           script: echo "Generated AVD snapshot for caching."
 
+      - name: Modify gradle.properties for newArchEnabled
+        working-directory: e2e/android
+        run: |
+          # Modify or add the newArchEnabled property in gradle.properties
+          echo "newArchEnabled=${{ matrix.newArchEnabled }}" >> ./gradle.properties
+          cat ./gradle.properties
+
       - name: Run e2e tests
         uses: reactivecircus/android-emulator-runner@v2
         with:

.github/workflows/pr_ios.yml

@@ -13,12 +13,14 @@ on:
 
 jobs:
   build:
+    runs-on: macos-latest
     strategy:
       matrix:
         xcode_version: [ '15.4.0' ]
+        newArchEnabled: [ 0, 1 ]
         platform: [iOS, tvOS]
-    runs-on: macos-latest
-    name: Build for ${{ matrix.platform }} using XCode version ${{ matrix.xcode_version }}
+    name: Build for ${{ matrix.platform }} using XCode version ${{ matrix.xcode_version }} and ${{matrix.newArchEnabled  == 1 && 'New' || 'Old' }} Architecture
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -34,11 +36,19 @@ jobs:
           node-version: '18'
           cache: 'npm'
 
+      - name: Cache Ruby Gems
+        uses: actions/cache@v4
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
+
       - name: Cache CocoaPods
         uses: actions/cache@v4
         with:
           path: e2e/ios/Pods
-          key: pods-${{ runner.os }}-${{ hashFiles('Podfile.lock') }}
+          key: pods-${{ runner.os }}-${{ hashFiles('Podfile.lock') }}-${{ matrix.newArchEnabled }}
           restore-keys: |
             pods-${{ runner.os }}-
 
@@ -53,10 +63,13 @@ jobs:
           cd e2e
           npm ci
 
+      - name: Install Ruby dependencies
+        run: bundle install
+
       - name: Run pod install & update dependencies
         working-directory: e2e/ios
         run: |
-          pod update
+          RCT_NEW_ARCH_ENABLED=${{ matrix.newArchEnabled }} bundle exec pod update
 
       - name: Start iOS simulator
         uses: futureware-tech/simulator-action@v4
@@ -71,4 +84,5 @@ jobs:
 
       - name: Summarize results
         working-directory: e2e
+        if: always()
         run: cat cavy_results.md >> $GITHUB_STEP_SUMMARY

Gemfile

@@ -34,3 +34,7 @@ gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]
 
 # Needed for `jekyll serve`
 gem "webrick", "~> 1.8"
+
+# Cocoapods 1.15 introduced a bug which breaks the build. 
+gem 'cocoapods', '>= 1.13', '< 1.15'
+gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'

android/build.gradle

@@ -25,6 +25,14 @@ static def versionString(version) {
   return "${version == '+' ? 'latest' : version}"
 }
 
+def isNewArchitectureEnabled() {
+  // To opt-in for the New Architecture, you can either:
+  // - Set `newArchEnabled` to true inside the `gradle.properties` file
+  // - Invoke gradle with `-newArchEnabled=true`
+  // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
+  return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
+
 // Extensions
 def enabledGoogleIMA = safeExtGet("THEOplayer_extensionGoogleIMA", 'false').toBoolean()
 def enabledGoogleDAI = safeExtGet("THEOplayer_extensionGoogleDAI", 'false').toBoolean()
@@ -69,6 +77,8 @@ android {
     buildConfigField "boolean", "EXTENSION_MEDIASESSION", "${enabledMediaSession}"
     buildConfigField "boolean", "EXTENSION_MEDIA3", "${enabledMedia3}"
 
+    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+
     consumerProguardFiles 'proguard-rules.pro'
   }
 

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

@@ -8,7 +8,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.uimanager.UIManagerHelper
-import com.facebook.react.uimanager.common.ViewUtil
+import com.facebook.react.uimanager.common.UIManagerType
 import com.theoplayer.ads.AdEventAdapter
 import com.theoplayer.ads.AdEventAdapter.AdEventEmitter
 import com.theoplayer.android.api.THEOplayerGlobal
@@ -47,7 +47,6 @@ import com.theoplayer.track.*
 import com.theoplayer.util.PayloadBuilder
 import kotlin.math.floor
 
-
 private val TAG = PlayerEventEmitter::class.java.name
 
 private const val EVENT_PLAYER_READY = "onNativePlayerReady"
@@ -613,8 +612,13 @@ class PlayerEventEmitter internal constructor(
       } catch (ignore: RuntimeException) {
       }
     }
-    val uiManager = UIManagerHelper.getUIManager(reactContext, ViewUtil.getUIManagerType(viewId))
-    uiManager?.receiveEvent(UIManagerHelper.getSurfaceId(reactContext), viewId, type, event)
+    UIManagerHelper.getUIManager(
+      reactContext,
+      if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+        UIManagerType.FABRIC
+      } else {
+        UIManagerType.DEFAULT
+      })?.receiveEvent(UIManagerHelper.getSurfaceId(playerView), viewId, type, event)
   }
 
   private fun attachListeners(player: Player) {

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

@@ -26,6 +26,7 @@ class ReactTHEOplayerView(private val reactContext: ThemedReactContext) :
   var presentationManager: PresentationManager? = null
   var playerContext: ReactTHEOplayerContext? = null
   private var isInitialized: Boolean = false
+  private var config: PlayerConfigAdapter? = null
 
   val adsApi: AdsApiWrapper
 
@@ -40,36 +41,46 @@ class ReactTHEOplayerView(private val reactContext: ThemedReactContext) :
     adsApi = AdsApiWrapper()
   }
 
-  fun initialize(configProps: ReadableMap?) {
+  fun initialize(config: PlayerConfigAdapter) {
     if (BuildConfig.LOG_VIEW_EVENTS) {
       Log.d(TAG, "Initialize view")
     }
     if (isInitialized) {
       Log.w(TAG, "Already initialized view")
       return
     }
+    this.config = config
+    if (!isAttachedToWindow) {
+      // The view is not attached to the window yet, postpone the initialization.
+      return
+    }
     isInitialized = true
     playerContext = ReactTHEOplayerContext.create(
       reactContext,
-      PlayerConfigAdapter(configProps)
+      config
     )
     playerContext?.apply {
       adsApi.initialize(player, imaIntegration, daiIntegration)
       val layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
       playerView.layoutParams = layoutParams
       (playerView.parent as? ViewGroup)?.removeView(playerView)
       addView(playerView, 0, layoutParams)
-
       presentationManager = PresentationManager(
         this,
         reactContext,
         eventEmitter
       )
-
       eventEmitter.preparePlayer(player)
     }
   }
 
+  override fun onAttachedToWindow() {
+    super.onAttachedToWindow()
+    if (!isInitialized) {
+      config?.let { initialize(it) }
+    }
+  }
+
   override fun setId(id: Int) {
     super.setId(id)
     eventEmitter.setViewId(id)

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

@@ -31,7 +31,7 @@ class ReactTHEOplayerViewManager : ViewGroupManager<ReactTHEOplayerView>() {
 
   @ReactProp(name = PROP_CONFIG)
   fun setConfig(videoView: ReactTHEOplayerView, config: ReadableMap?) {
-    videoView.initialize(config)
+    videoView.initialize(PlayerConfigAdapter(config))
   }
 
   override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> {

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

@@ -16,6 +16,7 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.lifecycle.Lifecycle
 import com.facebook.react.ReactRootView
+import com.facebook.react.runtime.ReactSurfaceView
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.views.view.ReactViewGroup
 import com.theoplayer.BuildConfig
@@ -211,7 +212,7 @@ class PresentationManager(
     // Get the player's ReactViewGroup parent, which contains THEOplayerView and its children (typically the UI).
     val reactPlayerGroup: ReactViewGroup? = getClosestParentOfType(this.viewCtx.playerView)
 
-    // Get ReactNative's root node or the render hiearchy
+    // Get ReactNative's root node or the render hierarchy
     val root: ReactRootView? = getClosestParentOfType(reactPlayerGroup)
 
     if (fullscreen) {
@@ -223,7 +224,11 @@ class PresentationManager(
       if (!BuildConfig.REPARENT_ON_FULLSCREEN) {
         return
       }
-      playerGroupParentNode = (reactPlayerGroup?.parent as ReactViewGroup?)?.also { parent ->
+      playerGroupParentNode = if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+        reactPlayerGroup?.parent as? ReactSurfaceView?
+      } else {
+        reactPlayerGroup?.parent as? ReactViewGroup?
+      }?.also { parent ->
         playerGroupChildIndex = parent.indexOfChild(reactPlayerGroup)
         // Re-parent the playerViewGroup to the root node
         parent.removeView(reactPlayerGroup)

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

@@ -3,31 +3,28 @@ package com.theoplayer.util
 import android.util.Log
 import android.view.View
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.uimanager.UIManagerModule
+import com.facebook.react.uimanager.UIManagerHelper
 
 private const val TAG = "ViewResolver"
 private const val INVALID_TAG = -1
 
 @Suppress("UNCHECKED_CAST")
 class ViewResolver(private val reactContext: ReactApplicationContext) {
-  private var uiManager: UIManagerModule? = null
-
   fun <T: View> resolveViewByTag(tag: Int, onResolved: (view: T?) -> Unit) {
     if (tag == INVALID_TAG) {
       // Don't bother trying to resolve an invalid tag.
       onResolved(null)
     }
-    if (uiManager == null) {
-      uiManager = reactContext.getNativeModule(UIManagerModule::class.java)
-    }
-    uiManager?.addUIBlock {
-      try {
-        onResolved(it.resolveView(tag) as? T?)
-      } catch (e: Exception) {
-        // The View instance could not be resolved: log but do not forward exception.
-        Log.e(TAG, "Failed to resolve View tag $tag: $e")
-        onResolved(null)
+    try {
+      reactContext.runOnUiQueueThread {
+        UIManagerHelper.getUIManagerForReactTag(reactContext, tag)?.let {
+          onResolved(it.resolveView(tag) as? T?)
+        }
       }
+    } catch (e: Exception) {
+      // The ReactTHEOplayerView instance could not be resolved: log but do not forward exception.
+      Log.e(TAG, "Failed to resolve ReactTHEOplayerView tag $tag: $e")
+      onResolved(null)
     }
   }
 }