Feat: Fixed Android Build and made it more minimalistic. Added some warnings, Added new AUTO SETUP UI and more dependencies downloader

app/build.gradle.kts

@@ -18,8 +18,8 @@ android {
         targetSdk = 37
 
         // versioning
-        versionCode = 103
-        versionName = "4.0.4"
+        versionCode = 105
+        versionName = "4.0.6"
         vectorDrawables { useSupportLibrary = true }
     }
 

changelog-4.0.5.txt

@@ -0,0 +1,70 @@
+Xed-Editor PRO — Changelog
+Version 4.0.5 (versionCode 104)
+
+Android workflow + dependency manager overhaul.
+
+================================================================================
+0. Note on the recurring "utils: No such file or directory" log
+================================================================================
+That log is from a build BEFORE the 4.0.4 fix. The background run path (RunService) bypassed
+MkSession, so the helper scripts the run script sources weren't installed. 4.0.4 added
+`setupTerminalFiles()` to ProjectRunner.run()/sync(); this build keeps that fix. Once you build
+4.0.4/4.0.5, Run/Sync no longer fail with "utils not found".
+
+================================================================================
+1. Minimal Android template (only MainActivity.kt)
+================================================================================
+- core/main/.../projects/ProjectScaffolder.kt — the Android (Compose) template now generates a
+  single Kotlin file, MainActivity.kt, which is self-contained (uses MaterialTheme directly). The
+  ui/theme/{Color,Theme,Type}.kt package and the ExampleUnitTest/ExampleInstrumentedTest files were
+  removed, so a new empty project has exactly one .kt file like you expected.
+
+================================================================================
+2. Android Run/Sync behave like Android Studio
+================================================================================
+- core/main/.../runner/ProjectRunner.kt — Android projects must have a successful Gradle **Sync**
+  once per session before Run will build. If you press Run first, you get a clear, detailed warning
+  explaining to Sync first (and to install the SDK/NDK from Dependencies if Sync fails). A
+  successful Sync (or build) marks the project synced for the session and unblocks Run.
+- core/main/.../runner/RunService.kt — marks the project synced on a successful gradle run, and
+  still installs the APK on a successful build.
+- Gradle prints BUILD SUCCESSFUL / BUILD FAILED, which now shows clearly in the build output and
+  the collapsed bar's status line.
+
+================================================================================
+3. Build output reads as proper log lines
+================================================================================
+- core/main/.../runner/RunOutputView.kt — the expanded output no longer soft-wraps; it scrolls
+  horizontally so each log line stays on one line (no more words spread across lines). Compact
+  monospace styling kept. The latest line in the collapsed bar slides up like a streaming log, and
+  the expand/collapse uses a smooth spring.
+
+================================================================================
+4. Dependencies dialog overhaul (Android)
+================================================================================
+- core/main/.../projects/DependenciesDialog.kt —
+  * Fuller Android SDK install: cmdline-tools + platform-tools + platforms android-35 & android-34
+    + build-tools 35 & 34.
+  * New **Android NDK** entry with a **version dropdown** (27/26/25/23 lines) — pick/switch the NDK
+    version and it installs `ndk;<version>` via sdkmanager.
+  * New **CMake** entry (cmake;3.22.1) for native builds.
+  * Real-time, single-line output of the running install, an overall progress bar, and clear
+    per-item Installed / Failed status.
+- core/main/.../projects/DependencyInstallService.kt — installs now stream output line-by-line
+  (via ubuntuProcess) into the dialog instead of buffering, and report overall progress. (No longer
+  uses the buffered ShellUtils.runUbuntu for installs.)
+
+================================================================================
+5. Version
+================================================================================
+- app/build.gradle.kts — versionName 4.0.4 -> 4.0.5, versionCode 103 -> 104.
+
+================================================================================
+Android end-to-end flow now
+================================================================================
+1. Create/open an Android project.
+2. Dependencies dialog → install Android SDK, NDK (pick version), CMake, a JDK.
+3. Tap Sync (next to Run) → wait for BUILD SUCCESSFUL.
+4. Tap Run → builds assembleDebug and installs the APK (system prompt).
+
+Local build wasn't possible in the dev environment; verification is via GitHub Actions CI.

