Simplified Gradle Service, improved sketch logging, fixed toolbar state

Author: Stefterv

app/src/processing/app/gradle/GradleJob.kt

@@ -57,8 +57,8 @@ class GradleJob{
                         withCancellationToken(cancel.token())
                         addStateListener()
                         addDebugging()
+                        setStandardOutput(System.out)
                         if(Base.DEBUG) {
-                            setStandardOutput(System.out)
                             setStandardError(System.err)
                         }
                         run()
@@ -83,6 +83,7 @@ class GradleJob{
                     ":run" -> {
                         state.value = State.RUNNING
                         Messages.log("Start run")
+                        service?.editor?.toolbar?.activateRun()
                     }
                 }
 
@@ -99,6 +100,8 @@ class GradleJob{
                     }
                     ":run"->{
                         state.value = State.NONE
+                        service?.editor?.toolbar?.deactivateRun()
+                        service?.editor?.toolbar?.deactivateStop()
                     }
                 }
             }

app/src/processing/app/gradle/GradleService.kt

@@ -2,6 +2,10 @@ package processing.app.gradle
 
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.snapshotFlow
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.gradle.tooling.BuildLauncher
 import processing.app.Base
 import processing.app.Language
@@ -46,38 +50,32 @@ class GradleService(
     val workingDir = createTempDirectory()
     val debugPort = (30_000..60_000).random()
 
-    // TODO: Add support for present
     fun run(){
-        stopActions()
-
-        val job = GradleJob()
-        job.service = this
-        job.configure = {
-            setup()
-            forTasks("run")
-        }
-        jobs.add(job)
-        job.start()
+        startAction("run")
     }
 
     fun export(){
+        startAction("runDistributable")
+    }
+
+    fun stop(){
         stopActions()
+    }
+
+    private fun startAction(vararg tasks: String) {
+        if(!active.value) return
 
         val job = GradleJob()
         job.service = this
         job.configure = {
             setup()
-            forTasks("runDistributable")
+            forTasks(tasks.joinToString(" "))
         }
         jobs.add(job)
         job.start()
     }
 
-    fun stop(){
-        stopActions()
-    }
-
-    fun stopActions(){
+    private fun stopActions(){
         jobs
             .forEach(GradleJob::cancel)
     }
@@ -108,7 +106,7 @@ class GradleService(
             "settings" to Platform.getSettingsFolder().absolutePath.toString(),
             "unsaved" to unsaved.joinToString(","),
             "debugPort" to debugPort.toString(),
-            "fullscreen" to false, // TODO: Implement
+            "fullscreen" to System.getProperty("processing.fullscreen", "false").equals("true"),
             "display" to 1, // TODO: Implement
             "external" to true,
             "location" to null, // TODO: Implement

app/src/processing/app/ui/EditorConsole.java

@@ -254,7 +254,11 @@ private boolean suppressMessage(String what, boolean err) {
         // "java.lang.NoSuchMethodError: accessibilityHitTest"
         // https://github.com/processing/processing4/issues/368
         return true;
+      } else if (what.contains("__MOVE__")) {
+        // Don't display the "Move" message that is used to position the sketch window
+        return true;
       }
+
     } else {  // !err
       if (what.contains("Listening for transport dt_socket at address")) {
         // Message from the JVM about the socket launch for debug

java/src/processing/mode/java/JavaEditor.java

@@ -643,6 +643,8 @@ protected void handleLaunch(boolean present, boolean tweak) {
     toolbar.activateRun();
 
     if(this.service.getEnabled()){
+      System.setProperty("processing.fullscreen", present ? "true" : "false");
+      System.setProperty("processing.tweak", tweak ? "true" : "false");
       this.service.run();
       return;
     }
@@ -676,12 +678,7 @@ protected void handleLaunch(boolean present, boolean tweak) {
    */
   public void handleStop() {
     if(this.service.getEnabled()){
-      // TODO: Improve Gradle UI Feedback
-      toolbar.activateStop();
       this.service.stop();
-
-      toolbar.deactivateStop();
-      toolbar.deactivateRun();
       return;
     }