Fix #134 (#136)

* Update MainActivity.java * Make use of IllegalStateException instead of a RuntimeException * Create Environment.kt * downgrade nb-javac-android * downgrade nb-javac-android * downgrade nb-javac android * fix typo
Cosmic-Ide · Jul 12, 2022 · 85691f3 · 85691f3
1 parent aebf67e
commit 85691f3
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 26 deletions.
diff --git a/android-compiler/build.gradle b/android-compiler/build.gradle
@@ -32,7 +32,7 @@ dependencies {
 	implementation 'com.android.tools:r8:3.3.28'
 	implementation project(path: ':google-java-format')
 	implementation project(path: ':eclipse-jdt')
-	implementation 'io.github.itsaky:nb-javac-android:17.0.0.2'
+	implementation 'io.github.itsaky:nb-javac-android:17.0.0.1'
 	implementation project(path: ':common')
 	implementation project(path: ':project-creator')
 	implementation project(':kotlinc')

diff --git a/app/src/main/java/com/pranav/java/ide/MainActivity.java b/app/src/main/java/com/pranav/java/ide/MainActivity.java
@@ -124,7 +124,7 @@ protected void onCreate(final Bundle savedInstanceState) {
         try {
             indexer = new Indexer(getProject().getProjectName(), getProject().getCacheDirPath());
             if (indexer.notHas("currentFile")) {
-                indexer.put("currentFile", getProject().getSrcDirPath() + "Main.java");
+                indexer.put("currentFile", getProject().getSrcDirPath() + "Main.kt");
                 indexer.flush();
             }
             currentWorkingFilePath = indexer.getString("currentFile");
@@ -139,15 +139,6 @@ protected void onCreate(final Bundle savedInstanceState) {
             } catch (IOException e) {
                 dialog("Cannot read file", getString(e), true);
             }
-        } else {
-            try {
-                FileUtil.writeFileFromString(
-                        getProject().getSrcDirPath() + 
-                        "Main.java", JavaTemplate.getClassTemplate(null, "Main", true));
-                editor.setText(JavaTemplate.getClassTemplate(null, "Main", true));
-            } catch (Exception e) {
-                dialog("Cannot create file", getString(e), true);
-            }
         }
 
         if (!new File(FileUtil.getClasspathDir(), "android.jar").exists()) {
@@ -186,7 +177,7 @@ protected void onCreate(final Bundle savedInstanceState) {
         findViewById(R.id.btn_smali).setOnClickListener(v -> smali());
 
         editor.getText().addContentListener(new ProblemMarker(editor, currentWorkingFilePath, getProject()));
-        var scrollView = (HorizontalScrollView) findViewById(R.id.scrollview);
+        HorizontalScrollView scrollView = findViewById(R.id.scrollview);
         UiUtilsKt.addSystemWindowInsetToPadding(scrollView, false, false, false, true);
     }
 
@@ -339,18 +330,18 @@ private TextMateColorScheme getColorScheme() {
 
     private IRawTheme getDarculaTheme() {
         try {
-            var rawTheme =
+            final var rawTheme =
                     ThemeReader.readThemeSync(
                             "darcula.json", getAssets().open("textmate/darcula.json"));
             return rawTheme;
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            throw new IllegalStateException(e);
         }
     }
 
     private TextMateLanguage getTextMateLanguageForJava() {
         try {
-            var language =
+            final var language =
                     TextMateLanguage.create(
                             "java.tmLanguage.json",
                             getAssets().open("textmate/java/syntaxes/java.tmLanguage.json"),
@@ -359,13 +350,13 @@ private TextMateLanguage getTextMateLanguageForJava() {
                             getDarculaTheme());
             return language;
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            throw new IllegalStateException(e);
         }
     }
 
     private TextMateLanguage getTextMateLanguageForSmali() {
         try {
-            var language =
+            final var language =
                     TextMateLanguage.create(
                             "smali.tmLanguage.json",
                             getAssets().open("textmate/smali/syntaxes/smali.tmLanguage.json"),
@@ -374,28 +365,28 @@ private TextMateLanguage getTextMateLanguageForSmali() {
                             getDarculaTheme());
             return language;
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            throw new IllegalStateException(e);
         }
     }
 
     public void smali() {
         try {
-            var classes = getClassesFromDex();
+            final var classes = getClassesFromDex();
             if (classes == null) return;
             listDialog(
                     "Select a class to extract source",
                     classes,
                     (d, pos) -> {
-                        var claz = classes[pos];
-                        var smaliFile =
+                        final var claz = classes[pos];
+                        final var smaliFile =
                                 new File(
                                         getProject().getBinDirPath(),
                                         "smali" + "/" + claz.replace(".", "/") + ".smali");
                         try {
-                            var opcodes = Opcodes.forApi(32);
-                            var options = new BaksmaliOptions();
+                            final var opcodes = Opcodes.forApi(32);
+                            final var options = new BaksmaliOptions();
 
-                            var dexFile =
+                            final var dexFile =
                                     DexFileFactory.loadDexFile(
                                             new File(getProject().getBinDirPath(), "classes.dex"), opcodes);
                             options.apiLevel = 26;

diff --git a/code-analyzer/build.gradle b/code-analyzer/build.gradle
@@ -23,7 +23,7 @@ android {
 }
 
 dependencies {
-    implementation 'io.github.itsaky:nb-javac-android:17.0.0.2'
+    implementation 'io.github.itsaky:nb-javac-android:17.0.0.1'
     implementation project(path: ':common')
     implementation project(path: ':sora-editor')
     implementation project(path: ':project-creator')

diff --git a/common/src/main/java/com/pranav/common/util/Environment.kt b/common/src/main/java/com/pranav/common/util/Environment.kt
@@ -0,0 +1,16 @@
+package com.itsaky.androidide.utils
+
+import java.io.File
+
+/*
+ * Required by nb-javac-android
+ */
+ object Environment {
+    @JvmStatic
+    lateinit var COMPILER_MODULE: File
+
+    @JvmStatic
+    fun init(module: File) {
+        COMPILER_MODULE = module
+    }
+}
diff --git a/google-java-format/build.gradle b/google-java-format/build.gradle
@@ -12,5 +12,5 @@ dependencies {
     compileOnly 'com.google.guava:guava:31.1-jre'
     implementation 'com.google.auto.value:auto-value-annotations:1.9'
     annotationProcessor 'com.google.auto.value:auto-value:1.9'
-    implementation 'io.github.itsaky:nb-javac-android:17.0.0.2'
+    implementation 'io.github.itsaky:nb-javac-android:17.0.0.1'
 }