changelog-4.0.6.txt

@@ -0,0 +1,59 @@
+Xed-Editor PRO — Changelog
+Version 4.0.6 (versionCode 105)
+
+The real Android build fix + dependency/version flexibility + UX.
+
+================================================================================
+1. FIX: Android template now builds on first try (illegal Kotlin escape)
+================================================================================
+The actual Gradle failure ("Illegal escape: '\.'" in settings.gradle.kts) was caused by the
+template emitting `includeGroupByRegex("com\.android.*")` — `\.` is an illegal escape in Kotlin
+DSL. Fixed to `com\\.android.*` / `com\\.google.*` (valid escaped dot), matching Android Studio.
+- core/main/.../projects/ProjectScaffolder.kt. Scanned the rest of the template; no other illegal
+  Kotlin escapes (the gradle-wrapper.properties `https\://` is correct for a .properties file).
+
+================================================================================
+2. NDK / SDK versions are no longer hard-locked (always resolve latest)
+================================================================================
+- core/main/.../projects/DependenciesDialog.kt —
+  * Android SDK install now resolves and installs the **latest** platform + build-tools live from
+    sdkmanager (in addition to android-34/build-tools 34 for the template), so it won't go stale.
+  * NDK dropdown now includes a **"Latest"** option (default) that resolves the newest NDK at
+    install time, plus pinned versions if you want a specific one.
+  * CMake install resolves the latest available version too.
+
+================================================================================
+3. Build output: scroll lock (auto-scroll) toggle
+================================================================================
+- core/main/.../runner/RunOutputState.kt + RunOutputView.kt — the expanded output auto-scrolls to
+  the newest line as it streams; a toggle button in the output footer turns auto-scroll on/off
+  (highlighted when on). Output stays horizontally scrollable (one line per line).
+
+================================================================================
+4. Open-directory warning
+================================================================================
+- core/main/.../drawer/OpenDirectoryWarningDialog.kt (new) — before the system folder picker, a
+  caution explains that Android 11+ manually-opened directories hit terminal permission errors and
+  that such issues aren't supported. The OK button is **locked for 30 s with a live countdown**;
+  there's a Cancel button and a **"Never show this again"** toggle (Settings.open_dir_warning_dismissed).
+- Wired through AddProjectSheet (onOpenDirectory) → Drawer.
+
+================================================================================
+5. Auto Setup: full-screen UI + full toolchain, for everyone
+================================================================================
+- core/main/.../activities/main/AutoSetupDialog.kt — the consent is now a **full-screen** screen
+  (fullscreen Dialog + Surface) instead of a small dialog: big title, message, live storage/data/
+  time estimate, and Agree / Not now actions.
+- core/main/.../terminal/AutoSetupOverlay.kt — the progress screen is now opaque/full-screen, so
+  the terminal runs silently behind it while you watch live progress.
+- core/main/.../assets/terminal/auto_setup.sh — now installs the full toolchain: apt update/upgrade,
+  curl/git/wget/tar/unzip/zip/nano, build-essential + pkg-config, python3 + pip + venv,
+  Node.js + npm, and OpenJDK 17 — with verification of each. Errors still route to a prefilled
+  GitHub issue.
+
+================================================================================
+6. Version
+================================================================================
+- app/build.gradle.kts — versionName 4.0.5 -> 4.0.6, versionCode 104 -> 105.
+
+Local build wasn't possible in the dev environment; verification is via GitHub Actions CI.

core/main/src/main/assets/terminal/auto_setup.sh

@@ -27,21 +27,33 @@ command -v apt-get >/dev/null 2>&1 || APT="apt"
 emit_progress 3 "Preparing setup"
 echo "Starting Xed-Editor auto setup..."
 
