html2apk 0.8.0 → 0.11.0

package/src/desktop/renderer/styles.css

@@ -712,7 +712,7 @@ h2 {
 
 .file-editor-panel {
   display: grid;
-  grid-template-rows: auto minmax(280px, 1fr) minmax(180px, 240px);
+  grid-template-rows: auto minmax(0, 1fr);
   overflow: hidden;
 }
 
@@ -745,58 +745,96 @@ h2 {
   font-weight: 800;
 }
 
-#fileEditorInput {
-  width: 100%;
+.code-editor-shell {
+  position: relative;
   min-height: 0;
-  resize: none;
+  overflow: hidden;
+  background: #0c1117;
+}
+
+#fileEditorInput,
+.file-editor-highlight {
+  width: 100%;
   border: 0;
-  border-bottom: 1px solid var(--line);
   outline: none;
-  padding: 16px;
-  background: var(--bg);
-  color: var(--text);
-  font: 13px/1.55 ui-monospace, SFMono-Regular, Consolas, monospace;
+  padding: 16px 18px;
+  font: 13px/1.55 "Cascadia Mono", ui-monospace, SFMono-Regular, Consolas, monospace;
   tab-size: 2;
+  white-space: pre-wrap;
+  overflow-wrap: anywhere;
 }
 
-.syntax-preview-wrap {
+#fileEditorInput {
+  position: relative;
+  z-index: 2;
+  height: 100%;
   min-height: 0;
-  display: grid;
-  grid-template-rows: auto minmax(0, 1fr);
-  background: color-mix(in srgb, var(--panel-soft) 55%, var(--panel));
+  resize: none;
+  background: transparent;
+  color: transparent;
+  -webkit-text-fill-color: transparent;
+  caret-color: #d6e4f7;
 }
 
-.syntax-preview-wrap > strong {
-  padding: 10px 14px 0;
-  color: var(--muted);
-  font-size: 12px;
+#fileEditorInput::selection {
+  background: rgba(88, 166, 255, 0.34);
 }
 
-.syntax-preview {
+.file-editor-highlight {
+  position: absolute;
+  inset: 0;
+  z-index: 1;
   margin: 0;
-  padding: 12px 14px 16px;
-  overflow: auto;
-  color: var(--text);
-  font: 12px/1.55 ui-monospace, SFMono-Regular, Consolas, monospace;
+  min-height: 100%;
+  overflow: hidden;
+  color: #d6e4f7;
+  pointer-events: none;
+}
+
+.file-editor-highlight code {
+  display: block;
+  min-height: 100%;
+}
+
+#fileEditorInput:disabled {
+  cursor: not-allowed;
+}
+
+#fileEditorInput:disabled + .file-editor-highlight,
+.code-editor-shell:has(#fileEditorInput:disabled) .file-editor-highlight {
+  opacity: .58;
+}
+
+#fileEditorInput::placeholder {
+  color: #64748b;
+  -webkit-text-fill-color: #64748b;
 }
 
 .syntax-token-tag,
 .syntax-token-keyword {
-  color: var(--blue);
+  color: #79c0ff;
   font-weight: 800;
 }
 
 .syntax-token-string {
-  color: var(--green);
+  color: #a5d6a7;
 }
 
 .syntax-token-comment {
-  color: var(--muted);
+  color: #8b949e;
   font-style: italic;
 }
 
 .syntax-token-number {
-  color: var(--amber);
+  color: #f2cc60;
+}
+
+.syntax-token-function {
+  color: #d2a8ff;
+}
+
+.syntax-token-operator {
+  color: #ffab70;
 }
 
 .preference-row {
@@ -989,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);
@@ -1053,6 +1100,110 @@ h2 {
   margin-bottom: 18px;
 }
 
