@cuby-ui/ar 0.0.8 → 0.0.10

package/README.md

@@ -13,7 +13,7 @@ npx cap sync
 
 <docgen-index>
 
-* [`startAR(...)`](#startar)
+* [`startAR()`](#startar)
 * [`logMessage(...)`](#logmessage)
 
 </docgen-index>
@@ -21,33 +21,29 @@ npx cap sync
 <docgen-api>
 <!--Update the source file JSDoc comments and rerun docgen to update the docs below-->
 
-### startAR(...)
+### startAR()
 
 ```typescript
-startAR(options?: { message?: string | undefined; } | undefined) => Promise<void>
+startAR() => void
 ```
 
 Launches the AR activity.
 
-| Param         | Type                               |
-| ------------- | ---------------------------------- |
-| **`options`** | <code>{ message?: string; }</code> |
-
 --------------------
 
 
 ### logMessage(...)
 
 ```typescript
-logMessage(options: { message: string; }) => Promise<void>
+logMessage(options: { message: string; duration?: number; }) => void
 ```
 
 Sends a message to native code to be logged. Returns a small status
 object on success.
 
-| Param         | Type                              |
-| ------------- | --------------------------------- |
-| **`options`** | <code>{ message: string; }</code> |
+| Param         | Type                                                 | Description                                                         |
+| ------------- | ---------------------------------------------------- | ------------------------------------------------------------------- |
+| **`options`** | <code>{ message: string; duration?: number; }</code> | The message to log and optional duration in seconds (default is 5). |
 
 --------------------
 

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

@@ -1,50 +1,73 @@
 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")
+@CapacitorPlugin(name = "NativeBridge", permissions = {
+        @Permission(strings = { Manifest.permission.CAMERA }, alias = "camera")
+})
 public class NativeBridge extends Plugin {
-
-    private static final int CAMERA_REQUEST_CODE = 1234;
-    private PluginCall savedCall;
-
     private static final String LOG_TAG = "CubyARPlugin";
+    private boolean isPermissionDenied = false;
 
     @PluginMethod
     public void startAR(PluginCall call) {
-        Activity activity = getActivity();
-
-        if (ContextCompat.checkSelfPermission(activity,
-                Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
-            savedCall = call;
-            ActivityCompat.requestPermissions(activity,
-                    new String[] { Manifest.permission.CAMERA },
-                    CAMERA_REQUEST_CODE);
-            return;
+        PermissionState state = getPermissionState("camera");
+
+        isPermissionDenied = false;
+
+        if (state == PermissionState.GRANTED) {
+            launchUnrealAR();
+            call.resolve();
+        } else {
+            requestPermissionForAlias("camera", call, "cameraPermsCallback");
         }
 
-        launchUnrealAR();
+        // 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();
+        } else {
+            isPermissionDenied = true;
+            call.reject("Camera permission denied");
+        }
     }
 
     @SuppressLint("QueryPermissionsNeeded")
@@ -58,12 +81,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");
             }
@@ -76,6 +93,7 @@ public class NativeBridge extends Plugin {
     @PluginMethod
     public void logMessage(PluginCall call) {
         String message = call.getString("message");
+        double duration = call.getDouble("duration", 5.0);
 
         if (message == null) {
             call.reject("Missing 'message' parameter");
@@ -83,7 +101,7 @@ public class NativeBridge extends Plugin {
         }
 
         try {
-            NativeLogger.logMessage(message);
+            NativeLogger.logMessage(message, (float) duration);
 
             JSObject ret = new JSObject();
             ret.put("status", "logged");

package/dist/docs.json

@@ -7,15 +7,9 @@
     "methods": [
       {
         "name": "startAR",
-        "signature": "(options?: { message?: string | undefined; } | undefined) => Promise<void>",
-        "parameters": [
-          {
-            "name": "options",
-            "docs": "",
-            "type": "{ message?: string | undefined; } | undefined"
-          }
-        ],
-        "returns": "Promise<void>",
+        "signature": "() => void",
+        "parameters": [],
+        "returns": "void",
         "tags": [],
         "docs": "Launches the AR activity.",
         "complexTypes": [],
@@ -23,16 +17,21 @@
       },
       {
         "name": "logMessage",
-        "signature": "(options: { message: string; }) => Promise<void>",
+        "signature": "(options: { message: string; duration?: number; }) => void",
         "parameters": [
           {
             "name": "options",
-            "docs": "",
-            "type": "{ message: string; }"
+            "docs": "The message to log and optional duration in seconds (default is 5).",
+            "type": "{ message: string; duration?: number | undefined; }"
+          }
+        ],
+        "returns": "void",
+        "tags": [
+          {
+            "name": "param",
+            "text": "options The message to log and optional duration in seconds (default is 5)."
           }
         ],
-        "returns": "Promise<void>",
-        "tags": [],
         "docs": "Sends a message to native code to be logged. Returns a small status\nobject on success.",
         "complexTypes": [],
         "slug": "logmessage"

package/dist/esm/definitions.d.ts

@@ -2,14 +2,14 @@ export interface NativeBridgePlugin {
     /**
      * Launches the AR activity.
      */
-    startAR(options?: {
-        message?: string;
-    }): Promise<void>;
+    startAR(): void;
     /**
      * Sends a message to native code to be logged. Returns a small status
      * object on success.
+     * @param options The message to log and optional duration in seconds (default is 5).
      */
     logMessage(options: {
         message: string;
-    }): Promise<void>;
+        duration?: number;
+    }): void;
 }

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(options?: { message?: string }): Promise<void>;\n\n  /**\n   * Sends a message to native code to be logged. Returns a small status\n   * object on success.\n   */\n  logMessage(options: { message: string }): Promise<void>;\n}\n"]}
+{"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"]}

package/package.json

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