-emit_progress 10 "Updating package lists"
+emit_progress 8 "Updating package lists"
 $APT update -y 2>&1 || fail "Failed to update package lists (apt update)."
 
-emit_progress 45 "Upgrading installed packages"
+emit_progress 22 "Upgrading installed packages"
 $APT upgrade -y 2>&1 || fail "Failed to upgrade packages (apt upgrade)."
 
-emit_progress 75 "Installing core tools (curl, git, wget)"
-$APT install -y curl git wget tar unzip nano ca-certificates 2>&1 || fail "Failed to install core tools."
+emit_progress 38 "Installing core tools (curl, git, wget)"
+$APT install -y curl git wget tar unzip zip nano ca-certificates 2>&1 || fail "Failed to install core tools."
 
-emit_progress 92 "Verifying tools"
-for tool in curl git wget; do
+emit_progress 52 "Installing build tools (compiler, make)"
+$APT install -y build-essential pkg-config 2>&1 || fail "Failed to install build tools (build-essential)."
+
+emit_progress 66 "Installing Python (python3, pip, venv)"
+$APT install -y python3 python3-pip python3-venv 2>&1 || fail "Failed to install Python."
+
+emit_progress 80 "Installing Node.js & npm"
+$APT install -y nodejs npm 2>&1 || fail "Failed to install Node.js/npm."
+
+emit_progress 90 "Installing JDK (OpenJDK 17)"
+$APT install -y openjdk-17-jdk 2>&1 || fail "Failed to install OpenJDK 17."
+
+emit_progress 95 "Verifying tools"
+for tool in curl git wget python3 node npm javac; do
   command -v "$tool" >/dev/null 2>&1 || fail "Tool '$tool' is missing after installation."
 done
 
-emit_progress 96 "Cleaning up"
+emit_progress 98 "Cleaning up"
 $APT clean 2>&1 || true
 
 emit_progress 100 "Setup finished"

core/main/src/main/java/com/rk/activities/main/AutoSetupDialog.kt

