@cuby-ui/ar 0.0.9 → 0.0.11

package/README.md

@@ -15,6 +15,8 @@ npx cap sync
 
 * [`startAR()`](#startar)
 * [`logMessage(...)`](#logmessage)
+* [`addListener('click', ...)`](#addlistenerclick-)
+* [Interfaces](#interfaces)
 
 </docgen-index>
 
@@ -47,4 +49,32 @@ object on success.
 
 --------------------
 
+
+### addListener('click', ...)
+
+```typescript
+addListener(eventName: 'click', listenerFunc: (event: { data: string; }) => void) => PluginListenerHandle
+```
+
+Listens for click events from the native AR view.
+
+| Param              | Type                                               | Description                                                                      |
+| ------------------ | -------------------------------------------------- | -------------------------------------------------------------------------------- |
+| **`eventName`**    | <code>'click'</code>                               | The name of the event to listen for (should be 'click').                         |
+| **`listenerFunc`** | <code>(event: { data: string; }) =&gt; void</code> | The function to call when the event occurs, receiving an event object with data. |
+
+**Returns:** <code><a href="#pluginlistenerhandle">PluginListenerHandle</a></code>
+
+--------------------
+
+
+### Interfaces
+
+
+#### PluginListenerHandle
+
+| Prop         | Type                                      |
+| ------------ | ----------------------------------------- |
+| **`remove`** | <code>() =&gt; Promise&lt;void&gt;</code> |
+
 </docgen-api>

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

@@ -1,50 +1,80 @@
 package com.cuby.plugins.cubyar;
 
-import static com.cuby.cubyar.NativeLogger.logMessage;
 import static com.cuby.cubyar.GEngineHelper.isGEngineReady;
-
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Handler;
-import android.os.Looper;
 import android.util.Log;
-import android.widget.Toast;
-
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
 import com.cuby.cubyar.NativeLogger;
+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 = {
         @Permission(strings = { Manifest.permission.CAMERA }, alias = "camera")
 })
 public class NativeBridge extends Plugin {
     private static final String LOG_TAG = "CubyARPlugin";
+    private boolean isPermissionDenied = false;
+
+    public static NativeBridge instance;
+
+    @Override
+    public void load() {
+        super.load();
+        instance = this;
+        Log.i(LOG_TAG, "NativeBridge instance stored");
+    }
 
     @PluginMethod
     public void startAR(PluginCall call) {
-        if (getPermissionState("camera") != PermissionState.GRANTED) {
-            requestPermissionForAlias("camera", call, "cameraPermissionCallback");
-        } else {
+        PermissionState state = getPermissionState("camera");
+
+        isPermissionDenied = false;
+
+        if (state == PermissionState.GRANTED) {
             launchUnrealAR();
             call.resolve();
+        } 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 cameraPermissionCallback(PluginCall call) {
+    private void cameraPermsCallback(PluginCall call) {
         if (getPermissionState("camera") == PermissionState.GRANTED) {
-            launchUnrealAR();
-            call.resolve();
+            new Thread(() -> {
+                launchUnrealAR();
+                getActivity().runOnUiThread(call::resolve);
+            }).start();
         } else {
+            isPermissionDenied = true;
             call.reject("Camera permission denied");
         }
     }
@@ -60,12 +90,6 @@ public class NativeBridge extends Plugin {
                 activity.startActivity(intent);
 
                 Log.i(LOG_TAG, "Unreal AR activity launched successfully");
-
-                // Wait until the Unreal Engine is fully initialized.
-                // This loop blocks execution to ensure no engine functions
-                // are called before the engine is ready
-                while (!isGEngineReady())
-                    ;
             } else {
                 Log.e(LOG_TAG, "GameActivity not found in package");
             }
@@ -78,8 +102,7 @@ public class NativeBridge extends Plugin {
     @PluginMethod
     public void logMessage(PluginCall call) {
         String message = call.getString("message");
-        float duration = call.getString("duration", "5.0") != null ? Float.parseFloat(call.getString("duration", "5.0"))
-                : 5.0f;
+        double duration = call.getDouble("duration", 5.0);
 
         if (message == null) {
             call.reject("Missing 'message' parameter");
@@ -87,8 +110,9 @@ public class NativeBridge extends Plugin {
         }
 
         try {
-            NativeLogger.logMessage(message, duration);
-
+            NativeLogger.logMessage(message, (float) duration);
+            String data = NativeLogger.returnData();
+            Log.i(LOG_TAG, "Native data: " + data);
             JSObject ret = new JSObject();
             ret.put("status", "logged");
             call.resolve(ret);
@@ -96,4 +120,16 @@ public class NativeBridge extends Plugin {
             call.reject("Failed to log message via native code", 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/dist/docs.json

@@ -35,11 +35,64 @@
         "docs": "Sends a message to native code to be logged. Returns a small status\nobject on success.",
         "complexTypes": [],
         "slug": "logmessage"
+      },
+      {
+        "name": "addListener",
+        "signature": "(eventName: 'click', listenerFunc: (event: { data: string; }) => void) => PluginListenerHandle",
+        "parameters": [
+          {
+            "name": "eventName",
+            "docs": "The name of the event to listen for (should be 'click').",
+            "type": "'click'"
+          },
+          {
+            "name": "listenerFunc",
+            "docs": "The function to call when the event occurs, receiving an event object with data.",
+            "type": "(event: { data: string; }) => void"
+          }
+        ],
+        "returns": "PluginListenerHandle",
+        "tags": [
+          {
+            "name": "param",
+            "text": "eventName The name of the event to listen for (should be 'click')."
+          },
+          {
+            "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 click events from the native AR view.",
+        "complexTypes": [
+          "PluginListenerHandle"
+        ],
+        "slug": "addlistenerclick-"
       }
     ],
     "properties": []
   },
-  "interfaces": [],
+  "interfaces": [
+    {
+      "name": "PluginListenerHandle",
+      "slug": "pluginlistenerhandle",
+      "docs": "",
+      "tags": [],
+      "methods": [],
+      "properties": [
+        {
+          "name": "remove",
+          "tags": [],
+          "docs": "",
+          "complexTypes": [],
+          "type": "() => Promise<void>"
+        }
+      ]
+    }
+  ],
   "enums": [],
   "typeAliases": [],
   "pluginConfigs": []

package/dist/esm/definitions.d.ts

@@ -1,3 +1,4 @@
+import { PluginListenerHandle } from '@capacitor/core';
 export interface NativeBridgePlugin {
     /**
      * Launches the AR activity.
@@ -12,4 +13,13 @@ export interface NativeBridgePlugin {
         message: string;
         duration?: number;
     }): void;
+    /**
+     * Listens for click events from the native AR view.
+     * @param eventName The name of the event to listen for (should be 'click').
+     * @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: 'click', listenerFunc: (event: {
+        data: string;
+    }) => void): PluginListenerHandle;
 }

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["export 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  logMessage(options: { message: string; duration?: number; }): void;\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.\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  logMessage(options: { message: string; duration?: number; }): void;\n\n  /**\n   * Listens for click events from the native AR view.\n   * @param eventName The name of the event to listen for (should be 'click').\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: 'click',\n    listenerFunc: (event: { data: string }) => void\n  ): PluginListenerHandle;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuby-ui/ar",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "Ar/Vr plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",