Merge branch 'Acode-Foundation:main' into main

Author: RohitKushvaha01

CHANGELOG.md

@@ -1,5 +1,45 @@
 # Change Log
 
+## v1.11.5 (963)
+
+* Alpine Linux Backend by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1401
+* fix: html escaping for console page by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1411
+* Create plugin for native libs by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1413
+* feat: terminal frontend by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1415
+* Update hu-hu.json translation by @summoner001 in https://github.com/Acode-Foundation/Acode/pull/1423, https://github.com/Acode-Foundation/Acode/pull/1425, https://github.com/Acode-Foundation/Acode/pull/1440
+* chore: update id-id.json translation by @hyperz111 in https://github.com/Acode-Foundation/Acode/pull/1424, https://github.com/Acode-Foundation/Acode/pull/1447
+* All file access permission for terminal by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1426
+* refactor: plugins page by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1428
+	* Fixed infinite scrolling in case of filtering on both plugin page and sidebar
+    * Ui improvements on plugin page
+* Revamped few themes(fixes visibility issue) and Added few new ones  by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1430
+	* New theme: Neon, Sunset, Glass, Glass Dark
+	* Revamped themes: System (Dark & Light), Oled, Light
+	* System theme option is available on free too.
+* fix: scaling issue by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1431
+* fix: quicktools toggler responsiveness(scaling) and migrate biome by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1442
+* chore: update ace to v1.43.2 by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1443
+* feat: add uninstall option in terminal setting and tab subtitle fixes by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1445
+* feat: alpine document provider(exposes terminal public dir to saf picker) by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1444
+* feat: improved logging + fix terminal installation failure by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1446
+* some terminal related quality improvements by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1449
+	* fix: dont start selection in case of back gesture
+	* remove useless border-radius from terminal container
+	* fix: improve terminal cursor positioning for mobile keyboard events
+	* fix: update terminal container background when theme changes
+* exclude alpine/public while backup by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1450
+* Custom port support in Terminal manager by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1459
+* 🌐 i18n(locale): update vietnamese translations by @Nekitori17 in https://github.com/Acode-Foundation/Acode/pull/1461
+* fix: infinite loading when previewing by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1460
+* Feat/some improvements to terminal and its api by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1463
+* Fixes/sidebar extension state by clearing and active autocompletion box background  by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1466
+* feat: add terminal like search and replace history by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1467
+* fix: theme issue in terminal context menu
+* fix: prevent folder paste loops and improve SAF handling(termux) in cut operation by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1474
+	- Add validation to prevent pasting folders into themselves or subdirectories
+	- Implement special Termux SAF handling for cut operations with recursive file/folder moving
+	- Fix createFileStructure to handle nested paths (foo/bar) for file:// URIs
+
 ## v1.11.4 (962)
 
 * Fix renaming current Termux URI file whilst viewing/editing it by @peasneovoyager2banana2

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<widget id="com.foxdebug.acode" android-versionCode="962" version="1.11.4"
+<widget id="com.foxdebug.acode" android-versionCode="963" version="1.11.5"
     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">
@@ -37,7 +37,6 @@
         <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
             <application android:networkSecurityConfig="@xml/network_security_config" />
             <application android:hardwareAccelerated="true" />
-            <application android:requestLegacyExternalStorage="true" />
             <application android:largeHeap="true" />
             <application android:requestLegacyExternalStorage="true"/>
         </edit-config>

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "com.foxdebug.acode",
   "displayName": "Acode",
