ADFA-6016: Fix Layout Editor crash on release IDE builds (#98)

* Fix Layout Editor crash on release IDE builds

LayoutEditorFragment crashed at onCreate with
ClassCastException: LayoutEditorFragment cannot be cast to
androidx.activity.result.ActivityResultCaller.

The release IDE APK is R8-shrunk and nothing in it uses
ActivityResultCaller as a type, so R8 drops the interface and strips it
from Fragment's implements list. The plugin bundles androidx.activity,
and the plugin DexClassLoader is parent-first: Fragment resolves to the
host's class while ActivityResultCaller falls through to the plugin's
own bundled copy. The two are unrelated types, so passing the fragment
into FileCreator/FilePicker (both declared ActivityResultCaller) failed
the cast. Unminified debug IDE builds keep the interface, which is why
this only showed up on release.

Take Fragment instead and call registerForActivityResult on it, matching
APK-Analyzer, Markdown-Previewer and Sketch-to-UI. ActivityResultContract,
ActivityResultCallback and ActivityResultLauncher all survive in the
release host, so the launchers still cross the boundary correctly. The
unused AppCompatActivity constructor of FilePicker goes with it.

Verified on an emulator running the release IDE (C-r-0911-2020): plugin
installs, Layout Editor renders activity_main.xml, and Resources Manager
(three FilePicker instances) opens without a crash.

* Stop Layout Editor calling Apache Commons methods the host shrank away

Same root cause as the ActivityResultCaller fix: the plugin DexClassLoader
is parent-first, so any class the R8-shrunk release IDE also ships resolves
to the host's copy. commons-text and commons-io are both in the host, but
only the slice the IDE itself uses survived R8:

  StringEscapeUtils  keeps the ESCAPE_* fields and unescapeJava; every
                     escapeXxx(String) method is gone, escapeXml11 included
  FileUtils          keeps listFiles(File, IOFileFilter, IOFileFilter) and
                     listFiles(File, FileFilter); the (File, String[], boolean)
                     overload the plugin calls is gone

escapeXml11 is the NoSuchMethodError reported from XmlLayoutGenerator; the
listFiles one had not been hit yet but crashes Resources Manager the moment a
project has a drawable folder.

Neither needs a library. TextUtils.htmlEncode escapes the same characters an
XML attribute or element body needs and is a framework API, so no amount of
host shrinking can remove it. File.listFiles with a filter is what the same
file already does a few lines down in buildDpiVersionMap. With those two gone
nothing else in the plugin uses Apache Commons, so both dependencies go too
(9.2 MB -> 8.7 MB).

StringResourceAdapter used lang3's deprecated StringEscapeUtils, which happens
to work today only because the host dropped that class entirely and the
plugin's bundled copy loads instead. Same treatment, so it cannot regress when
the host's keep rules change.

Verified on an emulator running the release IDE (C-r-0911-2020): the layout
renders, navigating back to the editor no longer crashes, Export Layout runs
the generator end to end, and Resources Manager lists a drawable folder
(png/jpg/gif/xml, correctly skipping webp).

* ADFA-6016 | Fix the Compose Preview compiler toolchain against Kotlin 2.3.21

Two defects sat in front of the preview, each hidden by the one before it.
Both show up only on a release IDE, because that is where the plugin gets far
enough to start the compiler at all.

The Kotlin compiler runs as a JVM subprocess, and its bootstrap classpath
listed six artifacts with no kotlinx-coroutines. kotlin-compiler-embeddable
2.3.21 touches CoroutineScope while building its CoreApplicationEnvironment, so
the subprocess died with NoClassDefFoundError before compiling anything. The
jar is already in the IDE's bundled local Maven repo; it was simply never
referenced.

Past that, the compiler rejected the bundled Compose compiler plugin: the
compose-jars.zip asset carries 1.5.10, which demands Kotlin 1.9.22. Since
Kotlin 2.0 the Compose compiler ships with Kotlin, and the same bundled repo
holds kotlin-compose-compiler-plugin-embeddable 2.3.21, so resolve it there
and stay version-matched to whichever compiler the IDE ships rather than to a
zip frozen in June. getRuntimeJars keeps excluding the bundled jar by path so
the stale copy cannot leak onto the runtime classpath.

Verified on an emulator running a release IDE built from this branch's proguard
change: Compose Preview renders a @Preview composable on-device.

---------

Co-authored-by: Daniel Alome <astrocoder007@gmail.com>

Author: Daniel-ADFA

plugins/Jetpack-Compose-Preview/src/main/kotlin/org/appdevforall/composepreview/compiler/ComposeClasspathManager.kt

@@ -41,6 +41,8 @@ class ComposeClasspathManager(private val context: Context) {
         "kotlin-reflect" to "org/jetbrains/kotlin/kotlin-reflect",
         "kotlin-script-runtime" to "org/jetbrains/kotlin/kotlin-script-runtime",
         "trove4j" to "org/jetbrains/intellij/deps/trove4j",
+        "kotlinx-coroutines" to "org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm",
+        "compose-compiler-plugin" to "org/jetbrains/kotlin/kotlin-compose-compiler-plugin-embeddable",
         "annotations" to "org/jetbrains/annotations"
     )
 
@@ -160,7 +162,8 @@ class ComposeClasspathManager(private val context: Context) {
     }
 
     fun getCompilerPlugin(): File {
-        return File(composeDir, "compose-compiler-plugin.jar")
+        return findMavenJar("compose-compiler-plugin")
+            ?: error("kotlin-compose-compiler-plugin-embeddable not found in $localMavenRepo")
     }
 
     fun getKotlinStdlib(): File? {
@@ -174,16 +177,17 @@ class ComposeClasspathManager(private val context: Context) {
             findMavenJar("kotlin-reflect")?.let { add(it) }
             findMavenJar("kotlin-script-runtime")?.let { add(it) }
             findMavenJar("trove4j")?.let { add(it) }
+            findMavenJar("kotlinx-coroutines")?.let { add(it) }
             findMavenJar("annotations")?.let { add(it) }
         }
         return jars.filter { it.exists() }
             .joinToString(File.pathSeparator) { it.absolutePath }
     }
 
     fun getRuntimeJars(): List<File> {
-        val compilerPlugin = getCompilerPlugin()
+        val bundledPlugin = File(composeDir, "compose-compiler-plugin.jar")
         return composeDir.listFiles { file ->
-            file.extension == "jar" && file != compilerPlugin
+            file.extension == "jar" && file != bundledPlugin
         }?.toList() ?: emptyList()
     }
 

plugins/Layout-Editor/build.gradle.kts

@@ -89,8 +89,6 @@ dependencies {
     implementation(platform("io.github.Rosemoe.sora-editor:bom:0.23.6"))
     implementation("io.github.Rosemoe.sora-editor:editor")
     implementation("io.github.Rosemoe.sora-editor:language-textmate")
-    implementation("org.apache.commons:commons-text:1.11.0")
-    implementation("commons-io:commons-io:2.15.1")
     implementation("org.jetbrains.kotlin:kotlin-stdlib:2.3.0")
 }
 

plugins/Layout-Editor/src/main/java/org/appdevforall/codeonthego/layouteditor/adapters/StringResourceAdapter.kt

@@ -3,6 +3,7 @@ package org.appdevforall.codeonthego.layouteditor.adapters
 import org.appdevforall.codeonthego.layouteditor.pluginDialogContext
 import android.content.DialogInterface
 import android.text.Editable
+import android.text.TextUtils
 import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.MenuItem
@@ -14,7 +15,6 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.recyclerview.widget.RecyclerView
 import com.blankj.utilcode.util.ClipboardUtils
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.apache.commons.lang3.StringEscapeUtils
 import org.appdevforall.codeonthego.layouteditor.ProjectFile
 import org.appdevforall.codeonthego.layouteditor.R
 import org.appdevforall.codeonthego.layouteditor.adapters.models.ValuesItem
@@ -67,7 +67,7 @@ class StringResourceAdapter(
       sb.append("\t<string name=\"")
         .append(name)
         .append("\">")
-        .append(StringEscapeUtils.escapeXml11(value))
+        .append(TextUtils.htmlEncode(value))
         .append("</string>\n")
     }
     sb.append("</resources>")

plugins/Layout-Editor/src/main/java/org/appdevforall/codeonthego/layouteditor/fragments/resources/DrawableFragment.kt

@@ -27,7 +27,6 @@ import org.appdevforall.codeonthego.layouteditor.showPluginToast
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.apache.commons.io.FileUtils
 import org.appdevforall.codeonthego.layouteditor.ProjectFile
 import org.appdevforall.codeonthego.layouteditor.R
 import org.appdevforall.codeonthego.layouteditor.adapters.DPIsListAdapter
@@ -58,6 +57,7 @@ class DrawableFragment : Fragment() {
     private var adapter: DrawableResourceAdapter? = null
     var dpiAdapter: DPIsListAdapter? = null
     private var dpiList = mutableListOf("ldpi", "mdpi", "hdpi", "xhdpi", "xxhdpi", "xxxhdpi")
+    private val drawableExtensions = setOf("png", "jpg", "jpeg", "gif", "xml")
 
     private val logger = LoggerFactory.getLogger(DrawableFragment::class.java)
 
@@ -138,11 +138,9 @@ class DrawableFragment : Fragment() {
 
             val dpiVersionMap = buildDpiVersionMap(projectDir)
 
-            val drawableFiles = FileUtils.listFiles(
-                baseDrawableFolder,
-                arrayOf("png", "jpg", "jpeg", "gif", "xml"),
-                false
-            )
+            val drawableFiles = baseDrawableFolder.listFiles { file ->
+                file.isFile && file.extension in drawableExtensions
+            }.orEmpty()
 
             drawableFiles.mapNotNull { file ->
                 createDrawableFile(context, file, dpiVersionMap)

plugins/Layout-Editor/src/main/java/org/appdevforall/codeonthego/layouteditor/tools/XmlLayoutGenerator.java

@@ -1,5 +1,6 @@
 package org.appdevforall.codeonthego.layouteditor.tools;
 
+import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CalendarView;
@@ -11,7 +12,6 @@
 import com.google.android.material.navigation.NavigationView;
 import com.google.android.material.tabs.TabLayout;
 
-import org.apache.commons.text.StringEscapeUtils;
 import org.appdevforall.codeonthego.layouteditor.editor.DesignEditor;
 import org.appdevforall.codeonthego.layouteditor.editor.initializer.AttributeMap;
 
@@ -68,7 +68,7 @@ private void peek(View view, HashMap<View, AttributeMap> attributeMap, int depth
     List<String> keys =
             (attributeMap.get(view) != null) ? new ArrayList<>(Objects.requireNonNull(attributeMap.get(view)).keySet()) : new ArrayList<>();
     for (String key : keys) {
-      builder.append(TAB).append(indent).append(key).append("=\"").append(StringEscapeUtils.escapeXml11(Objects.requireNonNull(attributeMap.get(view)).getValue(key))).append("\"\n");
+      builder.append(TAB).append(indent).append(key).append("=\"").append(TextUtils.htmlEncode(Objects.requireNonNull(attributeMap.get(view)).getValue(key))).append("\"\n");
     }
 
     if (builder.charAt(builder.length() - 1) == '\n') {
@@ -131,7 +131,7 @@ private boolean tryWriteInclude(View view, HashMap<View, AttributeMap> attribute
 
         builder.append("\n").append(indent).append(TAB)
           .append(key).append("=\"")
-          .append(StringEscapeUtils.escapeXml11(attrs.getValue(key)))
+          .append(TextUtils.htmlEncode(attrs.getValue(key)))
           .append("\"");
       }
       builder.append(" />\n\n");
@@ -152,7 +152,7 @@ private boolean tryWriteFragment(View view, HashMap<View, AttributeMap> attribut
 
         builder.append("\n").append(indent).append(TAB)
           .append(key).append("=\"")
-          .append(StringEscapeUtils.escapeXml11(attrs.getValue(key)))
+          .append(TextUtils.htmlEncode(attrs.getValue(key)))
           .append("\"");
       }
       builder.append(" />\n\n");
@@ -173,7 +173,7 @@ private boolean tryWriteMerge(View view, HashMap<View, AttributeMap> attributeMa
 
                 builder.append("\n").append(indent).append(TAB)
                         .append(key).append("=\"")
-                        .append(StringEscapeUtils.escapeXml11(attrs.getValue(key)))
+                        .append(TextUtils.htmlEncode(attrs.getValue(key)))
                         .append("\"");
             }
 

plugins/Layout-Editor/src/main/java/org/appdevforall/codeonthego/layouteditor/utils/FileCreator.kt

@@ -1,30 +1,23 @@
 package org.appdevforall.codeonthego.layouteditor.utils
 
 import android.net.Uri
-import androidx.activity.result.ActivityResultCaller
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.fragment.app.Fragment
 
 /**
  * FileCreator Class is used to create a file with given name and MIME Type.
  */
-abstract class FileCreator(caller: ActivityResultCaller) {
+abstract class FileCreator(fragment: Fragment) {
   /** To create a file  */
   private val createFile: ActivityResultLauncher<String>
 
   /** MIME Type of file  */
   private var mimeType = "*/*"
 
-  /**
-   * Constructor of class
-   *
-   * @param actvty Instance of AppCompatActivity
-   */
   init {
-    // Set MIME type
-    // Register activity result for CreateDocument
     this.createFile =
-      caller.registerForActivityResult<String, Uri>(
+      fragment.registerForActivityResult<String, Uri>(
         ActivityResultContracts.CreateDocument(mimeType)
       ) { onCreateFile(it) }
   }

plugins/Layout-Editor/src/main/java/org/appdevforall/codeonthego/layouteditor/utils/FilePicker.kt

@@ -1,45 +1,29 @@
 package org.appdevforall.codeonthego.layouteditor.utils
 
 import android.Manifest
-import android.app.Activity
-import android.content.Context
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.view.View
-import androidx.activity.result.ActivityResultCaller
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import org.appdevforall.codeonthego.layouteditor.R
 import org.appdevforall.codeonthego.layouteditor.utils.SBUtils.Companion.make
 
 /**
- * Class for FilePicker. Works from either a Fragment (plugin editor) or an AppCompatActivity
- * (legacy sub-activities), registering its result launchers on the given caller.
+ * Class for FilePicker. Registers its result launchers on the hosting fragment.
  */
-abstract class FilePicker private constructor(
-  caller: ActivityResultCaller,
-  private val activityProvider: () -> Activity,
-  private val contextProvider: () -> Context,
-) {
-  constructor(fragment: Fragment) : this(
-    fragment,
-    { fragment.requireActivity() },
-    { fragment.requireContext() },
-  )
-
-  constructor(activity: AppCompatActivity) : this(activity, { activity }, { activity })
+abstract class FilePicker(private val fragment: Fragment) {
 
   private val getFile: ActivityResultLauncher<String> =
-    caller.registerForActivityResult(ActivityResultContracts.GetContent()) { onPickFile(it) }
+    fragment.registerForActivityResult(ActivityResultContracts.GetContent()) { onPickFile(it) }
 
   private val reqPermission: ActivityResultLauncher<String> =
-    caller.registerForActivityResult(ActivityResultContracts.RequestPermission()) { onRequestPermission(it) }
+    fragment.registerForActivityResult(ActivityResultContracts.RequestPermission()) { onRequestPermission(it) }
 
-  private fun contentRoot(): View = activityProvider().findViewById(android.R.id.content)
+  private fun contentRoot(): View = fragment.requireActivity().findViewById(android.R.id.content)
 
   private fun onRequestPermission(isGranted: Boolean) {
     if (isGranted) make(contentRoot(), R.string.permission_granted)
@@ -70,7 +54,7 @@ abstract class FilePicker private constructor(
       mimeType == "image/*" || mimeType == "image/png" || mimeType == "image/jpg" || mimeType == "image/jpeg"
 
     if (isImageType) {
-      val ctx = contextProvider()
+      val ctx = fragment.requireContext()
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
         if (ContextCompat.checkSelfPermission(ctx, Manifest.permission.READ_MEDIA_IMAGES)
           == PackageManager.PERMISSION_DENIED