@@ -5,14 +5,21 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeContentPadding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
@@ -26,17 +33,19 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
 import com.rk.resources.strings
 import com.rk.terminal.AutoSetup
 import com.rk.terminal.SetupEstimate
 
 /**
- * First-launch consent dialog for Auto Setup.
+ * First-launch Auto Setup consent — a full-screen screen (not a small dialog).
  *
- * Shows an estimate of the storage/download required and (after a quick internet speed probe) an
- * estimated time. The user can agree ([onLaunch] starts the setup terminal) or skip — skipping
- * first shows a warning that the IDE may break later with no support for manual fixes, and on
- * confirmation calls [onDismissForever].
+ * Shows the storage/download estimate and (after a quick internet speed probe) an estimated time.
+ * The user can agree ([onLaunch] starts the background setup) or skip — skipping first warns that
+ * the IDE may break later with no support for manual fixes, and on confirmation calls
+ * [onDismissForever].
  */
 @Composable
 fun AutoSetupDialog(onLaunch: () -> Unit, onDismissForever: () -> Unit) {
@@ -71,49 +80,73 @@ fun AutoSetupDialog(onLaunch: () -> Unit, onDismissForever: () -> Unit) {
         return
     }
 
-    AlertDialog(
+    Dialog(
         onDismissRequest = {},
-        title = { Text(stringResource(strings.auto_setup_title)) },
-        text = {
-            Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
-                Text(stringResource(strings.auto_setup_message), style = MaterialTheme.typography.bodyMedium)
-                Spacer(modifier = Modifier.height(4.dp))
-                val est = estimate
-                if (est == null) {
-                    Row(verticalAlignment = Alignment.CenterVertically) {
-                        CircularProgressIndicator(modifier = Modifier.size(18.dp), strokeWidth = 2.dp)
-                        Spacer(modifier = Modifier.width(10.dp))
-                        Text(
-                            stringResource(strings.auto_setup_checking_speed),
-                            style = MaterialTheme.typography.bodyMedium,
+        properties =
+            DialogProperties(
+                usePlatformDefaultWidth = false,
+                dismissOnBackPress = false,
+                dismissOnClickOutside = false,
+            ),
+    ) {
+        Surface(modifier = Modifier.fillMaxSize()) {
+            Column(modifier = Modifier.fillMaxSize().safeContentPadding().padding(24.dp)) {
+                Column(
+                    modifier = Modifier.weight(1f).fillMaxWidth().verticalScroll(rememberScrollState()),
+                    verticalArrangement = Arrangement.spacedBy(16.dp),
+                ) {
+                    Text(
+                        text = stringResource(strings.auto_setup_title),
+                        style = MaterialTheme.typography.headlineMedium,
+                        fontWeight = FontWeight.Bold,
+                    )
+                    Text(
+                        text = stringResource(strings.auto_setup_message),
+                        style = MaterialTheme.typography.bodyLarge,
+                    )
+                    Spacer(modifier = Modifier.height(4.dp))
+                    val est = estimate
+                    if (est == null) {
+                        Row(verticalAlignment = Alignment.CenterVertically) {
+                            CircularProgressIndicator(modifier = Modifier.size(18.dp), strokeWidth = 2.dp)
+                            Spacer(modifier = Modifier.width(10.dp))
+                            Text(
+                                stringResource(strings.auto_setup_checking_speed),
+                                style = MaterialTheme.typography.bodyMedium,
+                            )
+                        }
+                    } else {
+                        InfoRow(stringResource(strings.auto_setup_storage), est.storageText)
+                        InfoRow(stringResource(strings.auto_setup_data), est.dataText)
+                        InfoRow(
+                            stringResource(strings.auto_setup_eta),
+                            est.etaText ?: stringResource(strings.auto_setup_eta_unknown),
                         )
                     }
-                } else {
-                    InfoRow(stringResource(strings.auto_setup_storage), est.storageText)
-                    InfoRow(stringResource(strings.auto_setup_data), est.dataText)
-                    InfoRow(
-                        stringResource(strings.auto_setup_eta),
-                        est.etaText ?: stringResource(strings.auto_setup_eta_unknown),
-                    )
                 }
-            }
-        },
-        confirmButton = {
-            Button(
-                onClick = {
-                    activity?.let { AutoSetup.launch(it) }
-                    onLaunch()
+
+                Spacer(modifier = Modifier.height(16.dp))
+
+                Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) {
+                    OutlinedButton(
+                        modifier = Modifier.weight(1f),
+                        onClick = { showDeclineWarning = true },
+                    ) {
+                        Text(stringResource(strings.auto_setup_skip), maxLines = 1)
+                    }
+                    Button(
+                        modifier = Modifier.weight(1f),
+                        onClick = {
+                            activity?.let { AutoSetup.launch(it) }
+                            onLaunch()
+                        },
+                    ) {
+                        Text(stringResource(strings.auto_setup_start), maxLines = 1)
+                    }
                 }
-            ) {
-                Text(stringResource(strings.auto_setup_start))
             }
-        },
-        dismissButton = {
-            TextButton(onClick = { showDeclineWarning = true }) {
-                Text(stringResource(strings.auto_setup_skip))
-            }
-        },
-    )
+        }
+    }
 }
 
 @Composable

core/main/src/main/java/com/rk/drawer/AddProjectSheet.kt

@@ -37,6 +37,7 @@ fun AddProjectSheet(
     onDismiss: () -> Unit,
     onAddProject: (FileObject) -> Unit,
     openFolder: ManagedActivityResultLauncher<Uri?, Uri?>,
+    onOpenDirectory: () -> Unit,
     showPrivateFileWarning: (onOK: () -> Unit) -> Unit,
     showGitCloneDialog: () -> Unit,
     showCreateProject: () -> Unit,
@@ -64,7 +65,7 @@ fun AddProjectSheet(
                 title = stringResource(strings.open_directory),
                 description = stringResource(strings.open_dir_desc),
                 onClick = {
-                    openFolder.launch(null)
+                    onOpenDirectory()
                     onDismiss()
                 },
             )