Added survey button to the new welcome screen

Author: Stefterv

app/src/processing/app/ui/PDEWelcome.kt

@@ -23,6 +23,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.decodeToImageBitmap
 import androidx.compose.ui.graphics.painter.BitmapPainter
@@ -568,7 +569,7 @@ fun showWelcomeScreen(base: Base? = null) {
         unique = WelcomeScreen::class,
         fullWindowContent = true
     ) {
-        PDEWelcome(base)
+        PDEWelcomeWithSurvey(base)
     }
 }
 
@@ -594,16 +595,35 @@ fun languagesDropdown(showOptions: MutableState<Boolean>) {
     }
 }
 
+@Composable
+fun PDEWelcomeWithSurvey(base: Base? = null) {
+    Box {
+        PDEWelcome(base)
+        Column(
+            modifier = Modifier
+                .align(Alignment.BottomEnd)
+                .padding(16.dp)
+                .padding(bottom = 12.dp)
+                .shadow(
+                    elevation = 5.dp,
+                    shape = RoundedCornerShape(12.dp)
+                )
+        ) {
+            SurveyInvitation()
+        }
+    }
+}
+
 fun main(){
     application {
         PDEComposeWindow(titleKey = titleKey, size = size, fullWindowContent = true) {
             PDETheme(darkTheme = true) {
-                PDEWelcome()
+                PDEWelcomeWithSurvey()
             }
         }
         PDEComposeWindow(titleKey = titleKey, size = size, fullWindowContent = true) {
             PDETheme(darkTheme = false) {
-                PDEWelcome()
+                PDEWelcomeWithSurvey()
             }
         }
     }

app/src/processing/app/ui/WelcomeSurvey.kt

@@ -5,8 +5,9 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.awt.ComposePanel
@@ -26,46 +27,46 @@ fun addSurveyToWelcomeScreen(): JComponent {
     return ComposePanel().apply {
         setContent {
             PDETheme {
-                val locale = LocalLocale.current
-                Box {
-                    Row(
-                        modifier = Modifier
-                            .width(420.dp)
-                            .padding(16.dp)
-                            .padding(bottom = 12.dp)
-                            .clip(RoundedCornerShape(12.dp))
-                            .background(MaterialTheme.colors.surface)
-                            .clickable {
-                                Platform.openURL("https://survey.processing.org/")
-                            }
-                            .pointerHoverIcon(
-                                PointerIcon.Hand
-                            )
-                    ) {
-                        Image(
-                            painter = painterResource("bird.svg"),
-                            contentDescription = locale["beta.logo"],
-                            modifier = Modifier
-                                .align(Alignment.CenterVertically)
-                                .padding(20.dp)
-                                .size(50.dp)
-
-                        )
-                        Column(
-                            modifier = Modifier.padding(12.dp),
-                        ) {
-                            Text(
-                                text = locale["welcome.survey.title"],
-                                style = MaterialTheme.typography.subtitle1.copy(fontWeight = FontWeight.Bold)
-                            )
-                            Text(
-                                text = locale["welcome.survey.description"],
-                            )
+                SurveyInvitation()
+            }
+        }
+    }
+}
 
-                        }
-                    }
-                }
+@Composable
+fun SurveyInvitation() {
+    val locale = LocalLocale.current
+    Row(
+        modifier = Modifier
+            .width(420.dp)
+            .clip(RoundedCornerShape(12.dp))
+            .background(MaterialTheme.colorScheme.surfaceContainerLowest)
+            .clickable {
+                Platform.openURL("https://survey.processing.org/")
             }
+            .pointerHoverIcon(
+                PointerIcon.Hand
+            )
+    ) {
+        Image(
+            painter = painterResource("bird.svg"),
+            contentDescription = locale["beta.logo"],
+            modifier = Modifier
+                .align(Alignment.CenterVertically)
+                .padding(20.dp)
+                .size(50.dp)
+        )
+        Column(
+            modifier = Modifier.padding(12.dp),
+        ) {
+            Text(
+                text = locale["welcome.survey.title"],
+                style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold)
+            )
+            Text(
+                text = locale["welcome.survey.description"],
+                style = MaterialTheme.typography.bodyMedium
+            )
         }
     }
 }