Merge branch 'stage' into fix/ADFA-2814-strictmode-io-apk-install-build

Author: jatezzz

.github/workflows/debug.yml

@@ -106,13 +106,6 @@ jobs:
           
           echo "Branch name length is valid ($BRANCH_LENGTH ≤ 80 characters)"
 
-      - name: Install Git LFS
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y git-lfs
-          git lfs install
-          git lfs pull
-
       - name: Check if Nix is installed
         id: check_nix
         run: |

.github/workflows/instrumentation-test.yml

@@ -44,13 +44,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Install and Configure Git LFS
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y git-lfs make
-          git lfs install
-          git lfs pull
-
       - name: Initialize submodules
         run: |
           git submodule init

.gitignore

@@ -159,3 +159,6 @@ testing/**/bin/
 # checksum files
 .checksum/
 
+# Compose preview downloaded JARs (generated during build)
+compose-preview/src/main/assets/compose/
+

app/build.gradle.kts

@@ -289,6 +289,7 @@ dependencies {
 	implementation(projects.layouteditor)
 	implementation(projects.idetooltips)
     implementation(projects.cvImageToXml)
+    implementation(projects.composePreview)
 
 	// This is to build the tooling-api-impl project before the app is built
 	// So we always copy the latest JAR file to assets

app/src/main/java/com/itsaky/androidide/actions/etc/PreviewLayoutAction.kt

@@ -26,29 +26,35 @@ import com.android.aaptcompiler.extractPathData
 import com.blankj.utilcode.util.KeyboardUtils
 import com.itsaky.androidide.actions.ActionData
 import com.itsaky.androidide.actions.EditorRelatedAction
-import com.itsaky.androidide.actions.file.CloseFileAction
 import com.itsaky.androidide.actions.markInvisible
-import com.itsaky.androidide.activities.editor.EditorActivityKt
 import com.itsaky.androidide.activities.editor.EditorHandlerActivity
+import com.itsaky.androidide.compose.preview.ComposePreviewActivity
 import com.itsaky.androidide.editor.ui.IDEEditor
 import com.itsaky.androidide.idetooltips.TooltipTag
 import com.itsaky.androidide.resources.R
-import com.itsaky.androidide.uidesigner.UIDesignerActivity
 import org.appdevforall.codeonthego.layouteditor.activities.EditorActivity
 import org.appdevforall.codeonthego.layouteditor.utils.Constants
+import org.slf4j.LoggerFactory
 import java.io.File
 
-
-
 /** @author Akash Yadav */
 class PreviewLayoutAction(context: Context, override val order: Int) : EditorRelatedAction() {
 
   override val id: String = ID
   override fun retrieveTooltipTag(isReadOnlyContext: Boolean): String = TooltipTag.EDITOR_TOOLBAR_PREVIEW_LAYOUT
   override var requiresUIThread: Boolean = false
 
-  companion object{
+  private var previewType: PreviewType = PreviewType.NONE
+
+  private enum class PreviewType {
+    NONE,
+    XML_LAYOUT,
+    COMPOSE
+  }
+
+  companion object {
     const val ID = "ide.editor.previewLayout"
+    private val LOG = LoggerFactory.getLogger(PreviewLayoutAction::class.java)
   }
 
   init {
@@ -59,6 +65,8 @@ class PreviewLayoutAction(context: Context, override val order: Int) : EditorRel
   override fun prepare(data: ActionData) {
     super.prepare(data)
 
+    previewType = PreviewType.NONE
+
     val viewModel = data.requireActivity().editorViewModel
     if (viewModel.isInitializing) {
       visible = true
@@ -71,24 +79,47 @@ class PreviewLayoutAction(context: Context, override val order: Int) : EditorRel
     }
 
     val editor = data.requireEditor()
-    val file = editor.file!!
-
-    val isXml = file.name.endsWith(".xml")
-
-    if (!isXml) {
+    val file = editor.file ?: run {
+      LOG.warn("Editor file is null")
       markInvisible()
       return
     }
 
-    val type = try {
-      extractPathData(file).type
-    } catch (err: Throwable) {
-      markInvisible()
-      return
+    when {
+      file.name.endsWith(".xml") -> {
+        val type = try {
+          extractPathData(file).type
+        } catch (err: Throwable) {
+          markInvisible()
+          return
+        }
+
+        if (type == LAYOUT) {
+          previewType = PreviewType.XML_LAYOUT
+          visible = true
+          enabled = true
+        } else {
+          markInvisible()
+        }
+      }
+      file.name.endsWith(".kt") -> {
+        val content = editor.text.toString()
+        val hasCompose = content.contains("@Composable") ||
+            content.contains("androidx.compose") ||
+            content.contains("@Preview")
+
+        if (hasCompose) {
+          previewType = PreviewType.COMPOSE
+          visible = true
+          enabled = true
+        } else {
+          markInvisible()
+        }
+      }
+      else -> {
+        markInvisible()
+      }
     }
-
-    visible = type == LAYOUT
-    enabled = visible
   }
 
   override fun getShowAsActionFlags(data: ActionData): Int {
@@ -108,23 +139,30 @@ class PreviewLayoutAction(context: Context, override val order: Int) : EditorRel
 
   override fun postExec(data: ActionData, result: Any) {
     val activity = data.requireActivity()
-    activity.previewLayout(data.requireEditor().file!!)
-  }
+    val editor = data.requireEditor()
+    val file = editor.file ?: run {
+      LOG.warn("Editor file is null in postExec")
+      return
+    }
 
-  private fun EditorHandlerActivity.previewLayout(file: File) {
-//    //close any open xml files first
-//    val openEditors = editorViewModel.getOpenedFileCount()
-//    for(index in 1..openEditors) {
-//      closeFile(index-1) //zero based
-//    }
-//    invalidateOptionsMenu()
+    when (previewType) {
+      PreviewType.XML_LAYOUT -> activity.previewXmlLayout(file)
+      PreviewType.COMPOSE -> activity.showComposePreviewSheet(file, editor.text.toString())
+      PreviewType.NONE -> {}
+    }
+  }
 
+  private fun EditorHandlerActivity.previewXmlLayout(file: File) {
     val intent = Intent(this, EditorActivity::class.java)
     intent.putExtra(Constants.EXTRA_KEY_FILE_PATH, file.absolutePath.substringBefore("layout"))
     intent.putExtra(Constants.EXTRA_KEY_LAYOUT_FILE_NAME, file.name.substringBefore("."))
     uiDesignerResultLauncher?.launch(intent)
   }
 
+  private fun EditorHandlerActivity.showComposePreviewSheet(file: File, sourceCode: String) {
+    ComposePreviewActivity.start(this, sourceCode, file.absolutePath)
+  }
+
   private fun ActionData.requireEditor(): IDEEditor {
     return this.getEditor() ?: throw IllegalArgumentException(
       "An editor instance is required but none was provided")

common/src/main/java/com/itsaky/androidide/utils/Environment.java

@@ -55,6 +55,7 @@ public final class Environment {
 	public static File HOME;
 	public static File ANDROIDIDE_HOME;
 	public static File ANDROIDIDE_UI;
+	public static File COMPOSE_HOME;
 	public static File JAVA_HOME;
 	public static File ANDROID_HOME;
 	public static File TMP_DIR;
@@ -152,6 +153,7 @@ public static void init(Context context) {
 		PLUGIN_API_JAR = new File(mkdirIfNotExists(new File(ANDROIDIDE_HOME, "plugin-api")),
 				"plugin-api.jar");
 		ANDROIDIDE_UI = mkdirIfNotExists(new File(ANDROIDIDE_HOME, "ui"));
+		COMPOSE_HOME = mkdirIfNotExists(new File(ANDROIDIDE_HOME, "compose"));
 
 		INIT_SCRIPT = new File(mkdirIfNotExists(new File(ANDROIDIDE_HOME, "init")), "init.gradle");
 		GRADLE_USER_HOME = new File(HOME, ".gradle");