Compare commits

..

No commits in common. "94b3349eeb3715b6df97dcf9a9877f102227019b" and "6dbf6a67afe5651954c6224840db380c42e927f6" have entirely different histories.

4 changed files with 9 additions and 8 deletions

View File

@ -3,8 +3,10 @@ import org.jetbrains.compose.internal.de.undercouch.gradle.tasks.download.Downlo
import org.gradle.internal.os.OperatingSystem import org.gradle.internal.os.OperatingSystem
plugins { plugins {
kotlin("jvm") val kotlinVersion = "2.0.21"
kotlin("plugin.serialization")
kotlin("jvm") version kotlinVersion
kotlin("plugin.serialization") version kotlinVersion
id("org.jetbrains.compose") id("org.jetbrains.compose")
id("org.jetbrains.kotlin.plugin.compose") id("org.jetbrains.kotlin.plugin.compose")
} }

View File

@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
kotlin.code.style=official kotlin.code.style=official
kotlin.version=2.0.21 kotlin.version=2.0.0
compose.version=1.6.10 compose.version=1.6.10

View File

@ -8,7 +8,6 @@ pluginManagement {
plugins { plugins {
kotlin("jvm").version(extra["kotlin.version"] as String) kotlin("jvm").version(extra["kotlin.version"] as String)
kotlin("plugin.serialization").version(extra["kotlin.version"] as String)
id("org.jetbrains.compose").version(extra["compose.version"] as String) id("org.jetbrains.compose").version(extra["compose.version"] as String)
id("org.jetbrains.kotlin.plugin.compose").version(extra["kotlin.version"] as String) id("org.jetbrains.kotlin.plugin.compose").version(extra["kotlin.version"] as String)
} }

View File

@ -67,9 +67,7 @@ class ProfileDetails(val profile: Profile): Screen {
@Composable @Composable
fun generalAttributes() { fun generalAttributes() {
Column( Column {
modifier = Modifier.padding(10.dp)
) {
textAttribute( textAttribute(
title = "Name", title = "Name",
tooltip = "This is the name of the profile. It also acts as the name of the saved file.", tooltip = "This is the name of the profile. It also acts as the name of the saved file.",
@ -132,7 +130,7 @@ class ProfileDetails(val profile: Profile): Screen {
) )
Button( Button(
onClick = { //TODO: does not update text field onClick = {
CoroutineScope(Dispatchers.IO + SupervisorJob()).async { CoroutineScope(Dispatchers.IO + SupervisorJob()).async {
fieldValue = FileKit.pickFile( fieldValue = FileKit.pickFile(
title = "Pick program path", title = "Pick program path",
@ -179,6 +177,8 @@ class ProfileDetails(val profile: Profile): Screen {
.background(MaterialTheme.colors.primary, CircleShape) .background(MaterialTheme.colors.primary, CircleShape)
) { ) {
Text( Text(
modifier = Modifier
.padding(10.dp),
text = tooltip, text = tooltip,
color = MaterialTheme.colors.onPrimary color = MaterialTheme.colors.onPrimary
) )