@dolami-inc/react-native-expo-unity 0.4.3 → 0.4.5

package/android/src/main/java/expo/modules/unity/ExpoUnityView.kt

@@ -18,9 +18,6 @@ class ExpoUnityView(context: Context, appContext: AppContext) : ExpoView(context
     var autoUnloadOnUnmount: Boolean = true
 
     init {
-        // post {} dispatches to main thread. setupUnity -> initialize runs
-        // synchronously when already on main thread, so mountUnityView sees the
-        // fully-initialized player without a race condition.
         post { setupUnity() }
     }
 
@@ -61,6 +58,18 @@ class ExpoUnityView(context: Context, appContext: AppContext) : ExpoView(context
                 FrameLayout.LayoutParams.MATCH_PARENT
             )
         )
+
+        Log.i(TAG, "Unity view mounted")
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        // Start rendering after the view is in the window hierarchy,
+        // so Unity's surface is properly connected to the display.
+        val bridge = UnityBridge.getInstance()
+        if (bridge.isInitialized) {
+            bridge.startRendering()
+        }
     }
 
     override fun onDetachedFromWindow() {

package/android/src/main/java/expo/modules/unity/UnityBridge.kt

@@ -4,20 +4,18 @@ import android.app.Activity
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-import android.view.SurfaceView
 import android.view.View
-import android.widget.FrameLayout
 import com.expounity.bridge.NativeCallProxy
 import com.unity3d.player.IUnityPlayerLifecycleEvents
 import com.unity3d.player.UnityPlayer
-import com.unity3d.player.UnityPlayerForGameActivity
+import com.unity3d.player.UnityPlayerForActivityOrService
 
 /**
  * Singleton managing the UnityPlayer lifecycle.
  * Android equivalent of ios/UnityBridge.mm.
  *
- * Unity 6+ uses GameActivity mode. UnityPlayerForGameActivity requires
- * a FrameLayout container and SurfaceView that it renders into.
+ * Uses UnityPlayerForActivityOrService which manages its own rendering
+ * surface internally — suitable for UaaL (Unity as a Library) embedding.
  */
 class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCallProxy.MessageListener {
 
@@ -40,9 +38,6 @@ class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCal
     var unityPlayer: UnityPlayer? = null
         private set
 
-    /** The FrameLayout container that Unity renders into. */
-    private var containerView: FrameLayout? = null
-
     var onMessage: ((String) -> Unit)? = null
 
     /** Tracked here (not on the Module) so it survives module recreation. */
@@ -52,43 +47,23 @@ class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCal
         get() = unityPlayer != null
 
     /**
-     * Returns the FrameLayout container that holds Unity's rendering surface.
+     * Returns the UnityPlayer's FrameLayout for embedding.
+     * UnityPlayerForActivityOrService creates its own rendering surface internally.
      */
     val unityPlayerView: View?
-        get() = containerView
+        get() = unityPlayer?.frameLayout
 
     fun initialize(activity: Activity) {
         if (isInitialized) return
 
         val runInit = Runnable {
             try {
-                // Create the container and surface that Unity will render into
-                val frameLayout = FrameLayout(activity)
-                frameLayout.layoutParams = FrameLayout.LayoutParams(
-                    FrameLayout.LayoutParams.MATCH_PARENT,
-                    FrameLayout.LayoutParams.MATCH_PARENT
-                )
-
-                val surfaceView = SurfaceView(activity)
-                frameLayout.addView(
-                    surfaceView,
-                    FrameLayout.LayoutParams(
-                        FrameLayout.LayoutParams.MATCH_PARENT,
-                        FrameLayout.LayoutParams.MATCH_PARENT
-                    )
-                )
-
-                val player = UnityPlayerForGameActivity(activity, frameLayout, surfaceView, this)
+                val player = UnityPlayerForActivityOrService(activity, this)
                 unityPlayer = player
-                containerView = frameLayout
-
-                // Start Unity rendering
-                player.resume()
-                player.windowFocusChanged(true)
 
                 NativeCallProxy.registerListener(this)
 
-                Log.i(TAG, "Unity initialized (GameActivity mode)")
+                Log.i(TAG, "Unity initialized")
             } catch (e: Exception) {
                 Log.e(TAG, "Failed to initialize Unity", e)
             }
@@ -101,6 +76,17 @@ class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCal
         }
     }
 
+    /**
+     * Must be called after the Unity view is attached to the window hierarchy.
+     * Triggers Unity's rendering pipeline.
+     */
+    fun startRendering() {
+        val player = unityPlayer ?: return
+        player.resume()
+        player.windowFocusChanged(true)
+        Log.i(TAG, "Rendering started")
+    }
+
     fun sendMessage(gameObject: String, methodName: String, message: String) {
         if (!isInitialized) return
         UnityPlayer.UnitySendMessage(gameObject, methodName, message)
@@ -141,13 +127,11 @@ class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCal
     override fun onUnityPlayerUnloaded() {
         Log.i(TAG, "onUnityPlayerUnloaded")
         unityPlayer = null
-        containerView = null
     }
 
     override fun onUnityPlayerQuitted() {
         Log.i(TAG, "onUnityPlayerQuitted")
         unityPlayer = null
-        containerView = null
     }
 
     // NativeCallProxy.MessageListener (Unity -> RN)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dolami-inc/react-native-expo-unity",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "Unity as a Library (UaaL) bridge for React Native / Expo",
   "main": "src/index.ts",
   "types": "src/index.ts",