Merge branch 'Acode-Foundation:main' into main

Author: hyperz111

CHANGELOG.md

@@ -1,5 +1,44 @@
 # Change Log
 
+## v1.11.6 (965)
+
+* fix: Terminal in F-Droid flavour by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1478
+* feat: update target SDK to API 35 and fix edge-to-edge compatibility by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1486
+* improve German translation by @brian200508 in https://github.com/Acode-Foundation/Acode/pull/1487
+* Translation: Update hu-hu.json by @summoner001 in https://github.com/Acode-Foundation/Acode/pull/1489
+* chore(update IAP library to lateset version) by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/1405
+* feat: font manager ui for managing custom fonts by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1491
+* feat: add package updated time display on plugin page by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1494
+* chore: update id-id.json by @hyperz111 in https://github.com/Acode-Foundation/Acode/pull/1495
+* fix: document provider by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1497
+* feat(sponsor page) by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/1496
+* fix: load custom fonts on restart by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1499
+* Update hu-hu.json by @summoner001 in https://github.com/Acode-Foundation/Acode/pull/1498
+* fix: resolve GitHub URI preview issues in server by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1501
+* fix: plugins page scrolling by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/1505
+* [chore] bump workflow dependencies to latest versions by @Jvr2022 in https://github.com/Acode-Foundation/Acode/pull/1506
+* fix: load base app stylesheet in custom editor tab by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/1507
+* update src/lang/pt-br.json by @sebastianjnuwu in https://github.com/Acode-Foundation/Acode/pull/1510
+* Add code formatter keybind by @UnschooledGamer in https://github.com/Acode-Foundation/Acode/pull/1511
+* Added hyphen in quicktools and more strings for i18n by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1516
+* chore(i18n): update id-id.json with new strings by @hyperz111 in https://github.com/Acode-Foundation/Acode/pull/1521
+* chore(i18n): update hu-hu.json with new strings by @summoner001 in https://github.com/Acode-Foundation/Acode/pull/1520
+* Add/Update Bengali (bn-BD) Translation File by @thebadhonbiswas in https://github.com/Acode-Foundation/Acode/pull/1522
+* feat: take confirmation before uninstalling terminal by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1528
+* fix ui issue by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1527
+* fix: disable changing editor theme when system is selected by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1529
+* fix: svg render issue by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1530
+* fix: encoding detection by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1533
+* fix: big screen ui and global search worker issue by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/1534
+* fix: improved terminal mounts by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1537
+* chore(i18n): refine Russian (ru-ru.json) localization with updated and new strings by @Nein-Ich-wurde-Gewinnen in https://github.com/Acode-Foundation/Acode/pull/1541
+* Fixed Plugin installation issues(in some cases) by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1546
+* feat: add option to auto detect encoding by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1547
+* fix: ftp infinite loading by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1552
+* fix: tab active state when switching tab with api by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1557
+* fix: resize of terminal and some small patches by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1562
+* fix: fdroid builds by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1565
+
 ## v1.11.5 (963)
 
 * Alpine Linux Backend by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1401

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<widget id="com.foxdebug.acode" android-versionCode="963" version="1.11.5"
+<widget id="com.foxdebug.acode" android-versionCode="965" version="1.11.6"
     xmlns="http://www.w3.org/ns/widgets"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:cdv="http://cordova.apache.org/ns/1.0">

hooks/post-process.js

@@ -34,6 +34,27 @@ enableStaticContext();
 patchTargetSdkVersion();
 
 
