Beta screen iteration

This commit is contained in:
Stef Tervelde
2025-03-13 19:15:32 +01:00
parent aa635f1dde
commit 343bebe48b
4 changed files with 26 additions and 5 deletions

View File

@@ -104,6 +104,8 @@ dependencies {
implementation(libs.compottie)
implementation(libs.kaml)
implementation(libs.markdown)
implementation(libs.markdownJVM)
}
tasks.compileJava{

View File

@@ -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))

View File

@@ -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

View File

@@ -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" }