+.code-browser {
+  display: grid;
+  grid-template-columns: minmax(220px, 270px) minmax(0, 1fr);
+  gap: 16px;
+  align-items: start;
+}
+
+.code-categories {
+  position: sticky;
+  top: 0;
+  display: grid;
+  gap: 8px;
+  max-height: calc(100vh - 160px - var(--visible-log-height));
+  overflow: auto;
+  padding-right: 2px;
+}
+
+.code-category-button {
+  width: 100%;
+  min-height: 58px;
+  border: 1px solid var(--line);
+  border-radius: 8px;
+  background: var(--panel);
+  color: var(--text);
+  padding: 10px 12px;
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) auto;
+  gap: 4px 10px;
+  align-items: center;
+  text-align: left;
+  box-shadow: 0 14px 34px rgba(49, 86, 130, 0.08);
+  transition: border-color 160ms ease, background 160ms ease, color 160ms ease, transform 160ms ease;
+}
+
+.code-category-button:hover {
+  border-color: color-mix(in srgb, var(--blue) 42%, var(--line));
+  background: color-mix(in srgb, var(--blue-soft) 56%, var(--panel));
+  transform: translateY(-1px);
+}
+
+.code-category-button.active {
+  border-color: var(--blue);
+  background: var(--blue-soft);
+  color: var(--blue);
+  box-shadow: inset 4px 0 0 var(--blue), 0 14px 34px rgba(18, 111, 255, 0.12);
+}
+
+.code-category-button strong {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-size: 14px;
+}
+
+.code-category-button small {
+  grid-column: 1 / -1;
+  color: var(--muted);
+  line-height: 1.35;
+}
+
+.code-category-count {
+  min-width: 28px;
+  min-height: 24px;
+  border-radius: 999px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  background: var(--panel-soft);
+  color: var(--muted);
+  font-size: 12px;
+  font-weight: 900;
+}
+
+.code-category-button.active .code-category-count {
+  background: var(--panel);
+  color: var(--blue);
+}
+
+.code-results {
+  min-width: 0;
+  display: grid;
+  gap: 14px;
+}
+
+.code-summary {
+  border: 1px solid var(--line);
+  border-radius: 8px;
+  background: color-mix(in srgb, var(--panel) 82%, var(--panel-soft));
+  padding: 14px 16px;
+}
+
+.code-summary strong {
+  display: block;
+  color: var(--text);
+  margin-bottom: 4px;
+}
+
+.code-summary p {
+  margin: 0;
+  color: var(--muted);
+  line-height: 1.45;
+}
+
 .code-grid {
   grid-template-columns: repeat(2, minmax(0, 1fr));
 }
@@ -1073,11 +1224,14 @@ h2 {
 }
 
 .code-card-top code {
+  display: block;
   overflow-wrap: anywhere;
   color: #d6e4f7;
   background: #0c1117;
   border-radius: 7px;
   padding: 10px;
+  font: 12px/1.55 "Cascadia Mono", Consolas, "Courier New", monospace;
+  white-space: pre-wrap;
 }
 
 .code-card-top span {
@@ -1155,7 +1309,7 @@ h2 {
   display: block;
   padding: 12px;
   color: #d6e4f7;
-  font: 12px/1.55 Consolas, "Courier New", monospace;
+  font: 12px/1.55 "Cascadia Mono", Consolas, "Courier New", monospace;
   white-space: pre;
 }
 
@@ -1262,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;
 }
@@ -1517,6 +1672,20 @@ body.logs-visible .bottom-log-bar {
     grid-template-columns: 1fr;
   }
 
+  .code-browser {
+    grid-template-columns: 1fr;
+  }
+
+  .code-categories {
+    position: static;
+    grid-auto-flow: column;
+    grid-auto-columns: minmax(180px, 220px);
+    overflow-x: auto;
+    overflow-y: hidden;
+    max-height: none;
+    padding: 0 0 4px;
+  }
+
   .icon-field,
   .keystore-field,
   .onesignal-field,

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

@@ -18,13 +18,40 @@
       <uses-permission android:name="android.permission.VIBRATE" />
       <uses-permission android:name="android.permission.CAMERA" />
       <uses-permission android:name="android.permission.RECORD_AUDIO" />
+      <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+      <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+      <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>
 
     <config-file target="AndroidManifest.xml" parent="/manifest/application">
+      <provider
+        android:name="androidx.core.content.FileProvider"
+        android:authorities="${applicationId}.html2apk.fileprovider"
+        android:exported="false"
+        android:grantUriPermissions="true">
+        <meta-data
+          android:name="android.support.FILE_PROVIDER_PATHS"
+          android:resource="@xml/html2apk_file_paths" />
+      </provider>
       <service android:name="dev.html2apk.bridge.FloatingIconService" android:exported="false" />
       <receiver android:name="dev.html2apk.bridge.NotificationReceiver" android:exported="false" />
       <receiver android:name="dev.html2apk.bridge.NotificationClickReceiver" android:exported="false" />
@@ -36,12 +63,35 @@
       </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" />
     <source-file src="src/android/NotificationClickReceiver.java" target-dir="app/src/main/java/dev/html2apk/bridge" />
     <source-file src="src/android/BootReceiver.java" target-dir="app/src/main/java/dev/html2apk/bridge" />
     <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));
+    }
 }