From 343bebe48b5bb06c0fcdde138fe759df187bb794 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Thu, 13 Mar 2025 19:15:32 +0100
Subject: [PATCH] Beta screen iteration

---
 app/build.gradle.kts                       |  2 ++
 app/src/processing/app/ui/WelcomeToBeta.kt | 21 +++++++++++++++++++--
 build/shared/lib/languages/PDE.properties  |  6 +++---
 gradle/libs.versions.toml                  |  2 ++
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f974d5875..4534b4f9f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -104,6 +104,8 @@ dependencies {
 
     implementation(libs.compottie)
     implementation(libs.kaml)
+    implementation(libs.markdown)
+    implementation(libs.markdownJVM)
 }
 
 tasks.compileJava{
diff --git a/app/src/processing/app/ui/WelcomeToBeta.kt b/app/src/processing/app/ui/WelcomeToBeta.kt
index ddffd42d3..6184ecd5f 100644
--- a/app/src/processing/app/ui/WelcomeToBeta.kt
+++ b/app/src/processing/app/ui/WelcomeToBeta.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.MaterialTheme.colors
+import androidx.compose.material.MaterialTheme.typography
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.*
@@ -29,6 +30,13 @@ import androidx.compose.ui.window.WindowPosition
 import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
 import com.formdev.flatlaf.util.SystemInfo
+import com.mikepenz.markdown.compose.Markdown
+import com.mikepenz.markdown.m2.markdownColor
+import com.mikepenz.markdown.m2.markdownTypography
+import com.mikepenz.markdown.model.MarkdownColors
+import com.mikepenz.markdown.model.MarkdownTypography
+import processing.app.Base.getRevision
+import processing.app.Base.getVersionName
 import processing.app.ui.theme.LocalLocale
 import processing.app.ui.theme.LocalTheme
 import processing.app.ui.theme.Locale
@@ -112,8 +120,17 @@ class WelcomeToBeta {
                         text = locale["beta.title"],
                         style = MaterialTheme.typography.subtitle1,
                     )
-                    Text(
-                        text = locale["beta.message"]
+                    val text = locale["beta.message"]
+                        .replace('$' + "version", getVersionName())
+                        .replace('$' + "revision", getRevision().toString())
+                    Markdown(
+                        text,
+                        colors = markdownColor(
+                            text = colors.onSurface,
+                            linkText = colors.primary,
+                        ),
+                        typography = markdownTypography(text = typography.body1),
+                        modifier = Modifier.background(Color.Transparent)
                     )
                     Row {
                         Spacer(modifier = Modifier.weight(1f))
diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties
index 74fd5027e..8dfeb26e0 100644
--- a/build/shared/lib/languages/PDE.properties
+++ b/build/shared/lib/languages/PDE.properties
@@ -617,9 +617,9 @@ update_check.updates_available.contributions = There are updates available for s
 # ---------------------------------------
 # Beta
 beta.window.title = Welcome to Beta
-beta.title = Welcome to the Processing Beta
-beta.message = Thank you for trying out the new version of Processing. We're very grateful!\n\nPlease report any bugs on the forums.
-beta.button = Got it!
+beta.title = Thanks for testing this Processing Beta!
+beta.message = This preview release lets us gather feedback and fix issues before the final version. Some features may not work as expected. If you encounter problems, [please post on the forum](https://discourse.processing.org) or [open a GitHub issue](https://github.com/processing/processing4/issues). \n\n [What's new in this release?](https://github.com/processing/processing4/releases/tag/processing-$revision-$version)
+beta.button = Ok
 
 # ---------------------------------------
 # Color Chooser
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 61703c19a..c3800d199 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,6 +21,8 @@ netbeansSwing = { module = "org.netbeans.api:org-netbeans-swing-outline", versio
 ant = { module = "org.apache.ant:ant", version = "1.10.14" }
 lsp4j = { module = "org.eclipse.lsp4j:org.eclipse.lsp4j", version = "0.22.0" }
 jsoup = { module = "org.jsoup:jsoup", version = "1.17.2" }
+markdown = { module = "com.mikepenz:multiplatform-markdown-renderer-m2", version = "0.31.0" }
+markdownJVM = { module = "com.mikepenz:multiplatform-markdown-renderer-jvm", version = "0.31.0" }
 
 [plugins]
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }