@cuby-ui/ar 0.0.18 → 0.0.20

package/README.md

@@ -1,11 +1,11 @@
 # cuby-ar
 
-Ar/Vr plugin
+AR plugin
 
 ## Install
 
 ```bash
-npm install cuby-ar
+npm i @cuby-ui/ar
 npx cap sync
 ```
 
@@ -17,9 +17,7 @@ npx cap sync
 * [`addOnScreenDebugMessage(...)`](#addonscreendebugmessage)
 * [`addListener(string, ...)`](#addlistenerstring-)
 * [`setFbxFolderPath(...)`](#setfbxfolderpath)
-* [`getFbxFolderPath()`](#getfbxfolderpath)
 * [`setJsonData(...)`](#setjsondata)
-* [`getJsonData()`](#getjsondata)
 * [Interfaces](#interfaces)
 
 </docgen-index>
@@ -33,7 +31,8 @@ npx cap sync
 startAR() => void
 ```
 
-Launches the AR activity.
+Launches the AR activity and waits until Unreal Engine is ready.
+Resolves when AR is initialized, or rejects on timeout/error.
 
 --------------------
 
@@ -44,8 +43,7 @@ Launches the AR activity.
 addOnScreenDebugMessage(options: { message: string; duration?: number; }) => void
 ```
 
-Sends a message to native code to be logged. Returns a small status
-object on success.
+Sends a message to native code to be logged.
 
 | Param         | Type                                                 | Description                                                         |
 | ------------- | ---------------------------------------------------- | ------------------------------------------------------------------- |
@@ -75,7 +73,7 @@ Listens for events from the native AR activity.
 ### setFbxFolderPath(...)
 
 ```typescript
-setFbxFolderPath(options: { path: string; }) => string
+setFbxFolderPath(options: { path: string; }) => void
 ```
 
 Sets the path to the FBX folder in native code.
@@ -84,28 +82,13 @@ Sets the path to the FBX folder in native code.
 | ------------- | ------------------------------ | ------------------------------------- |
 | **`options`** | <code>{ path: string; }</code> | An object containing the path string. |
 
-**Returns:** <code>string</code>
-
---------------------
-
-
-### getFbxFolderPath()
-
-```typescript
-getFbxFolderPath() => string
-```
-
-Gets the current FBX folder path from native code.
-
-**Returns:** <code>string</code>
-
 --------------------
 
 
 ### setJsonData(...)
 
 ```typescript
-setJsonData(options: { data: string; }) => string
+setJsonData(options: { data: string; }) => void
 ```
 
 Sets the path to the JSON data in native code.
@@ -114,21 +97,6 @@ Sets the path to the JSON data in native code.
 | ------------- | ------------------------------ | ------------------------------------- |
 | **`options`** | <code>{ data: string; }</code> | An object containing the path string. |
 
-**Returns:** <code>string</code>
-
---------------------
-
-
-### getJsonData()
-
-```typescript
-getJsonData() => string
-```
-
-Gets the current JSON data path from native code.
-
-**Returns:** <code>string</code>
-
 --------------------
 
 

package/android/src/main/java/com/cuby/plugins/cubyar/NativeBridge.java

@@ -1,6 +1,5 @@
 package com.cuby.plugins.cubyar;
 
-import static com.cuby.cubyar.GEngineHelper.isGEngineReady;
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -8,13 +7,13 @@ import android.content.Intent;
 import android.util.Log;
 import com.cuby.cubyar.NativeLogger;
 import com.cuby.cubyar.ModelData;
+import com.getcapacitor.JSObject;
 import com.getcapacitor.PermissionState;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
 import com.getcapacitor.annotation.Permission;
-import com.getcapacitor.JSObject;
 import com.getcapacitor.annotation.PermissionCallback;
 
 @CapacitorPlugin(name = "NativeBridge", permissions = {
@@ -22,7 +21,6 @@ import com.getcapacitor.annotation.PermissionCallback;
 })
 public class NativeBridge extends Plugin {
     private static final String LOG_TAG = "CubyARPlugin";
-    private boolean isPermissionDenied = false;
 
     public static NativeBridge instance;
 
@@ -36,46 +34,18 @@ public class NativeBridge extends Plugin {
     @PluginMethod
     public void startAR(PluginCall call) {
         PermissionState state = getPermissionState("camera");
-
-        isPermissionDenied = false;
-
         if (state == PermissionState.GRANTED) {
-            launchUnrealAR();
-            call.resolve();
+            new android.os.Handler().postDelayed(this::launchUnrealAR, 300);
         } else {
             requestPermissionForAlias("camera", call, "cameraPermsCallback");
         }
-
-        // Wait until the Unreal Engine is fully initialized
-        long startTime = System.currentTimeMillis();
-        long timeoutInSeconds = 5_000;
-
-        while (!isGEngineReady() &&
-                (System.currentTimeMillis() - startTime < timeoutInSeconds) &&
-                !isPermissionDenied) {
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                break;
-            }
-        }
-
-        if (isGEngineReady()) {
-            Log.i(LOG_TAG, "Unreal Engine initialized");
-        } else {
-            Log.e(LOG_TAG, "Timeout waiting for Unreal Engine initialization");
-        }
     }
 
     @PermissionCallback
     private void cameraPermsCallback(PluginCall call) {
         if (getPermissionState("camera") == PermissionState.GRANTED) {
-            new Thread(() -> {
-                launchUnrealAR();
-                getActivity().runOnUiThread(call::resolve);
-            }).start();
+            launchUnrealAR();
         } else {
-            isPermissionDenied = true;
             call.reject("Camera permission denied");
         }
     }
@@ -84,24 +54,30 @@ public class NativeBridge extends Plugin {
     private void launchUnrealAR() {
         try {
             Activity activity = getActivity();
+            if (activity == null || activity.isFinishing()) {
+                Log.e(LOG_TAG, "Activity is null or finishing");
+                return;
+            }
+
             Intent intent = new Intent();
             intent.setClassName(activity.getPackageName(), "com.epicgames.unreal.GameActivity");
 
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+
             if (intent.resolveActivity(activity.getPackageManager()) != null) {
                 activity.startActivity(intent);
-
                 Log.i(LOG_TAG, "Unreal AR activity launched successfully");
             } else {
                 Log.e(LOG_TAG, "GameActivity not found in package");
             }
-
         } catch (Exception e) {
             Log.e(LOG_TAG, "Failed to launch AR", e);
         }
     }
 
     @PluginMethod
-    public void logMessage(PluginCall call) {
+    public void addOnScreenDebugMessage(PluginCall call) {
         String message = call.getString("message");
         double duration = call.getDouble("duration", 5.0);
 
@@ -112,11 +88,9 @@ public class NativeBridge extends Plugin {
 
         try {
             NativeLogger.addOnScreenDebugMessage(message, (float) duration);
-            JSObject ret = new JSObject();
-            ret.put("status", "logged");
-            call.resolve(ret);
+            call.resolve();
         } catch (Exception e) {
-            call.reject("Failed to log message via native code", e);
+            call.reject("Failed to log message via addOnScreenDebugMessage", e);
         }
     }
 
@@ -130,65 +104,35 @@ public class NativeBridge extends Plugin {
 
         try {
             ModelData.setFbxFolderPath(path);
-            JSObject ret = new JSObject();
-            ret.put("status", "fbxPathSet");
-            call.resolve(ret);
+            call.resolve();
         } catch (Exception e) {
             call.reject("Failed to set FBX folder path", e);
         }
     }
 
     @PluginMethod
-    public void getFbxFolderPath(PluginCall call) {
-        try {
-            String path = ModelData.getFbxFolderPath();
-            JSObject ret = new JSObject();
-            ret.put("fbxPath", path);
-            call.resolve(ret);
-        } catch (Exception e) {
-            call.reject("Failed to get FBX folder path", e);
-        }
-    }
-
-    @PluginMethod
-    public void setJsonFile(PluginCall call) {
-        String path = call.getString("path");
-        if (path == null) {
-            call.reject("Missing 'path' parameter");
+    public void setJsonData(PluginCall call) {
+        String data = call.getString("data");
+        if (data == null) {
+            call.reject("Missing 'data' parameter");
             return;
         }
 
         try {
-            ModelData.setJsonFile(path);
-            JSObject ret = new JSObject();
-            ret.put("status", "jsonFileSet");
-            call.resolve(ret);
+            ModelData.setJsonFile(data);
+            call.resolve();
         } catch (Exception e) {
-            call.reject("Failed to set JSON file path", e);
+            call.reject("Failed to set JSON file data", e);
         }
     }
 
-    @PluginMethod
-    public void getJsonFile(PluginCall call) {
+    public void notifyListeners(String eventName, String data) {
         try {
-            String path = ModelData.getJsonFile();
             JSObject ret = new JSObject();
-            ret.put("jsonPath", path);
-            call.resolve(ret);
+            ret.put("data", data);
+            notifyListeners(eventName, ret);
         } catch (Exception e) {
-            call.reject("Failed to get JSON file path", e);
+            Log.e(LOG_TAG, "Failed to notify listeners", e);
         }
     }
-
-    // public String getNativeData() {
-    // try {
-    // String data = NativeLogger.returnData();
-    // JSObject ret = new JSObject();
-    // ret.put("data", data);
-    // notifyListeners("click", ret);
-    // } catch (Exception e) {
-    // // call.reject("Failed to get native data", e);
-    // }
-    // return "";
-    // }
-}
+}

package/android/src/main/java/com/google/vr/sdk/samples/permission/PermissionHelper.java

@@ -0,0 +1,19 @@
+package com.google.vr.sdk.samples.permission;
+
+import android.app.Activity;
+
+public class PermissionHelper {
+    public static boolean hasPermissions(Activity activity) {
+        return true;
+    }
+
+    public static void requestPermissions(Activity activity) {
+    }
+
+    public static boolean checkPermission(String permission) {
+        return true;
+    }
+
+    public static void acquirePermissions(String[] permissions) {
+    }
+}

package/dist/docs.json

@@ -11,7 +11,7 @@
         "parameters": [],
         "returns": "void",
         "tags": [],
-        "docs": "Launches the AR activity.",
+        "docs": "Launches the AR activity and waits until Unreal Engine is ready.\nResolves when AR is initialized, or rejects on timeout/error.",
         "complexTypes": [],
         "slug": "startar"
       },
@@ -32,7 +32,7 @@
             "text": "options The message to log and optional duration in seconds (default is 5)."
           }
         ],
-        "docs": "Sends a message to native code to be logged. Returns a small status\nobject on success.",
+        "docs": "Sends a message to native code to be logged.",
         "complexTypes": [],
         "slug": "addonscreendebugmessage"
       },
@@ -60,10 +60,6 @@
           {
             "name": "param",
             "text": "listenerFunc The function to call when the event occurs, receiving an event object with data."
-          },
-          {
-            "name": "returns",
-            "text": "A handle to remove the listener when no longer needed."
           }
         ],
         "docs": "Listens for events from the native AR activity.",
@@ -74,7 +70,7 @@
       },
       {
         "name": "setFbxFolderPath",
-        "signature": "(options: { path: string; }) => string",
+        "signature": "(options: { path: string; }) => void",
         "parameters": [
           {
             "name": "options",
@@ -82,7 +78,7 @@
             "type": "{ path: string; }"
           }
         ],
-        "returns": "string",
+        "returns": "void",
         "tags": [
           {
             "name": "param",
@@ -93,24 +89,9 @@
         "complexTypes": [],
         "slug": "setfbxfolderpath"
       },
-      {
-        "name": "getFbxFolderPath",
-        "signature": "() => string",
-        "parameters": [],
-        "returns": "string",
-        "tags": [
-          {
-            "name": "returns",
-            "text": "An object containing the path string."
-          }
-        ],
-        "docs": "Gets the current FBX folder path from native code.",
-        "complexTypes": [],
-        "slug": "getfbxfolderpath"
-      },
       {
         "name": "setJsonData",
-        "signature": "(options: { data: string; }) => string",
+        "signature": "(options: { data: string; }) => void",
         "parameters": [
           {
             "name": "options",
@@ -118,7 +99,7 @@
             "type": "{ data: string; }"
           }
         ],
-        "returns": "string",
+        "returns": "void",
         "tags": [
           {
             "name": "param",
@@ -128,21 +109,6 @@
         "docs": "Sets the path to the JSON data in native code.",
         "complexTypes": [],
         "slug": "setjsondata"
-      },
-      {
-        "name": "getJsonData",
-        "signature": "() => string",
-        "parameters": [],
-        "returns": "string",
-        "tags": [
-          {
-            "name": "returns",
-            "text": "An object containing the path string."
-          }
-        ],
-        "docs": "Gets the current JSON data path from native code.",
-        "complexTypes": [],
-        "slug": "getjsondata"
       }
     ],
     "properties": []

package/dist/esm/definitions.d.ts

@@ -1,12 +1,12 @@
-import { PluginListenerHandle } from '@capacitor/core';
+import { PluginListenerHandle } from "@capacitor/core";
 export interface NativeBridgePlugin {
     /**
-     * Launches the AR activity.
+     * Launches the AR activity and waits until Unreal Engine is ready.
+     * Resolves when AR is initialized, or rejects on timeout/error.
      */
     startAR(): void;
     /**
-     * Sends a message to native code to be logged. Returns a small status
-     * object on success.
+     * Sends a message to native code to be logged.
      * @param options The message to log and optional duration in seconds (default is 5).
      */
     addOnScreenDebugMessage(options: {
@@ -17,7 +17,6 @@ export interface NativeBridgePlugin {
      * Listens for events from the native AR activity.
      * @param eventName The name of the event to listen for.
      * @param listenerFunc The function to call when the event occurs, receiving an event object with data.
-     * @returns A handle to remove the listener when no longer needed.
      */
     addListener(eventName: string, listenerFunc: (event: {
         data: string;
@@ -28,22 +27,12 @@ export interface NativeBridgePlugin {
     */
     setFbxFolderPath(options: {
         path: string;
-    }): string;
-    /**
-     * Gets the current FBX folder path from native code.
-     * @returns An object containing the path string.
-     */
-    getFbxFolderPath(): string;
+    }): void;
     /**
      * Sets the path to the JSON data in native code.
      * @param options An object containing the path string.
      */
     setJsonData(options: {
         data: string;
-    }): string;
-    /**
-     * Gets the current JSON data path from native code.
-     * @returns An object containing the path string.
-     */
-    getJsonData(): string;
+    }): void;
 }

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["import { PluginListenerHandle } from '@capacitor/core';\n\nexport interface NativeBridgePlugin {\n  /**\n   * Launches the AR activity.\n   */\n  startAR(): void;\n\n  /**\n   * Sends a message to native code to be logged. Returns a small status\n   * object on success.\n   * @param options The message to log and optional duration in seconds (default is 5).\n   */\n  addOnScreenDebugMessage(options: { message: string; duration?: number; }): void;\n\n  /**\n   * Listens for events from the native AR activity.\n   * @param eventName The name of the event to listen for.\n   * @param listenerFunc The function to call when the event occurs, receiving an event object with data.\n   * @returns A handle to remove the listener when no longer needed.\n   */\n  addListener(\n    eventName: string,\n    listenerFunc: (event: { data: string }) => void\n  ): PluginListenerHandle;\n\n  /**\n  * Sets the path to the FBX folder in native code.\n  * @param options An object containing the path string.\n  */\n  setFbxFolderPath(options: { path: string }): string;\n\n  /**\n   * Gets the current FBX folder path from native code.\n   * @returns An object containing the path string.\n   */\n  getFbxFolderPath(): string;\n\n  /**\n   * Sets the path to the JSON data in native code.\n   * @param options An object containing the path string.\n   */\n  setJsonData(options: { data: string }): string;\n\n  /**\n   * Gets the current JSON data path from native code.\n   * @returns An object containing the path string.\n   */\n  getJsonData(): string;\n}\n"]}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["import { PluginListenerHandle } from \"@capacitor/core\";\n\nexport interface NativeBridgePlugin {\n  /**\n   * Launches the AR activity and waits until Unreal Engine is ready.\n   * Resolves when AR is initialized, or rejects on timeout/error.\n   */\n  startAR(): void;\n\n  /**\n   * Sends a message to native code to be logged.\n   * @param options The message to log and optional duration in seconds (default is 5).\n   */\n  addOnScreenDebugMessage(options: { message: string; duration?: number; }): void;\n\n  /**\n   * Listens for events from the native AR activity.\n   * @param eventName The name of the event to listen for.\n   * @param listenerFunc The function to call when the event occurs, receiving an event object with data.\n   */\n  addListener(\n    eventName: string,\n    listenerFunc: (event: { data: string }) => void\n  ): PluginListenerHandle;\n\n  /**\n  * Sets the path to the FBX folder in native code.\n  * @param options An object containing the path string.\n  */\n  setFbxFolderPath(options: { path: string }): void;\n\n  /**\n   * Sets the path to the JSON data in native code.\n   * @param options An object containing the path string.\n   */\n  setJsonData(options: { data: string }): void;\n}"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cuby-ui/ar",
-  "version": "0.0.18",
-  "description": "Ar/Vr plugin",
+  "version": "0.0.20",
+  "description": "AR plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",