html2apk 0.5.0 → 0.7.0

package/src/desktop/renderer/styles.css

@@ -492,6 +492,7 @@ h2 {
 }
 
 .icon-field,
+.keystore-field,
 .onesignal-field,
 .permissions-field {
   grid-column: span 2;
@@ -569,6 +570,24 @@ h2 {
   gap: 10px;
 }
 
+.keystore-grid {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 12px;
+}
+
+.keystore-grid label {
+  display: grid;
+  gap: 8px;
+}
+
+.inline-picker {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) auto;
+  gap: 10px;
+  align-items: center;
+}
+
 .validation-panel {
   margin-top: 16px;
   border: 1px solid color-mix(in srgb, var(--red) 42%, var(--line));
@@ -621,6 +640,165 @@ h2 {
   color: var(--muted);
 }
 
+.file-editor-layout {
+  display: grid;
+  grid-template-columns: minmax(220px, 290px) minmax(0, 1fr);
+  gap: 16px;
+  min-height: 620px;
+}
+
+.file-tree-panel,
+.file-editor-panel {
+  border: 1px solid var(--line);
+  background: var(--panel);
+  border-radius: 8px;
+  box-shadow: var(--shadow);
+}
+
+.file-tree-panel {
+  padding: 14px;
+  overflow: auto;
+}
+
+.file-tree-panel > strong {
+  display: block;
+  margin-bottom: 12px;
+}
+
+.file-tree {
+  display: grid;
+  gap: 4px;
+}
+
+.file-tree-empty {
+  color: var(--muted);
+  line-height: 1.45;
+}
+
+.file-row {
+  width: 100%;
+  min-height: 34px;
+  border: 0;
+  border-radius: 7px;
+  padding: 0 8px;
+  background: transparent;
+  color: var(--text);
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  text-align: left;
+}
+
+.file-row:hover,
+.file-row.active {
+  background: var(--blue-soft);
+  color: var(--blue);
+}
+
+.file-row:disabled {
+  cursor: not-allowed;
+  color: var(--muted);
+  opacity: .62;
+}
+
+.folder-row {
+  margin-top: 8px;
+  min-height: 28px;
+  color: var(--muted);
+  font-size: 12px;
+  font-weight: 800;
+  text-transform: uppercase;
+}
+
+.file-editor-panel {
+  display: grid;
+  grid-template-rows: auto minmax(280px, 1fr) minmax(180px, 240px);
+  overflow: hidden;
+}
+
+.file-editor-meta {
+  min-height: 50px;
+  border-bottom: 1px solid var(--line);
+  padding: 12px 14px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+}
+
+.file-editor-meta strong {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+#fileLanguageBadge {
+  flex: 0 0 auto;
+  min-width: 46px;
+  min-height: 26px;
+  padding: 5px 9px;
+  border-radius: 8px;
+  background: var(--blue-soft);
+  color: var(--blue);
+  text-align: center;
+  font-size: 12px;
+  font-weight: 800;
+}
+
+#fileEditorInput {
+  width: 100%;
+  min-height: 0;
+  resize: none;
+  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;
+  tab-size: 2;
+}
+
+.syntax-preview-wrap {
+  min-height: 0;
+  display: grid;
+  grid-template-rows: auto minmax(0, 1fr);
+  background: color-mix(in srgb, var(--panel-soft) 55%, var(--panel));
+}
+
+.syntax-preview-wrap > strong {
+  padding: 10px 14px 0;
+  color: var(--muted);
+  font-size: 12px;
+}
+
+.syntax-preview {
+  margin: 0;
+  padding: 12px 14px 16px;
+  overflow: auto;
+  color: var(--text);
+  font: 12px/1.55 ui-monospace, SFMono-Regular, Consolas, monospace;
+}
+
+.syntax-token-tag,
+.syntax-token-keyword {
+  color: var(--blue);
+  font-weight: 800;
+}
+
+.syntax-token-string {
+  color: var(--green);
+}
+
+.syntax-token-comment {
+  color: var(--muted);
+  font-style: italic;
+}
+
+.syntax-token-number {
+  color: var(--amber);
+}
+
 .preference-row {
   min-height: 112px;
   padding: 20px;
@@ -1340,11 +1518,22 @@ body.logs-visible .bottom-log-bar {
   }
 
   .icon-field,
+  .keystore-field,
   .onesignal-field,
   .permissions-field {
     grid-column: span 1;
   }
 
+  .keystore-grid,
+  .inline-picker,
+  .file-editor-layout {
+    grid-template-columns: 1fr;
+  }
+
+  .file-editor-layout {
+    min-height: 820px;
+  }
+
   .view-header,
   .result-panel,
   .progress-panel,

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

@@ -425,6 +425,22 @@ public class Html2ApkBridge extends CordovaPlugin {
         return false;
     }
 
+    private void rejectBusyCallback(CallbackContext callbackContext, String operation) {
+        callbackContext.error(operation + " is already waiting for Android. Wait for the previous call to finish.");
+    }
+
+    private boolean hasPendingNotificationPermissionRequest() {
+        return pendingNotificationCallback != null || notificationPermissionCallback != null;
+    }
+
+    private boolean hasPendingCameraPermissionRequest() {
+        return pendingFlashlightCallback != null || cameraPermissionCallback != null;
+    }
+
+    private boolean hasPendingMicrophonePermissionRequest() {
+        return pendingMicStartCallback != null || microphonePermissionCallback != null;
+    }
+
     @Override
     public void onRequestPermissionResult(int requestCode, String[] permissions, int[] grantResults) {
         if (requestCode == REQUEST_CAMERA) {
@@ -761,6 +777,10 @@ public class Html2ApkBridge extends CordovaPlugin {
             callbackContext.success(notificationPermissionStatus());
             return;
         }
+        if (hasPendingNotificationPermissionRequest()) {
+            rejectBusyCallback(callbackContext, "POST_NOTIFICATIONS permission");
+            return;
+        }
 
         notificationPermissionCallback = callbackContext;
         rememberRuntimePermissionRequest(Manifest.permission.POST_NOTIFICATIONS);
@@ -776,6 +796,10 @@ public class Html2ApkBridge extends CordovaPlugin {
         if (hasNotificationPermission()) {
             return false;
         }
+        if (hasPendingNotificationPermissionRequest()) {
+            rejectBusyCallback(callbackContext, "POST_NOTIFICATIONS permission");
+            return true;
+        }
 
         pendingNotificationOptions = options;
         pendingNotificationSchedule = schedule;
@@ -1063,6 +1087,10 @@ public class Html2ApkBridge extends CordovaPlugin {
             callbackContext.success(runtimePermissionResult(Manifest.permission.CAMERA, true, false, true));
             return;
         }
+        if (hasPendingCameraPermissionRequest()) {
+            rejectBusyCallback(callbackContext, "CAMERA permission");
+            return;
+        }
 
         cameraPermissionCallback = callbackContext;
         rememberRuntimePermissionRequest(Manifest.permission.CAMERA);
@@ -1081,6 +1109,10 @@ public class Html2ApkBridge extends CordovaPlugin {
             callbackContext.success(result);
             return;
         }
+        if (hasPendingMicrophonePermissionRequest()) {
+            rejectBusyCallback(callbackContext, "RECORD_AUDIO permission");
+            return;
+        }
 
         microphonePermissionCallback = callbackContext;
         rememberRuntimePermissionRequest(Manifest.permission.RECORD_AUDIO);
@@ -1116,6 +1148,10 @@ public class Html2ApkBridge extends CordovaPlugin {
         }
 
         if (!hasMicrophonePermission()) {
+            if (hasPendingMicrophonePermissionRequest()) {
+                rejectBusyCallback(callbackContext, "RECORD_AUDIO permission");
+                return;
+            }
             pendingMicStartCallback = callbackContext;
             rememberRuntimePermissionRequest(Manifest.permission.RECORD_AUDIO);
             cordova.requestPermission(this, REQUEST_RECORD_AUDIO, Manifest.permission.RECORD_AUDIO);
@@ -1299,6 +1335,10 @@ public class Html2ApkBridge extends CordovaPlugin {
 
     private void setFlashlightWithPermission(boolean enabled, boolean toggle, CallbackContext callbackContext) throws Exception {
         if (!hasCameraPermission()) {
+            if (hasPendingCameraPermissionRequest()) {
+                rejectBusyCallback(callbackContext, "CAMERA permission");
+                return;
+            }
             pendingFlashlightCallback = callbackContext;
             pendingFlashlightEnabled = enabled;
             pendingFlashlightToggle = toggle;
@@ -1397,6 +1437,11 @@ public class Html2ApkBridge extends CordovaPlugin {
     }
 
     private void pickFile(JSONObject options, CallbackContext callbackContext) {
+        if (filePickerCallback != null) {
+            rejectBusyCallback(callbackContext, "File picker");
+            return;
+        }
+
         JSONObject safeOptions = options == null ? new JSONObject() : options;
         String kind = safeOptions.optString("tipo", safeOptions.optString("kind", "file"));
         boolean multiple = safeOptions.optBoolean("multiplo", safeOptions.optBoolean("multiple", false));
@@ -1438,12 +1483,22 @@ public class Html2ApkBridge extends CordovaPlugin {
     }
 
     private void pickFolder(CallbackContext callbackContext) {
+        if (folderPickerCallback != null) {
+            rejectBusyCallback(callbackContext, "Folder picker");
+            return;
+        }
+
         Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
         folderPickerCallback = callbackContext;
         cordova.startActivityForResult(this, intent, REQUEST_PICK_FOLDER);
     }
 
     private void saveFile(JSONObject options, CallbackContext callbackContext) throws Exception {
+        if (saveFileCallback != null) {
+            rejectBusyCallback(callbackContext, "File save dialog");
+            return;
+        }
+
         JSONObject safeOptions = options == null ? new JSONObject() : options;
         String name = safeOptions.optString("nome", safeOptions.optString("name", "arquivo.txt"));
         String mimeType = safeOptions.optString("mimeType", "text/plain");