+function getTmpDir() {
+  const tmpdirEnv = process.env.TMPDIR;
+
+  if (tmpdirEnv) {
+    try {
+      fs.accessSync(tmpdirEnv, fs.constants.R_OK | fs.constants.W_OK);
+      return tmpdirEnv;
+    } catch {
+      // TMPDIR exists but not accessible
+    }
+  }
+
+  try {
+    fs.accessSync("/tmp", fs.constants.R_OK | fs.constants.W_OK);
+    return "/tmp";
+  } catch {
+    console.error("Error: No usable temporary directory found (TMPDIR or /tmp not accessible).");
+    process.exit(1);
+  }
+}
+
 function patchTargetSdkVersion() {
   const prefix = execSync('npm prefix').toString().trim();
   const gradleFile = path.join(prefix, 'platforms/android/app/build.gradle');
@@ -49,13 +70,16 @@ function patchTargetSdkVersion() {
 
   if (sdkRegex.test(content)) {
     let api = "35";
-    const froidFlag = path.join(prefix, 'fdroid.bool');
+    const froidFlag = path.join(getTmpDir(), 'fdroid.bool');
 
     if (fs.existsSync(froidFlag)) {
       const fdroid = fs.readFileSync(froidFlag, 'utf-8').trim();
       if (fdroid == "true") {
         api = "28";
       }
+    } else {
+      console.error(`${getTmpDir()}/fdroid.bool not found`);
+      process.exit(1);
     }
 
     content = content.replace(sdkRegex, 'targetSdkVersion ' + api);

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "com.foxdebug.acode",
   "displayName": "Acode",
-  "version": "1.11.5",
+  "version": "1.11.6",
   "description": "Acode is a code editor for android",
   "scripts": {
     "lang": "node ./utils/lang.js",
@@ -36,7 +36,6 @@
       "cordova-plugin-websocket": {},
       "cordova-plugin-buildinfo": {},
       "com.foxdebug.acode.rk.exec.terminal": {},
-      "com.foxdebug.acode.rk.exec.proot": {},
       "cordova-plugin-browser": {},
       "cordova-plugin-system": {}
     },
@@ -63,7 +62,6 @@
     "@types/url-parse": "^1.4.11",
     "autoprefixer": "^10.4.21",
     "babel-loader": "^10.0.0",
-    "com.foxdebug.acode.rk.exec.proot": "file:src/plugins/proot",
     "com.foxdebug.acode.rk.exec.terminal": "file:src/plugins/terminal",
     "cordova-android": "^14.0.1",
     "cordova-clipboard": "^1.3.0",

package.json

@@ -32,6 +32,7 @@ export default class TerminalComponent {
 			rows: options.rows || 24,
 			cols: options.cols || 80,
 			port: options.port || 8767,
+			renderer: options.renderer || "auto", // 'auto' | 'canvas' | 'webgl'
 			fontSize: terminalSettings.fontSize,
 			fontFamily: terminalSettings.fontFamily,
 			fontWeight: terminalSettings.fontWeight,
@@ -80,7 +81,7 @@ export default class TerminalComponent {
 				system.openInBrowser(uri);
 			}
 		});
-		this.webglAddon = new WebglAddon();
+		this.webglAddon = null;
 
 		// Load addons
 		this.terminal.loadAddon(this.fitAddon);
@@ -244,36 +245,12 @@ export default class TerminalComponent {
 		// Ensure scroll position is within valid bounds
 		const safeScrollPosition = Math.min(targetScrollPosition, maxScroll);
 
-		// Only adjust if we have significant content and the position is different
+		// Only adjust if we have significant content and the position differs
 		if (
 			buffer.length > this.terminal.rows &&
-			Math.abs(buffer.viewportY - safeScrollPosition) > 2
+			buffer.viewportY !== safeScrollPosition
 		) {
-			// Gradually adjust to prevent jarring movements
-			const steps = 3;
-			const diff = safeScrollPosition - buffer.viewportY;
-			const stepSize = Math.ceil(Math.abs(diff) / steps);
-
-			let currentStep = 0;
-			const adjustStep = () => {
-				if (currentStep >= steps) return;
-
-				const currentPos = buffer.viewportY;
-				const remaining = safeScrollPosition - currentPos;
-				const adjustment =
-					Math.sign(remaining) * Math.min(stepSize, Math.abs(remaining));
-
-				if (Math.abs(adjustment) >= 1) {
-					this.terminal.scrollLines(adjustment);
-				}
-
-				currentStep++;
-				if (currentStep < steps && Math.abs(remaining) > 1) {
-					setTimeout(adjustStep, 50);
-				}
-			};
-
-			setTimeout(adjustStep, 100);
+			this.terminal.scrollToLine(safeScrollPosition);
 		}
 	}
 
@@ -468,7 +445,6 @@ export default class TerminalComponent {
       position: relative;
       background: ${this.options.theme.background};
       overflow: hidden;
-      padding: 0.25rem;
       box-sizing: border-box;
     `;
 
@@ -490,32 +466,49 @@ export default class TerminalComponent {
 		this.container.style.background = this.options.theme.background;
 
 		try {
-			try {
-				this.terminal.loadAddon(this.webglAddon);
-				this.terminal.open(container);
-			} catch (error) {
-				console.error("Failed to load WebglAddon:", error);
-				this.webglAddon.dispose();
-			}
-
-			if (!this.terminal.element) {
-				// webgl loading failed for some reason, attach with DOM renderer
-				this.terminal.open(container);
+			// Open first to ensure a stable renderer is attached
+			this.terminal.open(container);
+
+			// Renderer selection: 'canvas' (default core), 'webgl', or 'auto'
+			if (
+				this.options.renderer === "webgl" ||
+				this.options.renderer === "auto"
+			) {
+				try {
+					const addon = new WebglAddon();
+					this.terminal.loadAddon(addon);
+					if (typeof addon.onContextLoss === "function") {
+						addon.onContextLoss(() => this._handleWebglContextLoss());
+					}
+					this.webglAddon = addon;
+				} catch (error) {
+					console.error("Failed to enable WebGL renderer:", error);
+					try {
+						this.webglAddon?.dispose?.();
+					} catch {}
+					this.webglAddon = null; // stay on canvas
+				}
 			}
 			const terminalSettings = getTerminalSettings();
 			// Load ligatures addon if enabled
 			if (terminalSettings.fontLigatures) {
 				this.loadLigaturesAddon();
 			}
 
-			// Wait for terminal to render then fit
-			setTimeout(() => {
-				this.fitAddon.fit();
-				this.terminal.focus();
-
-				// Initialize touch selection after terminal is mounted
-				this.setupTouchSelection();
-			}, 10);
+			// First render pass: schedule a fit + focus once the frame is ready
+			if (typeof requestAnimationFrame === "function") {
+				requestAnimationFrame(() => {
+					this.fitAddon.fit();
+					this.terminal.focus();
+					this.setupTouchSelection();
+				});
+			} else {
+				setTimeout(() => {
+					this.fitAddon.fit();
+					this.terminal.focus();
+					this.setupTouchSelection();
+				}, 0);
+			}
 		} catch (error) {
 			console.error("Failed to mount terminal:", error);
 		}
@@ -726,32 +719,6 @@ export default class TerminalComponent {
 	 * Focus terminal
 	 */
 	focus() {
-		// Ensure cursor is visible before focusing to prevent half-visibility
-		if (this.terminal.buffer && this.terminal.buffer.active) {
-			const buffer = this.terminal.buffer.active;
-			const cursorY = buffer.cursorY;
-			const cursorViewportPos = buffer.baseY + cursorY;
-			const viewportTop = buffer.viewportY;
-			const viewportBottom = viewportTop + this.terminal.rows - 1;
-
-			// Check if cursor is fully visible (with margin to prevent half-visibility)
-			const isCursorFullyVisible =
-				cursorViewportPos >= viewportTop + 1 &&
-				cursorViewportPos <= viewportBottom - 2;
-
-			// If cursor is not fully visible, scroll to make it properly visible
-			if (!isCursorFullyVisible && buffer.length > this.terminal.rows) {
-				const targetScroll = Math.max(
-					0,
-					Math.min(
-						buffer.length - this.terminal.rows,
-						cursorViewportPos - Math.floor(this.terminal.rows * 0.25),
-					),
-				);
-				this.terminal.scrollToLine(targetScroll);
-			}
-		}
-
 		this.terminal.focus();
 	}
 
@@ -1018,3 +985,16 @@ export default class TerminalComponent {
 	onBell() {}
 	onProcessExit(exitData) {}
 }
+
+// Internal helpers for WebGL renderer lifecycle
+TerminalComponent.prototype._handleWebglContextLoss = function () {
+	try {
+		console.warn("WebGL context lost; falling back to canvas renderer");
+		try {
+			this.webglAddon?.dispose?.();
+		} catch {}
+		this.webglAddon = null;
+	} catch (e) {
+		console.error("Error handling WebGL context loss:", e);
+	}
+};