From b69fa9d40116d151b8fa68d834d14406f6427304 Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Wed, 25 Aug 2021 21:07:19 +0530
Subject: [PATCH] Fixed some minor bugs - Backup before implementing terminal -
 Fixed shebang issue in Gradle executable - Clean all binary files in JDK
 (earlier it only cleaned binaries in bin directory) - If the CodeEditor is
 not editable, do not show cut and paste options in text action mode - Some
 more changes

---
 .../itsaky/androidide/DownloadActivity.java   |   4 +-
 .../com/itsaky/androidide/MainActivity.java   |   1 +
 .../com/itsaky/androidide/app/StudioApp.java  |   8 ++-
 .../preferences/BuildPreferences.java         |  17 +++---
 .../fragments/sheets/TextSheetFragment.java   |   2 +-
 .../androidide/managers/ToolsManager.java     |   2 +-
 .../itsaky/androidide/shell/ShellServer.java  |  27 +++++----
 .../itsaky/androidide/utils/Environment.java  |   4 +-
 .../com/itsaky/androidide/views/Editor.java   |   6 +-
 .../rosemoe/editor/widget/CodeEditor.java     |   2 +-
 .../widget/EditorTextActionModeStarter.java   |  16 ++++--
 .../jniLibs/arm64-v8a/libiiec-androidterm5.so | Bin 0 -> 9680 bytes
 .../jniLibs/arm64-v8a/libiiec-termexec2.so    | Bin 0 -> 9608 bytes
 app/src/main/res/drawable/ic_terminal.xml     |  11 ++++
 app/src/main/res/drawable/ic_update.xml       |  11 ++++
 .../main/res/layout/layout_install_tools.xml  |  53 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |  12 +++-
 17 files changed, 135 insertions(+), 41 deletions(-)
 create mode 100644 app/src/main/jniLibs/arm64-v8a/libiiec-androidterm5.so
 create mode 100644 app/src/main/jniLibs/arm64-v8a/libiiec-termexec2.so
 create mode 100644 app/src/main/res/drawable/ic_terminal.xml
 create mode 100644 app/src/main/res/drawable/ic_update.xml
 create mode 100644 app/src/main/res/layout/layout_install_tools.xml

diff --git a/app/src/main/java/com/itsaky/androidide/DownloadActivity.java b/app/src/main/java/com/itsaky/androidide/DownloadActivity.java
index 5bc505539..82828f9e2 100644
--- a/app/src/main/java/com/itsaky/androidide/DownloadActivity.java
+++ b/app/src/main/java/com/itsaky/androidide/DownloadActivity.java
@@ -102,7 +102,7 @@ public class DownloadActivity extends StudioActivity {
 				}
 			}
 		sb.append("rm -rf '" + getApp().getToolsDownloadDirectory().getAbsolutePath() + "' && ");
-        sb.append("echo 'Cleaning unsupported flags in binaries...' && $BUSYBOX find $JAVA_HOME/bin -type f -exec androidide-cleaner {} \\; && ");
+        sb.append("echo 'Cleaning unsupported flags in binaries...' && $BUSYBOX find $JAVA_HOME -type f -exec androidide-cleaner {} \\; && ");
         sb.append("echo " + DONE);
 		server.bgAppend(sb.toString());
 	}
@@ -115,6 +115,8 @@ public class DownloadActivity extends StudioActivity {
 				if(line.contains(DONE)) {
 					getApp().getPrefManager().putBoolean(PreferenceManager.KEY_FRAMEWORK_INSTALLED, true);
 					showRestartNeeded();
+                    if(getProgressSheet().isShowing())
+                        getProgressSheet().dismiss();
 				}
 			});
 		}