-  "version": "1.11.4",
+  "version": "1.11.5",
   "description": "Acode is a code editor for android",
   "scripts": {
     "lang": "node ./utils/lang.js",

package.json

@@ -31,6 +31,7 @@ export default class TerminalComponent {
 			scrollOnUserInput: true,
 			rows: options.rows || 24,
 			cols: options.cols || 80,
+			port: options.port || 8767,
 			fontSize: terminalSettings.fontSize,
 			fontFamily: terminalSettings.fontFamily,
 			fontWeight: terminalSettings.fontWeight,
@@ -467,6 +468,8 @@ export default class TerminalComponent {
       position: relative;
       background: ${this.options.theme.background};
       overflow: hidden;
+      padding: 0.25rem;
+      box-sizing: border-box;
     `;
 
 		return this.container;
@@ -566,13 +569,16 @@ export default class TerminalComponent {
 				rows: this.terminal.rows,
 			};
 
-			const response = await fetch("http://localhost:8767/terminals", {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
+			const response = await fetch(
+				`http://localhost:${this.options.port}/terminals`,
+				{
+					method: "POST",
+					headers: {
+						"Content-Type": "application/json",
+					},
+					body: JSON.stringify(requestBody),
 				},
-				body: JSON.stringify(requestBody),
-			});
+			);
 
 			if (!response.ok) {
 				throw new Error(`HTTP error! status: ${response.status}`);
@@ -604,7 +610,7 @@ export default class TerminalComponent {
 
 		this.pid = pid;
 
-		const wsUrl = `ws://localhost:8767/terminals/${pid}`;
+		const wsUrl = `ws://localhost:${this.options.port}/terminals/${pid}`;
 
 		this.websocket = new WebSocket(wsUrl);
 
@@ -658,13 +664,16 @@ export default class TerminalComponent {
 		if (!this.pid || !this.serverMode) return;
 
 		try {
-			await fetch(`http://localhost:8767/terminals/${this.pid}/resize`, {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
+			await fetch(
+				`http://localhost:${this.options.port}/terminals/${this.pid}/resize`,
+				{
+					method: "POST",
+					headers: {
+						"Content-Type": "application/json",
+					},
+					body: JSON.stringify({ cols, rows }),
 				},
-				body: JSON.stringify({ cols, rows }),
-			});
+			);
 		} catch (error) {
 			console.error("Failed to resize terminal:", error);
 		}
@@ -684,7 +693,18 @@ export default class TerminalComponent {
 	 * @param {string} data - Data to write
 	 */
 	write(data) {
-		this.terminal.write(data);
+		if (
+			this.serverMode &&
+			this.isConnected &&
+			this.websocket &&
+			this.websocket.readyState === WebSocket.OPEN
+		) {
+			// Send data through WebSocket instead of direct write
+			this.websocket.send(data);
+		} else {
+			// For local mode or disconnected terminals, write directly
+			this.terminal.write(data);
+		}
 	}
 
 	/**
@@ -953,9 +973,12 @@ export default class TerminalComponent {
 
 		if (this.pid && this.serverMode) {
 			try {
-				await fetch(`http://localhost:8767/terminals/${this.pid}/terminate`, {
-					method: "POST",
-				});
+				await fetch(
+					`http://localhost:${this.options.port}/terminals/${this.pid}/terminate`,
+					{
+						method: "POST",
+					},
+				);
 			} catch (error) {
 				console.error("Failed to terminate terminal:", error);
 			}

src/components/terminal/terminal.js

@@ -472,6 +472,7 @@ class TerminalManager {
 				background: #1e1e1e;
 				overflow: hidden;
 				position: relative;
+				padding: 0.25rem;
 			}
 		`;
 	}

src/components/terminal/terminalManager.js

@@ -71,7 +71,7 @@
 	padding: 12px 16px;
 	border: none;
 	background: transparent;
-	color: #fff;
+	color: var(--primary-text-color);
 	font-size: 14px;
 	font-weight: 500;
 	text-align: center;
@@ -85,12 +85,12 @@
 
 .terminal-context-menu button:hover,
 .terminal-context-menu button:focus {
-	background: #616161;
+	background: var(--popup-border-color);
 	outline: none;
 }
 
 .terminal-context-menu button:active {
-	background: #757575;
+	background: rgba(var(--secondary-color), 0.5);
 }
 
 @media (min-width: 768px) {

src/components/terminal/terminalTouchSelection.css

@@ -1,5 +1,6 @@
 import quickTools from "components/quickTools";
 import actionStack from "lib/actionStack";
+import searchHistory from "lib/searchHistory";
 import appSettings from "lib/settings";
 import searchSettings from "settings/searchSettings";
 import KeyboardEvent from "utils/keyboardEvent";
@@ -75,6 +76,67 @@ appSettings.on("update:quicktoolsItems:after", () => {
 	}, 100);
 });
 
+// Initialize history navigation
+function setupHistoryNavigation() {
+	const { $searchInput, $replaceInput } = quickTools;
+
+	// Search input history navigation
+	if ($searchInput.el) {
+		$searchInput.el.addEventListener("keydown", (e) => {
+			if (e.key === "ArrowUp") {
+				e.preventDefault();
+				const newValue = searchHistory.navigateSearchUp($searchInput.el.value);
+				$searchInput.el.value = newValue;
+				// Trigger search
+				if (newValue) find(0, false);
+			} else if (e.key === "ArrowDown") {
+				e.preventDefault();
+				const newValue = searchHistory.navigateSearchDown(
+					$searchInput.el.value,
+				);
+				$searchInput.el.value = newValue;
+				// Trigger search
+				if (newValue) find(0, false);
+			} else if (e.key === "Enter" || e.key === "Escape") {
+				// Reset navigation on enter or escape
+				searchHistory.resetSearchNavigation();
+			}
+		});
+
+		// Reset navigation when user starts typing
+		$searchInput.el.addEventListener("input", () => {
+			searchHistory.resetSearchNavigation();
+		});
+	}
+
+	// Replace input history navigation
+	if ($replaceInput.el) {
+		$replaceInput.el.addEventListener("keydown", (e) => {
+			if (e.key === "ArrowUp") {
+				e.preventDefault();
+				const newValue = searchHistory.navigateReplaceUp(
+					$replaceInput.el.value,
+				);
+				$replaceInput.el.value = newValue;
+			} else if (e.key === "ArrowDown") {
+				e.preventDefault();
+				const newValue = searchHistory.navigateReplaceDown(
+					$replaceInput.el.value,
+				);
+				$replaceInput.el.value = newValue;
+			} else if (e.key === "Enter" || e.key === "Escape") {
+				// Reset navigation on enter or escape
+				searchHistory.resetReplaceNavigation();
+			}
+		});
+
+		// Reset navigation when user starts typing
+		$replaceInput.el.addEventListener("input", () => {
+			searchHistory.resetReplaceNavigation();
+		});
+	}
+}
+
 export const key = {
 	get shift() {
 		return state.shift;
@@ -169,10 +231,16 @@ export default function actions(action, value) {
 			return true;
 
 		case "search-prev":
+			if (quickTools.$searchInput.el.value) {
+				searchHistory.addToHistory(quickTools.$searchInput.el.value);
+			}
 			find(1, true);
 			return true;
 
 		case "search-next":
+			if (quickTools.$searchInput.el.value) {
+				searchHistory.addToHistory(quickTools.$searchInput.el.value);
+			}
 			find(1, false);
 			return true;
 
@@ -181,10 +249,16 @@ export default function actions(action, value) {
 			return true;
 
 		case "search-replace":
+			if ($replaceInput.value) {
+				searchHistory.addToHistory($replaceInput.value);
+			}
 			editor.replace($replaceInput.value || "");
 			return true;
 
 		case "search-replace-all":
+			if ($replaceInput.value) {
+				searchHistory.addToHistory($replaceInput.value);
+			}
 			editor.replaceAll($replaceInput.value || "");
 			return true;
 
@@ -227,9 +301,15 @@ function toggleSearch() {
 		};
 
 		$searchInput.onsearch = function () {
-			if (this.value) find(1, false);
+			if (this.value) {
+				searchHistory.addToHistory(this.value);
+				find(1, false);
+			}
 		};
 
+		// Setup history navigation for search inputs
+		setupHistoryNavigation();
+
 		setFooterHeight(2);
 		find(0, false);
 
@@ -327,6 +407,10 @@ function removeSearch() {
 	$footer.removeAttribute("data-searching");
 	$searchRow1.remove();
 	$searchRow2.remove();
+
+	// Reset history navigation when search is closed
+	searchHistory.resetAllNavigation();
+
 	const { activeFile } = editorManager;
 
 	// Check if current tab is a terminal