Initial Gradle Plugin configuration

Stefterv · Stefterv · commit 0c674adc54ad · 2025-07-17T14:15:54.000+02:00
diff --git a/app/src/processing/app/Preferences.kt b/app/src/processing/app/Preferences.kt
@@ -34,6 +34,7 @@ fun loadPreferences(): Properties{
     }
 }
 
+// TODO: Move this to a more appropriate place
 @Composable
 fun watchFile(file: File): Any? {
     val scope = rememberCoroutineScope()
diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java
@@ -50,6 +50,8 @@
  * Stores information about files in the current sketch.
  */
 public class Sketch {
+  public static final String PROPERTIES_NAME = "sketch.properties";
+
   private final Editor editor;
   private final Mode mode;
 
@@ -1305,7 +1307,7 @@ static protected Settings loadProperties(File folder) throws IOException {
     }
     return null;
     */
-    return new Settings(new File(folder, "sketch.properties"));
+    return new Settings(new File(folder, PROPERTIES_NAME));
   }
 
 
diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
@@ -118,6 +118,7 @@ class GradleJob(
         val repository = getContentFile("repository").absolutePath.replace("""\""", """\\""")
         // Create the init.gradle.kts file in the working directory
         // This allows us to run the gradle plugin that has been bundled with the editor
+        // TODO: Add the plugin repositories if they are defined
         val initGradle = workingDir.resolve("init.gradle.kts").apply {
             val content = """
                 beforeSettings{
diff --git a/app/src/processing/app/gradle/GradlePlugin.kt b/app/src/processing/app/gradle/GradlePlugin.kt
@@ -0,0 +1,20 @@
+package processing.app.gradle
+
+import androidx.compose.runtime.mutableStateListOf
+import processing.app.Base
+import java.nio.file.Path
+
+data class GradlePlugin(
+    val name: String,
+    val description: String,
+    val repository: Path?,
+    val id: String,
+    val version: String){
+    companion object{
+        const val PROPERTIES_KEY = "sketch.plugins"
+        val plugins = mutableStateListOf<GradlePlugin>(
+            GradlePlugin("Hot Reload (experimental)", "Automatically apply changes in your sketch upon saving", null, "org.processing.java.hotreload", Base.getVersionName()),
+            GradlePlugin("Android","Run your sketch on an Android device", null, "org.processing.android", Base.getVersionName()),
+        )
+    }
+}
diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
@@ -2,11 +2,13 @@ package processing.app.gradle
 
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.awt.ComposePanel
 import processing.app.Language.text
 import processing.app.Mode
 import processing.app.Preferences
 import processing.app.Sketch
 import processing.app.ui.Editor
+import processing.app.ui.Theme
 import kotlin.io.path.createTempDirectory
 
 // TODO: Highlight errors in the editor in the right place
@@ -28,17 +30,7 @@ class GradleService(
     val editor: Editor?,
 ) {
     val active = mutableStateOf(Preferences.getBoolean("run.use_gradle"))
-
-    val settings = GradleSettings()
-
-    var sketch: Sketch? = null
-        set (value) {
-            field = value
-            if(value == null) return
-            // If the sketch is set, we start the build process to speed up the first run
-            startJob("build")
-        }
-
+    var sketch = mutableStateOf<Sketch?>(null)
     val jobs = mutableStateListOf<GradleJob>()
     val workingDir = createTempDirectory()
 
@@ -61,7 +53,7 @@ class GradleService(
         val job = GradleJob(
             tasks = tasks,
             workingDir  = workingDir,
-            sketch = sketch ?: throw IllegalStateException("Sketch is not set"),
+            sketch = sketch.value ?: throw IllegalStateException("Sketch is not set"),
             editor = editor
         )
         jobs.add(job)
@@ -72,18 +64,16 @@ class GradleService(
         jobs.forEach(GradleJob::cancel)
     }
 
-    // Hooks for java to check if the Gradle service is running since mutableStateOf is not accessible in java
+    // Hooks for java to interact with the Gradle service since mutableStateOf is not accessible in java
+    fun setSketch(sketch: Sketch){
+        this.sketch.value = sketch
+        startJob("build")
+    }
     fun getEnabled(): Boolean {
         return active.value
     }
     fun setEnabled(active: Boolean) {
         if(!active) stopJobs()
         this.active.value = active
-        val editor = editor ?: return
-        if(active){
-            editor.footer?.addPanel(settings, text("gradle.settings"), "/lib/footer/settings")
-        }else{
-            editor.footer?.removePanel(settings)
-        }
     }
 }
diff --git a/app/src/processing/app/gradle/GradleSettings.kt b/app/src/processing/app/gradle/GradleSettings.kt
@@ -1,23 +1,195 @@
 package processing.app.gradle
 
+import androidx.compose.foundation.VerticalScrollbar
+import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.scrollable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.rememberScrollbarAdapter
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.Checkbox
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.awt.ComposePanel
+import androidx.compose.ui.awt.SwingPanel
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.em
+import androidx.compose.ui.unit.sp
+import com.formdev.flatlaf.util.SwingUtils
+import com.github.ajalt.mordant.rendering.TextStyle
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import processing.app.Language.text
+import processing.app.Settings
+import processing.app.Sketch
+import processing.app.ui.Editor
+import processing.app.ui.EditorFooter
+import processing.app.ui.Theme
+import processing.app.ui.theme.ProcessingTheme
+import processing.app.watchFile
+import java.awt.Dimension
+import java.util.UUID
+import javax.swing.JCheckBox
 import javax.swing.JPanel
+import javax.swing.SwingUtilities
 
-class GradleSettings : JPanel() {
-    init{
-        val compose = ComposePanel()
-        compose.setContent {
-            Panel()
-        }
-        this.add(compose)
-    }
+class GradleSettings{
     companion object{
+        private val scope = CoroutineScope(Dispatchers.IO)
+
+        @JvmStatic
+        fun addGradleSettings(footer: EditorFooter, service: GradleService){
+            val panel = ComposePanel()
+            panel.setContent {
+                Panel(service)
+            }
+            scope.launch {
+                // Only add the panel to the footer when Gradle is active
+                // Can be removed later when Gradle becomes the default build system
+                snapshotFlow { service.active.value }
+                    .collect { active ->
+                        SwingUtilities.invokeLater {
+                            if(active){
+                                footer.addPanel(panel, text("gradle.settings"), "/lib/footer/settings")
+                            }else{
+                                footer.removePanel(panel)
+                            }
+                        }
+                    }
+            }
+        }
+
         @Composable
-        fun Panel(){
-            Text("Gradle settings will be here soon")
+        fun Panel(service: GradleService){
+            val properties = service.sketch.value?.folder?.resolve(Sketch.PROPERTIES_NAME) ?: return
+            // TODO: Rewatch again is the sketch is saved in a different location
+
+            val changed = watchFile(properties)
+
+            val settings = remember(changed) {Settings(properties) }
+
+            LaunchedEffect(changed){
+                /*
+                If the sketch.id is not set, generate a new UUID and save it.
+                We will use this key to save preferences that do not influence the sketch itself,
+                so they are not code, but do influence how the sketch shows up in the editor.
+                This is useful for things like favoring a sketch
+                These are items that should not be shared between users/computers
+                // TODO: Reset id on save-as?
+                 */
+                if(settings.get("sketch.id") == null){
+                    // TODO: Should this watch the file or should it update a bunch on running the sketch?
+                    settings.set("sketch.id", UUID.randomUUID().toString())
+                    settings.save()
+                }
+            }
+            val stateVertical = rememberScrollState(0)
+
+            ProcessingTheme {
+                Box {
+                    Row(
+                        modifier = Modifier
+                            .background(Color(Theme.getColor("editor.line.highlight.color").rgb))
+                            .padding(start = Editor.LEFT_GUTTER.dp)
+                            .fillMaxSize()
+                            .verticalScroll(stateVertical)
+                            .padding(vertical = 4.dp)
+                    ) {
+                        PluginsPanel(settings)
+                    }
+                    VerticalScrollbar(
+                        modifier = Modifier
+                            .align(Alignment.CenterEnd)
+                            .padding(8.dp)
+                            .fillMaxHeight(),
+                        adapter = rememberScrollbarAdapter(stateVertical)
+                    )
+                }
+            }
         }
 
+        @Composable
+        private fun PluginsPanel(settings: Settings) {
+            // Grab the installed plugins
+            val plugins = GradlePlugin.plugins
+
+            // Grab the enabled plugins
+            val pluginSetting = (settings.get(GradlePlugin.PROPERTIES_KEY) ?: "")
+                .split(",")
+                .map { it.trim() }
+                .filter{ it.isNotEmpty() }
+
+            // Link plugins in the settings to their installed counterparts
+            val enabledPlugins = pluginSetting
+                .map { id -> plugins.find { plugin -> plugin.id == id } }
+            Column {
+                Text(
+                    text = text("gradle.settings.plugins"),
+                    textAlign = TextAlign.Start,
+                    fontSize = 10.sp,
+                    fontWeight = FontWeight.Bold
+                )
+                Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+                    GradlePlugin.plugins.map { plugin ->
+                        Row() {
+                            Checkbox(
+                                checked = enabledPlugins.contains(plugin),
+                                modifier = Modifier
+                                    .padding(start = 0.dp, end = 8.dp)
+                                    .size(24.dp),
+                                onCheckedChange = { checked ->
+                                    scope.launch {
+                                        // Work from the setting as we do not want to remove missing plugins
+                                        val current = pluginSetting.toMutableSet()
+                                        if (checked) {
+                                            current.add(plugin.id)
+                                        } else {
+                                            current.remove(plugin.id)
+                                        }
+                                        settings.set(GradlePlugin.PROPERTIES_KEY, current.joinToString(","))
+                                        settings.save()
+                                    }
+                                },
+                            )
+                            Column {
+                                Text(
+                                    text = plugin.name,
+                                    textAlign = TextAlign.Start,
+                                    fontSize = 12.sp
+                                )
+                                Text(
+                                    text = plugin.description,
+                                    textAlign = TextAlign.Start,
+                                    fontSize = 10.sp,
+                                )
+                            }
+                        }
+
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/app/src/processing/app/gradle/api/Sketch.kt b/app/src/processing/app/gradle/api/Sketch.kt
@@ -53,7 +53,7 @@ class Sketch : SuspendingCliktCommand("sketch") {
             System.setProperty("java.awt.headless", "false")
 
             val service = GradleService(mode,null)
-            service.sketch = processing.app.Sketch(sketch, mode)
+            service.sketch.value = processing.app.Sketch(sketch, mode)
             service.run()
 
             // TODO: Use an async way to wait for the job to finish
diff --git a/app/src/processing/app/ui/EditorFooter.java b/app/src/processing/app/ui/EditorFooter.java
@@ -152,6 +152,7 @@ public void addPanel(Component comp, String name) {
   public void addPanel(Component comp, String name, String icon) {
     tabs.add(new Tab(comp, name, icon));
     cardPanel.add(name, comp);
+    repaint();
   }
 
   /**
diff --git a/build/shared/lib/footer/settings.svg b/build/shared/lib/footer/settings.svg
@@ -1 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z" fill="silver" /></svg>
+<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+    <line y1="-1.04167" x2="16.6667" y2="-1.04167" transform="matrix(-1 0 0 1 24.333 9.66675)" stroke="silver" stroke-width="2.08333"/>
+    <line y1="-1.04167" x2="16.6667" y2="-1.04167" transform="matrix(-1 0 0 1 24.333 17.1667)" stroke="silver" stroke-width="2.08333"/>
+    <line y1="-1.04167" x2="16.6667" y2="-1.04167" transform="matrix(-1 0 0 1 24.333 24.5833)" stroke="silver" stroke-width="2.08333"/>
+    <circle cx="3.33333" cy="3.33333" r="3.33333" transform="matrix(-1 0 0 1 14.167 5.16675)" fill="silver"/>
+    <circle cx="3.33333" cy="3.33333" r="3.33333" transform="matrix(-1 0 0 1 26.833 12.75)" fill="silver"/>
+    <circle cx="3.33333" cy="3.33333" r="3.33333" transform="matrix(-1 0 0 1 19.167 20.0833)" fill="silver"/>
+</svg>
diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties
@@ -325,6 +325,7 @@ gradle.instructions = About this file: \nProcessing creates this file when you r
 gradle.using_gradle = Building sketch using the new build system. (See settings to switch to the legacy build system.)
 gradle.using_eclipse = Building sketch using the legacy build system. (See settings to switch to the new build system.)
 gradle.settings = Settings
+gradle.settings.plugins = Plugins
 
 # ---------------------------------------
 # Toolbars
diff --git a/java/gradle/src/main/kotlin/ProcessingPlugin.kt b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ fun loadPreferences(): Properties{`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
	`37`	`+// TODO: Move this to a more appropriate place`
`37`	`38`	`@Composable`
`38`	`39`	`fun watchFile(file: File): Any? {`
`39`	`40`	`val scope = rememberCoroutineScope()`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,8 @@`
`50`	`50`	`* Stores information about files in the current sketch.`
`51`	`51`	`*/`
`52`	`52`	`public class Sketch {`
	`53`	`+ public static final String PROPERTIES_NAME = "sketch.properties";`
	`54`	`+`
`53`	`55`	`private final Editor editor;`
`54`	`56`	`private final Mode mode;`
`55`	`57`
`@@ -1305,7 +1307,7 @@ static protected Settings loadProperties(File folder) throws IOException {`
`1305`	`1307`	`}`
`1306`	`1308`	`return null;`
`1307`	`1309`	`*/`
`1308`		`- return new Settings(new File(folder, "sketch.properties"));`
	`1310`	`+ return new Settings(new File(folder, PROPERTIES_NAME));`
`1309`	`1311`	`}`
`1310`	`1312`
`1311`	`1313`
Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,7 @@ public void addPanel(Component comp, String name) {`
`152`	`152`	`public void addPanel(Component comp, String name, String icon) {`
`153`	`153`	`tabs.add(new Tab(comp, name, icon));`
`154`	`154`	`cardPanel.add(name, comp);`
	`155`	`+ repaint();`
`155`	`156`	`}`
`156`	`157`
`157`	`158`	`/**`