@dolami-inc/react-native-expo-unity 0.5.0 → 0.5.2

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

@@ -34,16 +34,16 @@ class ExpoUnityView(context: Context, appContext: AppContext) : ExpoView(context
         }
 
         if (bridge.isReady) {
-            // Unity already initialized — just reparent the view into this container
-            bridge.addUnityViewToGroup(this)
-            Log.i(TAG, "Unity already ready, reparented view")
+            // Unity already initialized — reparent into this container
+            bridge.reparentInto(this)
         } else {
-            // Initialize Unity with a callback that reparents when ready
+            // Initialize Unity, then reparent once engine is ready.
+            // Use postDelayed to give the engine time to boot before
+            // reparenting (avoids window detach timeout).
             bridge.initialize(activity) {
-                post {
-                    bridge.addUnityViewToGroup(this)
-                    Log.i(TAG, "Unity ready, view reparented into container")
-                }
+                postDelayed({
+                    bridge.reparentInto(this)
+                }, 3000)
             }
         }
     }
@@ -61,13 +61,12 @@ class ExpoUnityView(context: Context, appContext: AppContext) : ExpoView(context
 
         if (bridge.isInitialized) {
             if (autoUnloadOnUnmount) {
+                bridge.detachView()
                 bridge.unload()
-                Log.i(TAG, "Auto-unloaded (view detached)")
+                Log.i(TAG, "Detached and unloaded (view detached)")
             } else {
-                // Park Unity in the background instead of unloading
-                bridge.parkUnityViewInBackground()
                 bridge.setPaused(true)
-                Log.i(TAG, "Parked in background (autoUnloadOnUnmount=false)")
+                Log.i(TAG, "Paused (autoUnloadOnUnmount=false)")
             }
         }
 

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

@@ -18,10 +18,9 @@ import com.unity3d.player.UnityPlayerForActivityOrService
  * Singleton managing the UnityPlayer lifecycle.
  * Android equivalent of ios/UnityBridge.mm.
  *
- * Uses a "background parking" pattern: Unity is always attached to the
- * Activity's content view (at 1x1px, Z=-1) so it stays alive. When a
- * React Native view wants to show Unity, we reparent the FrameLayout
- * into that view. When it unmounts, we park it back in the background.
+ * Unity 6's engine only boots when the view is in the Activity's content
+ * view hierarchy. We park the view at MATCH_PARENT behind everything (Z=-1)
+ * to let the engine start, then reparent into the React Native container.
  */
 class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCallProxy.MessageListener {
 
@@ -55,13 +54,13 @@ class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCal
     val isInitialized: Boolean
         get() = unityPlayer != null
 
-    /**
-     * Returns the UnityPlayer's FrameLayout for embedding.
-     * UnityPlayerForActivityOrService creates its own rendering surface internally.
-     */
     val unityPlayerView: FrameLayout?
         get() = unityPlayer?.frameLayout
 
+    /**
+     * Creates the Unity player, parks it in the Activity's content view
+     * (behind everything) to let the engine start, then fires [onReady].
+     */
     fun initialize(activity: Activity, onReady: (() -> Unit)? = null) {
         if (isInitialized) {
             onReady?.invoke()
@@ -70,10 +69,8 @@ class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCal
 
         val runInit = Runnable {
             try {
-                // Set RGBA_8888 format for proper rendering
                 activity.window.setFormat(PixelFormat.RGBA_8888)
 
-                // Save fullscreen state before Unity potentially changes it
                 val flags = activity.window.attributes.flags
                 val wasFullScreen = (flags and WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0
 
@@ -83,18 +80,23 @@ class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCal
                 NativeCallProxy.registerListener(this)
                 Log.i(TAG, "Unity player created")
 
-                // Give Unity time to initialize its rendering pipeline
-                Thread.sleep(1000)
-
-                // Park the Unity view in the background (1x1px, behind everything)
-                addUnityViewToBackground(activity)
-
-                // Kick-start rendering
+                // Park in Activity's content view at full size but behind
+                // everything. Unity's engine only starts when the view is
+                // in the Activity's window hierarchy.
+                val frame = player.frameLayout
+                frame.z = -1f
+                activity.addContentView(frame, ViewGroup.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.MATCH_PARENT
+                ))
+                Log.i(TAG, "Unity view parked in Activity (background)")
+
+                // Start the rendering pipeline
                 player.windowFocusChanged(true)
-                player.frameLayout?.requestFocus()
+                frame.requestFocus()
                 player.resume()
 
-                // Restore fullscreen state if Unity changed it
+                // Restore fullscreen state
                 if (!wasFullScreen) {
                     activity.window.addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN)
                     activity.window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
@@ -117,67 +119,46 @@ class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCal
     }
 
     /**
-     * Parks the Unity view in the Activity's content view at 1x1 pixels
-     * behind all other views (Z=-1). This keeps Unity alive but invisible.
+     * Moves the Unity view from the Activity background into the given
+     * container. Called when the React Native component is ready to show Unity.
      */
-    private fun addUnityViewToBackground(activity: Activity) {
-        val frame = unityPlayerView ?: return
+    fun reparentInto(container: ViewGroup) {
+        val frame = unityPlayerView ?: run {
+            Log.w(TAG, "Unity player view not available")
+            return
+        }
 
-        // Remove from current parent if any
+        // Remove from Activity's content view
         (frame.parent as? ViewGroup)?.let { parent ->
             parent.endViewTransition(frame)
             parent.removeView(frame)
         }
 
-        frame.z = -1f
-
-        val layoutParams = ViewGroup.LayoutParams(1, 1)
-        activity.addContentView(frame, layoutParams)
-        Log.i(TAG, "Unity view parked in background")
-    }
-
-    /**
-     * Moves the Unity view from wherever it currently is into the
-     * specified ViewGroup with MATCH_PARENT layout. Called when the
-     * React Native component mounts.
-     */
-    fun addUnityViewToGroup(group: ViewGroup) {
-        val frame = unityPlayerView ?: return
-
-        // Remove from current parent
-        (frame.parent as? ViewGroup)?.removeView(frame)
-
-        val layoutParams = ViewGroup.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.MATCH_PARENT
-        )
-        group.addView(frame, 0, layoutParams)
+        // Reset Z and add to the React Native container
+        frame.z = 0f
+        container.addView(frame, 0, FrameLayout.LayoutParams(
+            FrameLayout.LayoutParams.MATCH_PARENT,
+            FrameLayout.LayoutParams.MATCH_PARENT
+        ))
 
+        // Re-kick rendering after reparenting
         unityPlayer?.windowFocusChanged(true)
         frame.requestFocus()
         unityPlayer?.resume()
 
-        Log.i(TAG, "Unity view moved to visible container")
+        Log.i(TAG, "Unity view reparented into container")
     }
 
     /**
-     * Parks the Unity view back to the background. Called when the
-     * React Native component unmounts.
+     * Detaches the Unity view from its current parent.
      */
-    fun parkUnityViewInBackground() {
+    fun detachView() {
         val frame = unityPlayerView ?: return
-        val activity = frame.context as? Activity ?: return
-
         (frame.parent as? ViewGroup)?.let { parent ->
             parent.endViewTransition(frame)
             parent.removeView(frame)
         }
-
-        frame.z = -1f
-
-        val layoutParams = ViewGroup.LayoutParams(1, 1)
-        activity.addContentView(frame, layoutParams)
-        Log.i(TAG, "Unity view parked back to background")
+        Log.i(TAG, "Unity view detached")
     }
 
     fun sendMessage(gameObject: String, methodName: String, message: String) {

package/package.json

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