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

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

@@ -2,8 +2,6 @@ package expo.modules.unity
 
 import android.content.Context
 import android.util.Log
-import android.view.ViewGroup
-import android.widget.FrameLayout
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
@@ -29,47 +27,28 @@ class ExpoUnityView(context: Context, appContext: AppContext) : ExpoView(context
 
         val bridge = UnityBridge.getInstance()
 
-        if (!bridge.isInitialized) {
-            bridge.initialize(activity)
-        }
-
         bridge.onMessage = { message ->
             post {
                 onUnityMessage(mapOf("message" to message))
             }
         }
 
-        mountUnityView()
-    }
-
-    private fun mountUnityView() {
-        val playerView = UnityBridge.getInstance().unityPlayerView ?: run {
-            Log.w(TAG, "Unity player view not available yet")
-            return
+        if (bridge.isInitialized) {
+            // Unity already created — attach the view to this container
+            bridge.attachToContainer(this)
+        } else {
+            // Create Unity player, then attach the view once ready
+            bridge.initialize(activity) {
+                bridge.attachToContainer(this)
+            }
         }
-
-        // Remove from previous parent if needed
-        (playerView.parent as? ViewGroup)?.removeView(playerView)
-
-        addView(
-            playerView,
-            FrameLayout.LayoutParams(
-                FrameLayout.LayoutParams.MATCH_PARENT,
-                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.
+    override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
+        super.onWindowFocusChanged(hasWindowFocus)
         val bridge = UnityBridge.getInstance()
-        if (bridge.isInitialized) {
-            bridge.startRendering()
-        }
+        if (!bridge.isInitialized) return
+        bridge.unityPlayer?.windowFocusChanged(hasWindowFocus)
     }
 
     override fun onDetachedFromWindow() {
@@ -78,11 +57,12 @@ class ExpoUnityView(context: Context, appContext: AppContext) : ExpoView(context
 
         if (bridge.isInitialized) {
             if (autoUnloadOnUnmount) {
+                bridge.detachFromContainer()
                 bridge.unload()
-                Log.i(TAG, "Auto-unloaded (view detached)")
+                Log.i(TAG, "Detached and unloaded (view detached)")
             } else {
                 bridge.setPaused(true)
-                Log.i(TAG, "Auto-paused on unmount (autoUnloadOnUnmount=false)")
+                Log.i(TAG, "Paused (autoUnloadOnUnmount=false)")
             }
         }
 

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

@@ -1,10 +1,14 @@
 package expo.modules.unity
 
 import android.app.Activity
+import android.graphics.PixelFormat
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
 import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import android.widget.FrameLayout
 import com.expounity.bridge.NativeCallProxy
 import com.unity3d.player.IUnityPlayerLifecycleEvents
 import com.unity3d.player.UnityPlayer
@@ -14,8 +18,9 @@ import com.unity3d.player.UnityPlayerForActivityOrService
  * Singleton managing the UnityPlayer lifecycle.
  * Android equivalent of ios/UnityBridge.mm.
  *
- * Uses UnityPlayerForActivityOrService which manages its own rendering
- * surface internally — suitable for UaaL (Unity as a Library) embedding.
+ * Creates the Unity player and lets the ExpoUnityView add the
+ * FrameLayout directly — no background parking, since Unity 6's
+ * window management times out when reparenting from a background view.
  */
 class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCallProxy.MessageListener {
 
@@ -50,20 +55,41 @@ class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCal
      * Returns the UnityPlayer's FrameLayout for embedding.
      * UnityPlayerForActivityOrService creates its own rendering surface internally.
      */
-    val unityPlayerView: View?
+    val unityPlayerView: FrameLayout?
         get() = unityPlayer?.frameLayout
 
-    fun initialize(activity: Activity) {
-        if (isInitialized) return
+    /**
+     * Creates the UnityPlayer. The caller is responsible for adding
+     * [unityPlayerView] to the view hierarchy immediately after [onReady] fires.
+     */
+    fun initialize(activity: Activity, onReady: (() -> Unit)? = null) {
+        if (isInitialized) {
+            onReady?.invoke()
+            return
+        }
 
         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
+
                 val player = UnityPlayerForActivityOrService(activity, this)
                 unityPlayer = player
 
                 NativeCallProxy.registerListener(this)
+                Log.i(TAG, "Unity player created")
+
+                // Restore fullscreen state if Unity changed it
+                if (!wasFullScreen) {
+                    activity.window.addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN)
+                    activity.window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+                }
 
-                Log.i(TAG, "Unity initialized")
+                onReady?.invoke()
             } catch (e: Exception) {
                 Log.e(TAG, "Failed to initialize Unity", e)
             }
@@ -77,14 +103,42 @@ class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCal
     }
 
     /**
-     * Must be called after the Unity view is attached to the window hierarchy.
-     * Triggers Unity's rendering pipeline.
+     * Adds the Unity FrameLayout to the given container and starts rendering.
+     * Must be called after [initialize] completes.
+     */
+    fun attachToContainer(container: ViewGroup) {
+        val frame = unityPlayerView ?: run {
+            Log.w(TAG, "Unity player view not available")
+            return
+        }
+
+        // Remove from current parent if any
+        (frame.parent as? ViewGroup)?.removeView(frame)
+
+        val layoutParams = FrameLayout.LayoutParams(
+            FrameLayout.LayoutParams.MATCH_PARENT,
+            FrameLayout.LayoutParams.MATCH_PARENT
+        )
+        container.addView(frame, 0, layoutParams)
+        Log.i(TAG, "Unity view attached to container")
+
+        // Kick-start rendering after the view is in the hierarchy.
+        // Use post to let the layout pass complete first.
+        frame.post {
+            unityPlayer?.windowFocusChanged(true)
+            frame.requestFocus()
+            unityPlayer?.resume()
+            Log.i(TAG, "Rendering started")
+        }
+    }
+
+    /**
+     * Detaches the Unity view from its current parent without destroying it.
      */
-    fun startRendering() {
-        val player = unityPlayer ?: return
-        player.resume()
-        player.windowFocusChanged(true)
-        Log.i(TAG, "Rendering started")
+    fun detachFromContainer() {
+        val frame = unityPlayerView ?: return
+        (frame.parent as? ViewGroup)?.removeView(frame)
+        Log.i(TAG, "Unity view detached from container")
     }
 
     fun sendMessage(gameObject: String, methodName: String, message: String) {

package/package.json

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