diff --git a/app/src/main/java/com/itsaky/androidide/MainActivity.java b/app/src/main/java/com/itsaky/androidide/MainActivity.java
index f2ae98f3d..dd60d28e3 100644
--- a/app/src/main/java/com/itsaky/androidide/MainActivity.java
+++ b/app/src/main/java/com/itsaky/androidide/MainActivity.java
@@ -232,6 +232,7 @@ public class MainActivity extends StudioActivity implements View.OnClickListener
 
     private void createProgressSheet() {
         mProgressSheet = new ProgressSheet();
+        mProgressSheet.setShowShadow(false);
     }
 
     private void setMessage(int msg) {
diff --git a/app/src/main/java/com/itsaky/androidide/app/StudioApp.java b/app/src/main/java/com/itsaky/androidide/app/StudioApp.java
index d665270a5..8a069cff3 100644
--- a/app/src/main/java/com/itsaky/androidide/app/StudioApp.java
+++ b/app/src/main/java/com/itsaky/androidide/app/StudioApp.java
@@ -39,6 +39,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import com.blankj.utilcode.util.FileUtils;
 
 public class StudioApp extends MultiDexApplication
 {
@@ -364,8 +365,11 @@ public class StudioApp extends MultiDexApplication
 		File gradle = new File(Environment.GRADLE_DIR, "bin/gradle");
 		if(gradle.exists()) {
 			String[] txt = FileUtil.readFile(gradle.getAbsolutePath()).split("\n");
-			if(txt != null && txt.length > 1 && txt[0].contains("#!/usr/bin/env sh")) {
-				txt[0] = "";
+			if(txt != null && txt.length > 1) {
+                String line1 = txt[0];
+                if(line1.startsWith("#!")) {
+                    txt[0] = "";
+                }
 				FileUtil.writeFile(gradle.getAbsolutePath(), TextUtils.join("\n", txt));
 				if(!gradle.canExecute())
 					gradle.setExecutable(true);
diff --git a/app/src/main/java/com/itsaky/androidide/fragments/preferences/BuildPreferences.java b/app/src/main/java/com/itsaky/androidide/fragments/preferences/BuildPreferences.java
index eca3dcba5..17407a62e 100644
--- a/app/src/main/java/com/itsaky/androidide/fragments/preferences/BuildPreferences.java
+++ b/app/src/main/java/com/itsaky/androidide/fragments/preferences/BuildPreferences.java
@@ -1,26 +1,25 @@
 package com.itsaky.androidide.fragments.preferences;
 
-import android.content.DialogInterface;
 import android.os.Bundle;
-import android.view.LayoutInflater;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 import com.blankj.utilcode.util.FileUtils;
-import com.blankj.utilcode.util.ZipUtils;
+import com.blankj.utilcode.util.ThreadUtils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.itsaky.androidide.R;
 import com.itsaky.androidide.app.StudioApp;
-import com.itsaky.androidide.databinding.LayoutDialogTextInputBinding;
+import com.itsaky.androidide.databinding.LayoutInstallToolsBinding;
 import com.itsaky.androidide.fragments.sheets.ProgressSheet;
+import com.itsaky.androidide.fragments.sheets.TextSheetFragment;
+import com.itsaky.androidide.shell.ShellServer;
 import com.itsaky.androidide.tasks.TaskExecutor;
 import com.itsaky.androidide.utils.Environment;
 import com.itsaky.toaster.Toaster;
 import java.io.File;
-import java.util.List;
-import java.util.Set;
 
 import static com.itsaky.androidide.managers.PreferenceManager.*;
+import com.itsaky.androidide.utils.Logger;
 
 public class BuildPreferences extends BasePreferenceFragment implements Preference.OnPreferenceClickListener {
 	
@@ -53,7 +52,7 @@ public class BuildPreferences extends BasePreferenceFragment implements Preferen
 		categoryGradle.setTitle(R.string.gradle);
 		categoryGradle.addPreference(customCommands);
 		categoryGradle.addPreference(clearCache);
-		
+        
 		setPreferenceScreen(screen);
         
 		customCommands.setOnPreferenceClickListener(this);
@@ -70,7 +69,7 @@ public class BuildPreferences extends BasePreferenceFragment implements Preferen
 		}
 		return true;
 	}
-
+    
 	private void showGradleCommandsDialog() {
 		final String[] labels = {
 			"--stacktrace",
@@ -125,7 +124,7 @@ public class BuildPreferences extends BasePreferenceFragment implements Preferen
 	}
 	
 	private Object deleteCaches() {
-		File file = new File(Environment.HOME, ".gradle/caches");
+		File file = new File(Environment.GRADLE_USER_HOME, "caches");
 		if(file.exists()) {
 			FileUtils.delete(file);
 		}
diff --git a/app/src/main/java/com/itsaky/androidide/fragments/sheets/TextSheetFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/sheets/TextSheetFragment.java
index 67694f66d..00fe79c09 100644
--- a/app/src/main/java/com/itsaky/androidide/fragments/sheets/TextSheetFragment.java
+++ b/app/src/main/java/com/itsaky/androidide/fragments/sheets/TextSheetFragment.java
@@ -45,7 +45,7 @@ public class TextSheetFragment extends BaseBottomSheetFragment {
 	protected void onShow() {
 		super.onShow();
 		editor.setText(getOutputBuilder());
-	}
+    }
 
 	private Void scrollToBottom() {
 		if(getActivity() != null)
diff --git a/app/src/main/java/com/itsaky/androidide/managers/ToolsManager.java b/app/src/main/java/com/itsaky/androidide/managers/ToolsManager.java
index 392eb051a..3365083f0 100644
--- a/app/src/main/java/com/itsaky/androidide/managers/ToolsManager.java
+++ b/app/src/main/java/com/itsaky/androidide/managers/ToolsManager.java
@@ -39,7 +39,7 @@ public class ToolsManager {
         if(onFinish != null)
             onFinish.run();
     }
-
+    
     private static void writeInitScript(StudioApp app) {
         FileIOUtils.writeFileFromString(Environment.INIT_SCRIPT, INIT_SCRIPT);
     }
diff --git a/app/src/main/java/com/itsaky/androidide/shell/ShellServer.java b/app/src/main/java/com/itsaky/androidide/shell/ShellServer.java
index f5cb9e0a8..28ad94e06 100644
--- a/app/src/main/java/com/itsaky/androidide/shell/ShellServer.java
+++ b/app/src/main/java/com/itsaky/androidide/shell/ShellServer.java
@@ -38,34 +38,33 @@ public class ShellServer extends Thread {
             stringBuilder.append("\nexport ANDROID_HOME=" + Environment.path(Environment.ANDROID_HOME));
             stringBuilder.append("\nexport GRADLE_INSTALLATION_DIR=" + Environment.path(Environment.GRADLE_DIR));
             stringBuilder.append("\nexport GRADLE_USER_HOME=" + Environment.path(Environment.GRADLE_USER_HOME));
+            stringBuilder.append("\nexport JLS_HOME=" + Environment.path(Environment.JLS_HOME));
             stringBuilder.append("\nexport PATH=$PATH:$HOME/bin");
             stringBuilder.append("\nexport PATH=$PATH:" + Environment.path(Environment.JAVA_HOME) + "/bin");
             stringBuilder.append("\nexport PATH=$PATH:" + Environment.path(Environment.GRADLE_DIR) + "/bin");
             stringBuilder.append("\nexport PATH=$PATH:" + Environment.path(Environment.ANDROID_HOME) + "/cmdline-tools/latest/bin");
             stringBuilder.append("\nexport PATH=$PATH:" + Environment.path(Environment.ANDROID_HOME) + "/cmake/bin");
             stringBuilder.append("\nexport PATH=$PATH:" + Environment.path(Environment.BINDIR));
-            stringBuilder.append("\nexport JLS_HOME=" + Environment.path(Environment.JLS_HOME));
             
-            // Provide paths to .so files needed to execute JDK
-            final String lib = Environment.LIBDIR.getAbsolutePath();
-            stringBuilder.append("\nexport LD_LIBRARY_PATH=" + lib);
-            stringBuilder.append(System.getenv().containsKey("LD_LIBRARY_PATH") ? ":" + System.getenv().get("LD_LIBRARY_PATH") : "");
-            
-            if(android.os.Build.VERSION.SDK_INT >= 30) {
-                // Hook calls to malloc() in native binaries
-                // Required only in Android 11 and up
-                stringBuilder.append("\nexport LD_PRELOAD=" + Environment.LIBHOOKSO.getAbsolutePath());
-            }
+////            Provide paths to .so files needed to execute JDK
+//            final String lib = Environment.LIBDIR.getAbsolutePath();
+//            stringBuilder.append("\nexport LD_LIBRARY_PATH=" + lib);
+//            stringBuilder.append(System.getenv().containsKey("LD_LIBRARY_PATH") ? ":" + System.getenv().get("LD_LIBRARY_PATH") : "");
+//            
+//            if(android.os.Build.VERSION.SDK_INT >= 30) {
+//                // Hook calls to malloc() in native binaries
+//                // Required only in Android 11 and up
+//                stringBuilder.append("\nexport LD_PRELOAD=" + Environment.LIBHOOKSO.getAbsolutePath());
+//            }
             
             // Monotonic clock fix, needed for JDK
-            stringBuilder.append("\nln -sf /apex/com.android.runtime/lib64/bionic/libc.so " + lib + "/librt.so && " +
-                   "ln -sf /apex/com.android.runtime/lib64/bionic/libc.so " + lib + "/libpthread.so");
+            stringBuilder.append("\nln -sf /apex/com.android.runtime/lib64/bionic/libc.so $JAVA_HOME/lib/librt.so && ln -sf /apex/com.android.runtime/lib64/bionic/libc.so $JAVA_HOME/lib/libpthread.so");
              
             // Execute all commands...
             append(stringBuilder.toString(), false);
             
             // Make sure there are proper permissions set to the $HOME directory
-            append("chmod -R 777 $HOME", false);
+            append("chmod -R 777 $HOME > /dev/null 2>&1", false);
         } catch (Throwable th) {
             if (callback != null) {
                 String out = ThrowableUtils.getFullStackTrace(th).concat("\n");
diff --git a/app/src/main/java/com/itsaky/androidide/utils/Environment.java b/app/src/main/java/com/itsaky/androidide/utils/Environment.java
index 7b8d5aa48..150ebfb5f 100644
--- a/app/src/main/java/com/itsaky/androidide/utils/Environment.java
+++ b/app/src/main/java/com/itsaky/androidide/utils/Environment.java
@@ -27,7 +27,7 @@ public final class Environment {
 	public static File GRADLE_PLUGIN;
     public static File BOOTCLASSPATH;
 	public static File CACHES_DIR;
-	public static File AAPT2;
+	public static File AAPT2_DIR;
     
     public static File INIT_SCRIPT;
     public static File LIBHOOKSO;
@@ -79,7 +79,7 @@ public final class Environment {
         LIBHOOKSO = new File(LIBDIR, "libhook.so");
 		CACHES_DIR = new File(HOME, "ide-caches");
         BOOTCLASSPATH = new File("");
-		AAPT2 = new File(files21, "com.android.tools.build/aapt2/4.0.1-6197926");
+		AAPT2_DIR = new File(files21, "com.android.tools.build/aapt2");
 		GRADLE_PLUGIN = new File(files21, "com.itsaky.androidide/gradle");
 		GRADLE_USER_HOME = new File(HOME, ".gradle");
 		GRADLE_PROPS = new File(GRADLE_USER_HOME, "gradle.properties");
diff --git a/app/src/main/java/com/itsaky/androidide/views/Editor.java b/app/src/main/java/com/itsaky/androidide/views/Editor.java
index 062843ad2..4ed9bdef3 100644
--- a/app/src/main/java/com/itsaky/androidide/views/Editor.java
+++ b/app/src/main/java/com/itsaky/androidide/views/Editor.java
@@ -7,15 +7,15 @@ import io.github.rosemoe.editor.widget.CodeEditor;
 public class Editor extends CodeEditor {
     
     public Editor(Context context) {
-        super(context, null);
+        this(context, null);
     }
     
     public Editor(Context context, AttributeSet attrs) {
-        super(context, attrs, 0);
+        this(context, attrs, 0);
     }
     
     public Editor(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr, 0);
+        this(context, attrs, defStyleAttr, 0);
     }
     
     public Editor(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
diff --git a/app/src/main/java/io/github/rosemoe/editor/widget/CodeEditor.java b/app/src/main/java/io/github/rosemoe/editor/widget/CodeEditor.java
index d34eafe79..32a01341d 100644
--- a/app/src/main/java/io/github/rosemoe/editor/widget/CodeEditor.java
+++ b/app/src/main/java/io/github/rosemoe/editor/widget/CodeEditor.java
@@ -63,10 +63,10 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.itsaky.androidide.R;
 import com.itsaky.androidide.databinding.LayoutDialogTextInputBinding;
 import com.itsaky.androidide.interfaces.JLSRequestor;
+import com.itsaky.androidide.managers.VersionedFileManager;
 import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE;
 import com.itsaky.androidide.utils.Logger;
 import com.itsaky.androidide.utils.TypefaceUtils;
-import com.itsaky.androidide.utils.VersionedFileManager;
 import com.itsaky.lsp.Diagnostic;
 import com.itsaky.lsp.DiagnosticSeverity;
 import com.itsaky.lsp.DidChangeTextDocumentParams;
diff --git a/app/src/main/java/io/github/rosemoe/editor/widget/EditorTextActionModeStarter.java b/app/src/main/java/io/github/rosemoe/editor/widget/EditorTextActionModeStarter.java
index ad2937d49..a515b8835 100644
--- a/app/src/main/java/io/github/rosemoe/editor/widget/EditorTextActionModeStarter.java
+++ b/app/src/main/java/io/github/rosemoe/editor/widget/EditorTextActionModeStarter.java
@@ -65,17 +65,21 @@ class EditorTextActionModeStarter implements CodeEditor.EditorTextActionPresente
                     .setShowAsActionFlags(2)
                     .setIcon(array.getDrawable(0));
 
-                menu.add(0, 1, 0, mEditor.getContext().getString(android.R.string.cut))
-                    .setShowAsActionFlags(2)
-                    .setIcon(array.getDrawable(1));
+                if(mEditor.isEditable()) {
+                    menu.add(0, 1, 0, mEditor.getContext().getString(android.R.string.cut))
+                        .setShowAsActionFlags(2)
+                        .setIcon(array.getDrawable(1));
+                }
 
                 menu.add(0, 2, 0, mEditor.getContext().getString(android.R.string.copy))
                     .setShowAsActionFlags(2)
                     .setIcon(array.getDrawable(2));
                     
-                menu.add(0, 3, 0, mEditor.getContext().getString(android.R.string.paste))
-                    .setShowAsActionFlags(2)
-                    .setIcon(array.getDrawable(3));
+                if(mEditor.isEditable()) {
+                    menu.add(0, 3, 0, mEditor.getContext().getString(android.R.string.paste))
+                        .setShowAsActionFlags(2)
+                        .setIcon(array.getDrawable(3));
+                }
                 
                 menu.add(0, 4, 0, mEditor.getContext().getString(com.itsaky.androidide.R.string.menu_navigate_definition))
                     .setIcon(com.itsaky.androidide.R.drawable.ic_goto_definition);
diff --git a/app/src/main/jniLibs/arm64-v8a/libiiec-androidterm5.so b/app/src/main/jniLibs/arm64-v8a/libiiec-androidterm5.so
new file mode 100644
index 0000000000000000000000000000000000000000..f5f1b3c4b19aa93fcc3414be5a77e8cfba2640f1
GIT binary patch
literal 9680
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
E0aUY4z5oCK

literal 0
HcmV?d00001

diff --git a/app/src/main/jniLibs/arm64-v8a/libiiec-termexec2.so b/app/src/main/jniLibs/arm64-v8a/libiiec-termexec2.so
new file mode 100644
index 0000000000000000000000000000000000000000..9b5f6ada122e43126d0bdbd3000198c78e0e2f9a
GIT binary patch
literal 9608
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
H)D!qGuT`6Z

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/ic_terminal.xml b/app/src/main/res/drawable/ic_terminal.xml
new file mode 100644
index 000000000..21e97a288
--- /dev/null
+++ b/app/src/main/res/drawable/ic_terminal.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M21.83,4C22.32,4 22.63,4.4 22.5,4.89L19.34,19.11C19.23,19.6 18.75,20 18.26,20H2.17C1.68,20 1.37,19.6 1.5,19.11L4.66,4.89C4.77,4.4 5.25,4 5.74,4H21.83M15.83,16H11.83C11.37,16 11,16.38 11,16.84C11,17.31 11.37,17.69 11.83,17.69H15.83C16.3,17.69 16.68,17.31 16.68,16.84C16.68,16.38 16.3,16 15.83,16M5.78,16.28C5.38,16.56 5.29,17.11 5.57,17.5C5.85,17.92 6.41,18 6.81,17.73C14.16,12.56 14.21,12.5 14.26,12.47C14.44,12.31 14.53,12.09 14.54,11.87C14.55,11.67 14.5,11.5 14.38,11.31L9.46,6.03C9.13,5.67 8.57,5.65 8.21,6C7.85,6.32 7.83,6.88 8.16,7.24L12.31,11.68L5.78,16.28Z"/>
+
+</vector>
diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml
new file mode 100644
index 000000000..c76fb1c58
--- /dev/null
+++ b/app/src/main/res/drawable/ic_update.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M21,10.12H14.22L16.96,7.3C14.23,4.6 9.81,4.5 7.08,7.2C4.35,9.91 4.35,14.28 7.08,17C9.81,19.7 14.23,19.7 16.96,17C18.32,15.65 19,14.08 19,12.1H21C21,14.08 20.12,16.65 18.36,18.39C14.85,21.87 9.15,21.87 5.64,18.39C2.14,14.92 2.11,9.28 5.62,5.81C9.13,2.34 14.76,2.34 18.27,5.81L21,3V10.12M12.5,8V12.25L16,14.33L15.28,15.54L11,13V8H12.5Z"/>
+
+</vector>
diff --git a/app/src/main/res/layout/layout_install_tools.xml b/app/src/main/res/layout/layout_install_tools.xml
new file mode 100644
index 000000000..9e4c8e745
--- /dev/null
+++ b/app/src/main/res/layout/layout_install_tools.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:paddingTop="12dp"
+	android:paddingBottom="12dp"
+	android:paddingStart="16dp"
+	android:paddingEnd="16dp">
+
+	<com.google.android.material.textfield.TextInputLayout
+		android:layout_height="wrap_content"
+		android:layout_width="match_parent"
+		android:id="@+id/path"
+		android:layout_marginBottom="8dp"
+        android:hint="@string/msg_path_to_tools"
+		app:startIconDrawable="@drawable/ic_file_rename"
+		app:startIconTint="@color/primaryIconColor"
+		app:counterEnabled="true"
+		app:counterMaxLength="40">
+
+		<com.google.android.material.textfield.TextInputEditText
+			android:layout_height="wrap_content"
+			android:layout_width="match_parent"
+			android:singleLine="true"/>
+
+	</com.google.android.material.textfield.TextInputLayout>
+
+	<CheckBox
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="@string/msg_delete_aapt2"
+		android:id="@+id/delete_aapt"
+		android:layout_marginBottom="8dp"/>
+    
+    <CheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/msg_delete_jdk"
+        android:id="@+id/delete_jdk"
+		android:layout_marginBottom="8dp"/>
+    
+    <CheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/msg_delete_gradle"
+        android:id="@+id/delete_gradle"
+		android:layout_marginBottom="8dp"/>
+
+</LinearLayout>
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0a74024df..afaab63f9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,12 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="msg_shell_verbose">Verbose output is enabled!</string>
+    <string name="msg_shell_output">Shell output</string>
+    <string name="msg_invalid_path">Invalid path!</string>
+    <string name="msg_path_to_tools">Path to .tar.xz or .zip</string>
+    <string name="str_build_tools">Build Tools</string>
+    <string name="msg_delete_aapt2">Delete AAPT2</string>
+    <string name="msg_delete_jdk">Delete JDK</string>
+    <string name="msg_delete_gradle">Delete Gradle</string>
     <string name="group_project">Project</string>
     <string name="title_close_project">Close this project</string>
     <string name="msg_opened_project_does_not_exist">Last opened project doesn\'t exist!</string>
@@ -97,10 +105,12 @@
 	<string name="msg_custom_gradle">Please type/paste the path of .zip file which contains Gradle executables.</string>
 	<string name="msg_gradle_installed">Gradle Installed successfully!</string>
 	<string name="msg_editor_font_size">Please choose default font size of editor :</string>
-	<string name="msg_clear_cache">This will delete caches directory created by Gradle. If you delete it, the next build may take a bit longer than normal as Gradle will download required files again.\n\nAre you sure you want to delete caches?</string>
+	<string name="msg_clear_cache">This will delete caches directory created by Gradle. If you delete it, the next build may take a bit longer than normal as Gradle will download required files again.\nIMPORTANT: This will also delete AAPT2. You will need to reinstall it otherwise you\'ll end up with a build failure.\n\nAre you sure you want to delete caches?</string>
 	<string name="msg_install_gradle">Currently installed gradle version will be DELETE PEEMANENTLY!\n\nPlease enter full path of the zip file which contains Gradle distribution.</string>
 	<string name="reset">Reset</string>
 	<string name="title_change_text_size">Editor font size</string>
+    <string name="idepref_update_tools_title">Update/Install build tools</string>
+    <string name="idepref_update_tools_msg">Use this if you want to install or update build tools.</string>
     <string name="idepref_about_title">About AndroidIDE</string>
 	<string name="idepref_build_clearCache_title">Clear Gradle caches</string>
 	<string name="idepref_build_clearCache_summary">Clear Gradle caches directory. This will delete all dependencies downloaded by Gradle. Required files will be downloaded again in next build.</string>