Disabled modern UI for now. Added preference instead

Author: Stefterv

app/src/main/resources/defaults.txt

@@ -186,6 +186,9 @@ console.temp.days = 7
 console.scrollback.lines = 500
 console.scrollback.chars = 40000
 
+# run java sketches with Gradle aka the Modern Build System
+run.use_gradle = false
+
 # Any additional Java options when running.
 # If you change this and can't run things, it's your own durn fault.
 run.options =

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

@@ -12,6 +12,7 @@ import processing.app.Base
 import processing.app.Language
 import processing.app.Messages
 import processing.app.Platform
+import processing.app.Preferences
 import processing.app.gradle.helpers.ActionGradleJob
 import processing.app.gradle.helpers.BackgroundGradleJob
 import processing.app.ui.Editor
@@ -26,7 +27,6 @@ import kotlin.io.path.writeText
 // TODO: PoC new debugger/tweak mode
 // TODO: Allow for plugins to skip gradle entirely / new modes
 // TODO: Improve background building
-// TODO: Rename to Service?
 // TODO: Track build speed (for analytics?)
 
 // The gradle service runs the gradle tasks and manages the gradle connection
@@ -35,7 +35,7 @@ import kotlin.io.path.writeText
 // GradleJob manages the gradle build and connects the debugger
 class GradleService(val editor: Editor) {
     val folder: File get() = editor.sketch.folder
-    val active = mutableStateOf(true)
+    val active = mutableStateOf(Preferences.getBoolean("run.use_gradle"))
 
     val jobs = mutableStateListOf<GradleJob>()
     val workingDir = kotlin.io.path.createTempDirectory()
@@ -45,7 +45,7 @@ class GradleService(val editor: Editor) {
 
     private val scope = CoroutineScope(Dispatchers.IO)
 
-    // Hooks for java to check if the Gradle service is running
+    // Hooks for java to check if the Gradle service is running since mutableStateOf is not accessible in java
     fun getEnabled(): Boolean {
         return active.value
     }
@@ -101,6 +101,7 @@ class GradleService(val editor: Editor) {
         }
         // TODO: Stop all jobs on dispose
     }
+    // TODO: Add support for present
     fun run(){
         stopActions()
         editor.console.clear()
@@ -215,12 +216,13 @@ class GradleService(val editor: Editor) {
             return@let Base.DEBUG
         }
         if (generate) {
-            Messages.log("build.gradle.kts not found or outdated in ${folder}, creating one")
+            Messages.log("build.gradle.kts outdated or not found in ${folder}, creating one")
             val header = """
                 // @processing-auto-generated mode=${editor.mode.title} version=${Base.getVersionName()}
                 //
                 """.trimIndent()
 
+            // TODO: add instructions keys
             val instructions = Language.text("gradle.instructions")
                 .split("\n")
                 .joinToString("\n") { "// $it" }

app/src/processing/app/gradle/ScreenshotService.kt

@@ -15,6 +15,9 @@ import kotlin.time.TimeSource
 // TODO: Add more feedback when things go wrong
 // TODO: Check if the sketch has a draw method
 // TODO: Communicate the screen over the debugging connection (to support remote clients)
+// TODO: Sharing buffers would not work with remote clients
+// TODO: Record / Capture on the client and then transfer the file over the debugging connection
+// TODO: Create a video capture method for every platform / target
 // TODO: Support recording videos
 class ScreenshotService {
     companion object{

app/src/processing/app/gradle/ui/Toolbar.kt

@@ -51,7 +51,7 @@ class Toolbar(val editor: Editor?) {
             val panel = ComposePanel().apply {
                 setContent {
                     val displayNew = editor.service.active.value
-                    if (displayNew) {
+                    if (displayNew && false) {
                         bar.display()
                         return@setContent
                     }

app/src/processing/app/ui/Editor.java

@@ -528,13 +528,6 @@ public void rebuildModePopup() {
     manageModes.addActionListener(e -> ContributionManager.openModes());
     modePopup.add(manageModes);
 
-    JMenuItem enableModern = new JMenuItem(Language.text("toolbar.enable_modern"));
-    enableModern.addActionListener(e -> {
-      this.service.setEnabled(true);
-    });
-    modePopup.addSeparator();
-    modePopup.add(enableModern);
-
     Toolkit.setMenuMnemsInside(modePopup);
   }
 
@@ -609,6 +602,7 @@ protected int getDividerLocation() {
    * with things in the Preferences window.
    */
   public void applyPreferences() {
+    service.setEnabled(Preferences.getBoolean("run.use_gradle"));
     // Even though this is only updating the theme (colors, icons),
     // subclasses use this to apply other preferences.
     // For instance, Java Mode applies changes to error checking.

app/src/processing/app/ui/PreferencesFrame.java

@@ -85,6 +85,7 @@ public class PreferencesFrame {
   JCheckBox hidpiDisableBox;
 //  JLabel hidpiRestartLabel;
   JCheckBox syncSketchNameBox;
+  JCheckBox useModernBuildSystem;
 
   JComboBox<String> displaySelectionBox;
   JComboBox<String> languageSelectionBox;
@@ -554,6 +555,9 @@ public void mouseExited(MouseEvent e) {
     runningPanel.setBorder(new TitledBorder("Running"));
     runningPanel.setLayout(new BoxLayout(runningPanel, BoxLayout.Y_AXIS));
 
+    useModernBuildSystem = new JCheckBox(Language.text("preferences.use_modern_build_system"));
+    addRow(runningPanel, useModernBuildSystem);
+
     addRow(runningPanel, displayLabel, displaySelectionBox);
     addRow(runningPanel, backgroundColorLabel, presentColor);
     addRow(runningPanel, memoryOverrideBox, memoryField, mbLabel);
@@ -827,6 +831,8 @@ protected void applyFrame() {
     Preferences.setBoolean("pdex.completion", codeCompletionBox.isSelected());
     Preferences.setBoolean("pdex.suggest.imports", importSuggestionsBox.isSelected());
 
+    Preferences.setBoolean("run.use_gradle", useModernBuildSystem.isSelected());
+
     for (Editor editor : base.getEditors()) {
       editor.applyPreferences();
     }
@@ -902,6 +908,11 @@ public void showFrame() {
     if (autoAssociateBox != null) {
       autoAssociateBox.setSelected(Preferences.getBoolean("platform.auto_file_type_associations")); //$NON-NLS-1$
     }
+
+    if(useModernBuildSystem != null) {
+      useModernBuildSystem.setSelected(Preferences.getBoolean("run.use_gradle"));
+    }
+
     // The OK Button has to be set as the default button every time the
     // PrefWindow is to be displayed
     frame.getRootPane().setDefaultButton(okButton);

build/shared/lib/defaults.txt

@@ -186,6 +186,9 @@ console.temp.days = 7
 console.scrollback.lines = 500
 console.scrollback.chars = 40000
 
+# run java sketches with Gradle aka the Modern Build System
+run.use_gradle = false
+
 # Any additional Java options when running.
 # If you change this and can't run things, it's your own durn fault.
 run.options =

java/gradle/src/main/kotlin/ProcessingPlugin.kt

@@ -25,7 +25,7 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
         val workingDir = project.findProperty("processing.workingDir") as String?
         val debugPort = project.findProperty("processing.debugPort") as String?
 
-        // Grab the settings from the most likely location
+        // Grab the settings from the most likely location if not defined
         var settingsFolder = (project.findProperty("processing.settings") as String?)?.let { File(it) }
         if(settingsFolder == null) {
             val osName = System.getProperty("os.name").lowercase()
@@ -54,6 +54,8 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
         project.plugins.apply(JavaPlugin::class.java)
 
         if(isProcessing){
+            // TODO: Add support for grabbing Processing internals even if the user is not using the IDE
+
             // Set the build directory to a temp file so it doesn't clutter up the sketch folder
             // Only if the build directory doesn't exist, otherwise proceed as normal
             if(!project.layout.buildDirectory.asFile.get().exists()) {
@@ -121,6 +123,7 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
         }
 
         // TODO: Add support for top level .java files
+        // TODO: Add support for customizing exports
 
         // Add convenience tasks for running, presenting, and exporting the sketch outside of Processing
         if(!isProcessing) {

java/gradle/src/main/kotlin/ProcessingTask.kt

@@ -115,7 +115,7 @@ abstract class ProcessingTask : SourceTask() {
         val deps = File(outputDirectory, "$sketchName.dependencies")
         deps.writeText(dependencies.joinToString("\n") { it.absolutePath })
 
-        // TODO: Add to the dependencies
+        // TODO: Add renderer libraries to the dependencies
         val renderer = meta.sketchRenderer
     }
 

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

@@ -639,12 +639,14 @@ public void handleTweak() {
   }
 
   protected void handleLaunch(boolean present, boolean tweak) {
+    prepareRun();
+    toolbar.activateRun();
+
     if(this.service.getEnabled()){
       this.service.run();
       return;
     }
-    prepareRun();
-    toolbar.activateRun();
+
     synchronized (runtimeLock) {
       runtimeLaunchRequested = true;
     }
@@ -673,6 +675,16 @@ protected void handleLaunch(boolean present, boolean tweak) {
    * session or performs standard stop action if not currently debugging.
    */
   public void handleStop() {
+    if(this.service.getEnabled()){
+      // TODO: Improve Gradle UI Feedback
+      toolbar.activateStop();
+      this.service.stop();
+
+      toolbar.deactivateStop();
+      toolbar.deactivateRun();
+      return;
+    }
+
     if (debugger.isStarted()) {
       debugger.stopDebug();