@dolami-inc/react-native-expo-unity 0.3.4 → 0.4.1

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

@@ -5,6 +5,7 @@ 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
 
 class ExpoUnityView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {

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

@@ -8,6 +8,7 @@ import android.view.View
 import com.expounity.bridge.NativeCallProxy
 import com.unity3d.player.IUnityPlayerLifecycleEvents
 import com.unity3d.player.UnityPlayer
+import com.unity3d.player.UnityPlayerForActivityOrService
 
 /**
  * Singleton managing the UnityPlayer lifecycle.
@@ -43,17 +44,18 @@ class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCal
         get() = unityPlayer != null
 
     /**
-     * Returns the UnityPlayer view for embedding. UnityPlayer extends FrameLayout.
+     * Returns the UnityPlayer view for embedding.
+     * Unity 6+ made UnityPlayer abstract; use getView() to get the renderable view.
      */
     val unityPlayerView: View?
-        get() = unityPlayer
+        get() = unityPlayer?.view
 
     fun initialize(activity: Activity) {
         if (isInitialized) return
 
         val runInit = Runnable {
             try {
-                val player = UnityPlayer(activity, this)
+                val player = UnityPlayerForActivityOrService(activity, this)
                 unityPlayer = player
 
                 NativeCallProxy.registerListener(this)

package/app.plugin.js

@@ -4,6 +4,7 @@ const {
   withProjectBuildGradle,
   withAppBuildGradle,
   withGradleProperties,
+  withDangerousMod,
 } = require('@expo/config-plugins');
 const path = require('path');
 const fs = require('fs');
@@ -41,6 +42,7 @@ function parsePropertiesFile(filePath) {
  * - Includes the :unityLibrary Gradle module and .androidlib subprojects in settings.gradle
  * - Copies Unity gradle properties (unity.*, unityStreamingAssets) to host gradle.properties
  * - Adds flatDir repos for Unity's .aar/.jar libs in root build.gradle
+ * - Strips LAUNCHER intent from Unity's AndroidManifest (prevents duplicate app icon)
  * - Adds the unityLibrary dependency and NDK abiFilters in app/build.gradle
  *
  * @param {object} config - Expo config
@@ -144,6 +146,49 @@ const withExpoUnity = (config, options = {}) => {
     return config;
   });
 
+  // -- Android: Strip LAUNCHER intent from Unity's AndroidManifest --
+  // Unity exports include a LAUNCHER intent filter on UnityPlayerGameActivity,
+  // which creates a duplicate app icon. Since Unity is embedded (not standalone),
+  // we remove it so only the host app's launcher entry exists.
+  config = withDangerousMod(config, [
+    'android',
+    (config) => {
+      const projectRoot = config.modRequest.projectRoot;
+      const androidUnityPath =
+        options.androidUnityPath ||
+        process.env.EXPO_UNITY_ANDROID_PATH ||
+        path.join(projectRoot, 'unity', 'builds', 'android');
+
+      const manifestPath = path.join(
+        androidUnityPath,
+        'unityLibrary',
+        'src',
+        'main',
+        'AndroidManifest.xml'
+      );
+
+      if (fs.existsSync(manifestPath)) {
+        let manifest = fs.readFileSync(manifestPath, 'utf8');
+
+        // Remove the entire <intent-filter> block containing LAUNCHER
+        const launcherRegex =
+          /\s*<intent-filter>\s*<category[^>]*LAUNCHER[^>]*\/>\s*<action[^>]*MAIN[^>]*\/>\s*<\/intent-filter>/g;
+        const altLauncherRegex =
+          /\s*<intent-filter>\s*<action[^>]*MAIN[^>]*\/>\s*<category[^>]*LAUNCHER[^>]*\/>\s*<\/intent-filter>/g;
+
+        const patched = manifest
+          .replace(launcherRegex, '')
+          .replace(altLauncherRegex, '');
+
+        if (patched !== manifest) {
+          fs.writeFileSync(manifestPath, patched, 'utf8');
+        }
+      }
+
+      return config;
+    },
+  ]);
+
   // -- Android: gradle.properties (copy Unity properties to host project) --
   // Unity's build.gradle references properties like `unityStreamingAssets` and
   // `unity.*` that are defined in the Unity export's gradle.properties. When the

package/package.json

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