html2apk 0.9.0 → 0.11.0

package/src/desktop/renderer/styles.css

@@ -1027,17 +1027,26 @@ h2 {
 
 .log-console {
   height: min(620px, calc(100vh - 230px));
+  min-height: 0;
+  box-sizing: border-box;
   overflow: auto;
   border: 1px solid var(--line);
   border-radius: 8px;
   background: #0c1117;
   color: #d6e4f7;
-  padding: 18px;
+  padding: 18px 18px 34px;
+  scroll-padding-bottom: 34px;
   font-family: "Cascadia Mono", Consolas, monospace;
   font-size: 13px;
   line-height: 1.55;
 }
 
+.log-console::after {
+  content: "";
+  display: block;
+  height: 12px;
+}
+
 .log-line {
   padding: 4px 0;
   border-bottom: 1px solid rgba(255, 255, 255, 0.05);
@@ -1407,9 +1416,10 @@ body.logs-visible .bottom-log-bar {
 }
 
 .bottom-log-console {
-  height: auto;
+  height: 100%;
   min-height: 0;
-  padding: 10px 12px;
+  padding: 10px 12px 26px;
+  scroll-padding-bottom: 26px;
   font-size: 12px;
   line-height: 1.4;
 }

package/src/runtime-manager/index.js

@@ -55,29 +55,74 @@ function getAndroidSdkPath(env = process.env) {
   return defaultAndroidSdkCandidates(env).find(pathExists) || env.ANDROID_HOME || env.ANDROID_SDK_ROOT || null;
 }
 
-function getJavaHome(env = process.env) {
+function getValidJavaHome(dir) {
+  if (!pathExists(dir)) {
+    return null;
+  }
+  const javaExe = process.platform === "win32" ? "java.exe" : "java";
+  if (pathExists(path.join(dir, "bin", javaExe))) {
+    return dir;
+  }
+  // Support macOS virtual machine package structures
+  const macHome = path.join(dir, "Contents", "Home");
+  if (pathExists(path.join(macHome, "bin", javaExe))) {
+    return macHome;
+  }
+  return null;
+}
+
+function getJavaHome(env = process.env, parentDirsOverride = null) {
   if (env.JAVA_HOME && pathExists(env.JAVA_HOME)) {
     return env.JAVA_HOME;
   }
 
-  const candidates = [];
-  if (process.platform === "win32") {
-    candidates.push(
-      latestSubdir(path.join(process.env.ProgramFiles || "C:\\Program Files", "Eclipse Adoptium")),
-      latestSubdir(path.join(process.env.ProgramFiles || "C:\\Program Files", "Java"))
-    );
-  } else if (process.platform === "darwin") {
-    candidates.push(
-      latestSubdir("/Library/Java/JavaVirtualMachines")
-    );
-  } else {
-    candidates.push(
-      latestSubdir("/usr/lib/jvm"),
-      latestSubdir("/usr/java")
-    );
+  const parentDirs = parentDirsOverride || [];
+  if (!parentDirsOverride) {
+    if (process.platform === "win32") {
+      parentDirs.push(
+        path.join(process.env.ProgramFiles || "C:\\Program Files", "Eclipse Adoptium"),
+        path.join(process.env.ProgramFiles || "C:\\Program Files", "Java")
+      );
+    } else if (process.platform === "darwin") {
+      parentDirs.push(
+        "/Library/Java/JavaVirtualMachines"
+      );
+    } else {
+      parentDirs.push(
+        "/usr/lib/jvm",
+        "/usr/java"
+      );
+    }
+  }
+
+  for (const parent of parentDirs) {
+    if (!pathExists(parent)) {
+      continue;
+    }
+    try {
+      const entries = fs.readdirSync(parent)
+        .filter((name) => {
+          try {
+            return fs.statSync(path.join(parent, name)).isDirectory();
+          } catch {
+            return false;
+          }
+        })
+        .sort((a, b) => b.localeCompare(a, undefined, { numeric: true }));
+
+      for (const name of entries) {
+        const fullPath = path.join(parent, name);
+        const valid = getValidJavaHome(fullPath);
+        if (valid) {
+          return valid;
+        }
+      }
+    } catch {
+      // Ignore directory read errors and check next parent
+    }
   }
 
-  return candidates.find(pathExists) || env.JAVA_HOME || null;
+  return env.JAVA_HOME || null;
 }
 
 function latestSubdir(parent) {
@@ -157,6 +202,23 @@ function getRuntimeEnvironment(env = process.env) {
     pathEntries.push(path.join(gradleHome, "bin"));
   }
 
+  // Ensure common system directories are present in PATH, since GUI/desktop
+  // launchers on Linux often inherit a minimal PATH that omits /usr/local/bin.
+  if (process.platform !== "win32") {
+    const systemDirs = [
+      "/usr/local/bin",
+      "/usr/local/sbin",
+      "/usr/bin",
+      "/usr/sbin"
+    ];
+    const currentPath = (nextEnv.PATH || "").split(pathDelimiter());
+    for (const dir of systemDirs) {
+      if (!currentPath.includes(dir) && pathExists(dir)) {
+        pathEntries.push(dir);
+      }
+    }
+  }
+
   prependToPath(nextEnv, pathEntries);
 
   return {

package/src/templates/cordova-plugin-html2apk-bridge/plugin.xml

@@ -23,10 +23,21 @@
       <uses-permission android:name="android.permission.USE_BIOMETRIC" />
       <uses-permission android:name="android.permission.USE_FINGERPRINT" />
       <uses-permission android:name="android.permission.SET_WALLPAPER" />
+      <uses-permission android:name="android.permission.INTERNET" />
       <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+      <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+      <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+      <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
       <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+      <uses-permission android:name="android.permission.NFC" />
+      <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
+      <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
+      <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
+      <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
       <uses-feature android:name="android.hardware.camera" android:required="false" />
       <uses-feature android:name="android.hardware.camera.flash" android:required="false" />
+      <uses-feature android:name="android.hardware.bluetooth" android:required="false" />
+      <uses-feature android:name="android.hardware.nfc" android:required="false" />
       <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
       <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     </config-file>
@@ -52,6 +63,27 @@
       </receiver>
     </config-file>
 
+    <config-file target="AndroidManifest.xml" parent="/manifest/application/activity">
+      <intent-filter>
+        <action android:name="android.intent.action.SEND" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <data android:mimeType="text/plain" />
+        <data android:mimeType="image/*" />
+        <data android:mimeType="video/*" />
+        <data android:mimeType="application/pdf" />
+        <data android:mimeType="*/*" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.SEND_MULTIPLE" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <data android:mimeType="text/plain" />
+        <data android:mimeType="image/*" />
+        <data android:mimeType="video/*" />
+        <data android:mimeType="application/pdf" />
+        <data android:mimeType="*/*" />
+      </intent-filter>
+    </config-file>
+
     <source-file src="src/android/Html2ApkBridge.java" target-dir="app/src/main/java/dev/html2apk/bridge" />
     <source-file src="src/android/FloatingIconService.java" target-dir="app/src/main/java/dev/html2apk/bridge" />
     <source-file src="src/android/NotificationReceiver.java" target-dir="app/src/main/java/dev/html2apk/bridge" />
@@ -60,5 +92,6 @@
     <source-file src="src/android/NotificationStore.java" target-dir="app/src/main/java/dev/html2apk/bridge" />
     <resource-file src="src/android/xml/html2apk_file_paths.xml" target="res/xml/html2apk_file_paths.xml" />
     <framework src="androidx.core:core:1.12.0" />
+    <framework src="com.google.mlkit:text-recognition:16.0.1" />
   </platform>
 </plugin>

package/src/templates/cordova-plugin-html2apk-bridge/src/android/FloatingIconService.java

@@ -2,6 +2,7 @@ package dev.html2apk.bridge;
 
 import android.app.Service;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.graphics.PixelFormat;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Build;
@@ -14,9 +15,14 @@ import android.view.WindowManager;
 import android.widget.ImageView;
 
 public class FloatingIconService extends Service {
+    private static final String PREFS_NAME = "html2apk_bridge";
+    private static final String OPACITY_KEY = "floating_icon_opacity";
+    private static final String EXTRA_OPACITY = "opacity";
+
     private WindowManager windowManager;
     private View floatingView;
     private WindowManager.LayoutParams params;
+    private float opacity = 1f;
     private int startX;
     private int startY;
     private float touchStartX;
@@ -29,6 +35,11 @@ public class FloatingIconService extends Service {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+        applyOptions(intent);
+        if (floatingView != null) {
+            applyFloatingIconStyle();
+            return START_STICKY;
+        }
         showFloatingIcon();
         return START_STICKY;
     }
@@ -60,6 +71,7 @@ public class FloatingIconService extends Service {
         int padding = dp(8);
         icon.setImageDrawable(getApplicationInfo().loadIcon(getPackageManager()));
         icon.setPadding(padding, padding, padding, padding);
+        icon.setAlpha(opacity);
 
         GradientDrawable background = new GradientDrawable();
         background.setShape(GradientDrawable.OVAL);
@@ -125,6 +137,23 @@ public class FloatingIconService extends Service {
         floatingView = null;
     }
 
+    private void applyOptions(Intent intent) {
+        SharedPreferences preferences = getSharedPreferences(PREFS_NAME, MODE_PRIVATE);
+        float nextOpacity = preferences.getFloat(OPACITY_KEY, 1f);
+        if (intent != null && intent.hasExtra(EXTRA_OPACITY)) {
+            nextOpacity = intent.getFloatExtra(EXTRA_OPACITY, nextOpacity);
+            nextOpacity = clampOpacity(nextOpacity);
+            preferences.edit().putFloat(OPACITY_KEY, nextOpacity).apply();
+        }
+        opacity = clampOpacity(nextOpacity);
+    }
+
+    private void applyFloatingIconStyle() {
+        if (floatingView != null) {
+            floatingView.setAlpha(opacity);
+        }
+    }
+
     private void openApp() {
         Intent launchIntent = getPackageManager().getLaunchIntentForPackage(getPackageName());
         if (launchIntent == null) {
@@ -138,4 +167,8 @@ public class FloatingIconService extends Service {
     private int dp(int value) {
         return Math.round(value * getResources().getDisplayMetrics().density);
     }
+
+    private float clampOpacity(float value) {
+        return Math.max(0.1f, Math.min(1f, value));
+    }
 }