Merge branch 'Acode-Foundation:main' into patch-6

Mr-Update · web-flow · commit 1f8d7d120558 · 2025-11-11T00:22:04.000+01:00
diff --git a/config.xml b/config.xml
@@ -32,9 +32,10 @@
         <preference name="AndroidLaunchMode" value="singleTask" />
         <preference name="prerendered-icon" value="false" />
         <preference name="androidxEnabled" value="true" />
+        <preference name="GradlePluginKotlinEnabled" value="true" />
         <preference name="android-targetSdkVersion" value="35" />
 
-        
+
         <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
             <application android:networkSecurityConfig="@xml/network_security_config" />
             <application android:hardwareAccelerated="true" />
diff --git a/src/lib/acode.js b/src/lib/acode.js
@@ -45,6 +45,9 @@ import KeyboardEvent from "utils/keyboardEvent";
 import Url from "utils/Url";
 import constants from "./constants";
 
+const { Fold } = ace.require("ace/edit_session/fold");
+const { Range } = ace.require("ace/range");
+
 export default class Acode {
 	#modules = {};
 	#pluginsInit = {};
@@ -475,19 +478,28 @@ export default class Acode {
 
 	async format(selectIfNull = true) {
 		const file = editorManager.activeFile;
+		if (!file?.session) return;
+
 		const name = (file.session.getMode().$id || "").split("/").pop();
 		const formatterId = appSettings.value.formatter[name];
 		const formatter = this.#formatter.find(({ id }) => id === formatterId);
 
-		await formatter?.format();
-
-		if (!formatter && selectIfNull) {
+		if (!formatter) {
+			if (!selectIfNull) {
+				toast(strings["please select a formatter"]);
+				return;
+			}
 			formatterSettings(name);
 			this.#afterSelectFormatter(name);
 			return;
 		}
-		if (!formatter && !selectIfNull) {
-			toast(strings["please select a formatter"]);
+
+		const foldsSnapshot = this.#captureFoldState(file.session);
+
+		try {
+			await formatter.format();
+		} finally {
+			this.#restoreFoldState(file.session, foldsSnapshot);
 		}
 	}
 
@@ -506,6 +518,77 @@ export default class Acode {
 		return fsOperation(file);
 	}
 
+	#captureFoldState(session) {
+		if (!session?.getAllFolds) return null;
+		return this.#serializeFolds(session.getAllFolds());
+	}
+
+	#restoreFoldState(session, folds) {
+		if (!session || !Array.isArray(folds) || !folds.length) return;
+
+		try {
+			const foldObjects = this.#parseSerializableFolds(folds);
+			if (!foldObjects.length) return;
+			session.removeAllFolds?.();
+			session.addFolds?.(foldObjects);
+		} catch (error) {
+			console.warn("Failed to restore folds after formatting:", error);
+		}
+	}
+
+	#serializeFolds(folds) {
+		if (!Array.isArray(folds) || !folds.length) return null;
+
+		return folds
+			.map((fold) => {
+				if (!fold?.range) return null;
+				const { start, end } = fold.range;
+				if (!start || !end) return null;
+
+				return {
+					range: {
+						start: { row: start.row, column: start.column },
+						end: { row: end.row, column: end.column },
+					},
+					placeholder: fold.placeholder,
+					ranges: this.#serializeFolds(fold.ranges || []),
+				};
+			})
+			.filter(Boolean);
+	}
+
+	#parseSerializableFolds(folds) {
+		if (!Array.isArray(folds) || !folds.length) return [];
+
+		return folds
+			.map((fold) => {
+				const { range, placeholder, ranges } = fold;
+				const { start, end } = range || {};
+				if (!start || !end) return null;
+
+				try {
+					const foldInstance = new Fold(
+						new Range(start.row, start.column, end.row, end.column),
+						placeholder,
+					);
+
+					if (Array.isArray(ranges) && ranges.length) {
+						const subFolds = this.#parseSerializableFolds(ranges);
+						if (subFolds.length) {
+							foldInstance.subFolds = subFolds;
+							foldInstance.ranges = subFolds;
+						}
+					}
+
+					return foldInstance;
+				} catch (error) {
+					console.warn("Failed to parse fold:", error);
+					return null;
+				}
+			})
+			.filter(Boolean);
+	}
+
 	newEditorFile(filename, options) {
 		new EditorFile(filename, options);
 	}
diff --git a/src/lib/settings.js b/src/lib/settings.js
@@ -185,12 +185,10 @@ class Settings {
 		if (this.#initialized) return;
 		this.settingsFile = Url.join(DATA_STORAGE, "settings.json");
 
-		if (!IS_FREE_VERSION) {
-			this.#defaultSettings.appTheme = "system";
-			this.#defaultSettings.editorTheme = getSystemEditorTheme(
-				isDeviceDarkTheme(),
-			);
-		}
+		this.#defaultSettings.appTheme = "system";
+		this.#defaultSettings.editorTheme = getSystemEditorTheme(
+			isDeviceDarkTheme(),
+		);
 
 		this.#initialized = true;
 
