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

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
@@ -18,9 +16,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() }
     }
 
@@ -32,35 +27,32 @@ 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.isReady) {
+            // Unity already initialized — just reparent the view into this container
+            bridge.addUnityViewToGroup(this)
+            Log.i(TAG, "Unity already ready, reparented view")
+        } else {
+            // Initialize Unity with a callback that reparents when ready
+            bridge.initialize(activity) {
+                post {
+                    bridge.addUnityViewToGroup(this)
+                    Log.i(TAG, "Unity ready, view reparented into container")
+                }
+            }
         }
+    }
 
-        // Remove from previous parent if needed
-        (playerView.parent as? ViewGroup)?.removeView(playerView)
-
-        addView(
-            playerView,
-            FrameLayout.LayoutParams(
-                FrameLayout.LayoutParams.MATCH_PARENT,
-                FrameLayout.LayoutParams.MATCH_PARENT
-            )
-        )
+    override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
+        super.onWindowFocusChanged(hasWindowFocus)
+        val bridge = UnityBridge.getInstance()
+        if (!bridge.isReady) return
+        bridge.unityPlayer?.windowFocusChanged(hasWindowFocus)
     }
 
     override fun onDetachedFromWindow() {
@@ -72,8 +64,10 @@ class ExpoUnityView(context: Context, appContext: AppContext) : ExpoView(context
                 bridge.unload()
                 Log.i(TAG, "Auto-unloaded (view detached)")
             } else {
+                // Park Unity in the background instead of unloading
+                bridge.parkUnityViewInBackground()
                 bridge.setPaused(true)
-                Log.i(TAG, "Auto-paused on unmount (autoUnloadOnUnmount=false)")
+                Log.i(TAG, "Parked in background (autoUnloadOnUnmount=false)")
             }
         }
 

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

@@ -1,23 +1,27 @@
 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.SurfaceView
 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
-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 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.
  */
 class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCallProxy.MessageListener {
 
@@ -40,60 +44,66 @@ 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. */
     var wasRunningBeforeBackground: Boolean = false
 
+    var isReady: Boolean = false
+        private set
+
     val isInitialized: Boolean
         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
+    val unityPlayerView: FrameLayout?
+        get() = unityPlayer?.frameLayout
 
-    fun initialize(activity: Activity) {
-        if (isInitialized) return
+    fun initialize(activity: Activity, onReady: (() -> Unit)? = null) {
+        if (isInitialized) {
+            onReady?.invoke()
+            return
+        }
 
         val runInit = Runnable {
             try {
-                // Load native libraries required by Unity's GameActivity mode.
-                // Unity's own launcher does this via android.app.lib_name metadata,
-                // but since we bypass GameActivity lifecycle we load manually.
-                System.loadLibrary("game")
-
-                // 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)
+                // 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
-                containerView = frameLayout
 
-                // Start Unity rendering
-                player.resume()
+                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
                 player.windowFocusChanged(true)
+                player.frameLayout?.requestFocus()
+                player.resume()
 
-                NativeCallProxy.registerListener(this)
+                // 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 (GameActivity mode)")
+                isReady = true
+                Log.i(TAG, "Unity initialized and ready")
+
+                onReady?.invoke()
             } catch (e: Exception) {
                 Log.e(TAG, "Failed to initialize Unity", e)
             }
@@ -106,6 +116,70 @@ 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.
+     */
+    private fun addUnityViewToBackground(activity: Activity) {
+        val frame = unityPlayerView ?: return
+
+        // Remove from current parent if any
+        (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)
+
+        unityPlayer?.windowFocusChanged(true)
+        frame.requestFocus()
+        unityPlayer?.resume()
+
+        Log.i(TAG, "Unity view moved to visible container")
+    }
+
+    /**
+     * Parks the Unity view back to the background. Called when the
+     * React Native component unmounts.
+     */
+    fun parkUnityViewInBackground() {
+        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")
+    }
+
     fun sendMessage(gameObject: String, methodName: String, message: String) {
         if (!isInitialized) return
         UnityPlayer.UnitySendMessage(gameObject, methodName, message)
@@ -129,6 +203,7 @@ class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCal
 
     fun unload() {
         if (!isInitialized) return
+        isReady = false
         Log.i(TAG, "unload called")
         val action = Runnable {
             unityPlayer?.unload()
@@ -146,13 +221,13 @@ class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCal
     override fun onUnityPlayerUnloaded() {
         Log.i(TAG, "onUnityPlayerUnloaded")
         unityPlayer = null
-        containerView = null
+        isReady = false
     }
 
     override fun onUnityPlayerQuitted() {
         Log.i(TAG, "onUnityPlayerQuitted")
         unityPlayer = null
-        containerView = null
+        isReady = false
     }
 
     // NativeCallProxy.MessageListener (Unity -> RN)

package/package.json

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