diff --git a/src/plugins/terminal/src/android/AlpineDocumentProvider.java b/src/plugins/terminal/src/android/AlpineDocumentProvider.java
@@ -60,7 +60,7 @@ public Cursor queryRoots(String[] projection) {
         MatrixCursor result = new MatrixCursor(
             projection != null ? projection : DEFAULT_ROOT_PROJECTION
         );
-        String applicationName = "Acode";
+        String applicationName = getApplicationLabel();
 
         MatrixCursor.RowBuilder row = result.newRow();
         row.add(DocumentsContract.Root.COLUMN_ROOT_ID, getDocIdForFile(BASE_DIR));
@@ -75,7 +75,7 @@ public Cursor queryRoots(String[] projection) {
         row.add(DocumentsContract.Root.COLUMN_TITLE, applicationName);
         row.add(DocumentsContract.Root.COLUMN_MIME_TYPES, ALL_MIME_TYPES);
         row.add(DocumentsContract.Root.COLUMN_AVAILABLE_BYTES, BASE_DIR.getFreeSpace());
-        row.add(DocumentsContract.Root.COLUMN_ICON, R.mipmap.ic_launcher);
+        row.add(DocumentsContract.Root.COLUMN_ICON, resolveLauncherIcon());
         return result;
     }
 
@@ -364,4 +364,22 @@ private static String getMimeType(File file) {
             return "application/octet-stream";
         }
     }
+    private int resolveLauncherIcon() {
+        Context context = getContext();
+        if (context == null) return android.R.mipmap.sym_def_app_icon;
+        int icon = context.getResources().getIdentifier("ic_launcher", "mipmap", context.getPackageName());
+        return icon != 0 ? icon : android.R.mipmap.sym_def_app_icon;
+    }
+
+    private String getApplicationLabel() {
+        Context context = getContext();
+        if (context == null) return "Acode";
+        PackageManager pm = context.getPackageManager();
+        try {
+            CharSequence label = pm.getApplicationLabel(context.getApplicationInfo());
+            return label != null ? label.toString() : "Acode";
+        } catch (Exception ignored) {
+            return "Acode";
+        }
+    }
 }
diff --git a/src/plugins/terminal/src/android/TerminalService.java b/src/plugins/terminal/src/android/TerminalService.java
@@ -16,7 +16,6 @@
 import android.os.PowerManager;
 import android.os.RemoteException;
 import androidx.core.app.NotificationCompat;
-import com.foxdebug.acode.R;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -360,13 +359,15 @@ private void updateNotification() {
         String contentText = "Executor service" + (isWakeLockHeld ? " (wakelock held)" : "");
         String wakeLockButtonText = isWakeLockHeld ? "Release Wake Lock" : "Acquire Wake Lock";
 
+        int notificationIcon = resolveDrawableId("ic_notification", "ic_launcher_foreground", "ic_launcher");
+
         Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID)
                 .setContentTitle("Acode Service")
                 .setContentText(contentText)
-                .setSmallIcon(R.drawable.ic_launcher_foreground)
+                .setSmallIcon(notificationIcon)
                 .setOngoing(true)
-                .addAction(R.drawable.ic_launcher_foreground, wakeLockButtonText, wakeLockPendingIntent)
-                .addAction(R.drawable.ic_launcher_foreground, "Exit", exitPendingIntent)
+                .addAction(notificationIcon, wakeLockButtonText, wakeLockPendingIntent)
+                .addAction(notificationIcon, "Exit", exitPendingIntent)
                 .build();
 
         startForeground(1, notification);
@@ -390,4 +391,12 @@ public void onDestroy() {
         clientMessengers.clear();
         threadPool.shutdown();
     }
-}
+
+    private int resolveDrawableId(String... names) {
+        for (String name : names) {
+            int id = getResources().getIdentifier(name, "drawable", getPackageName());
+            if (id != 0) return id;
+        }
+        return android.R.drawable.sym_def_app_icon;
+    }
+}
diff --git a/utils/config.js b/utils/config.js
@@ -85,7 +85,7 @@ const exec = promisify(require("node:child_process").exec);
 								`cordova plugin add cordova-plugin-consent@2.4.0 --save`,
 							);
 							await exec(
-								`cordova plugin add admob-plus-cordova@1.28.0 --save --variable APP_ID_ANDROID="${AD_APP_ID}" --variable PLAY_SERVICES_VERSION="21.5.0"`,
+								`cordova plugin add admob-plus-cordova@2.0.0-alpha.19 --save --variable APP_ID_ANDROID="${AD_APP_ID}" --variable PLAY_SERVICES_VERSION="23.2.0"`,
 							);
 							console.log("DONE! Installing admob-plus-cordova");
 						} else {
@@ -96,7 +96,7 @@ const exec = promisify(require("node:child_process").exec);
 						}
 
 						console.log(`|--- Reinstalling platform ---|`);
-						const { stderr } = await exec(`yarn clean`);
+						const { stderr } = await exec(`npm run clean`);
 						if (stderr) console.error(stderr);
 						else console.log("DONE! Reinstalling platform");
 					})(),
