From ebf97141831494be5407452aa138c6dfd4c1f802 Mon Sep 17 00:00:00 2001 From: aro Date: Thu, 24 Nov 2022 15:27:48 +0100 Subject: [PATCH] feat: done vertical arrangement good --- build.gradle.kts | 4 ++-- .../xyz/atnrch/wrench/components/center/WatcherTextEntry.kt | 2 -- .../xyz/atnrch/wrench/components/center/input/InputEntries.kt | 4 +++- .../atnrch/wrench/components/center/output/OutputEntries.kt | 4 +++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a464e54..d54e51e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -31,9 +31,9 @@ tasks.withType { compose.desktop { application { - mainClass = "MainKt" + mainClass = "xyz.atnrch.wrench.WrenchApp" nativeDistributions { - targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) + targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.AppImage) packageName = "Wrench" packageVersion = "1.0.0" } diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/center/WatcherTextEntry.kt b/src/main/kotlin/xyz/atnrch/wrench/components/center/WatcherTextEntry.kt index 9192f55..8224908 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/center/WatcherTextEntry.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/center/WatcherTextEntry.kt @@ -10,7 +10,6 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.ExperimentalUnitApi import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.TextUnitType -import androidx.compose.ui.unit.dp import xyz.atnrch.wrench.components.center.dialog.EntryDialog import xyz.atnrch.wrench.ui.Fonts import xyz.atnrch.wrench.watcher.WatcherEntry @@ -31,7 +30,6 @@ fun WatcherTextEntry(entry: WatcherEntry) { dialogState = true } ) - Spacer(Modifier.height(15.dp)) if (dialogState) { EntryDialog(onStateChange = { dialogState = it }) diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputEntries.kt b/src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputEntries.kt index 0a00632..3dbf42f 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputEntries.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/center/input/InputEntries.kt @@ -26,7 +26,9 @@ fun InputEntries( .border(BorderStroke(4.dp, UIColors.ORANGE), RectangleShape) ) { InputTopText() - Column { + Column( + verticalArrangement = Arrangement.spacedBy(15.dp) + ) { watcherManager.getEntries().forEach { WatcherTextEntry(it) } diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/center/output/OutputEntries.kt b/src/main/kotlin/xyz/atnrch/wrench/components/center/output/OutputEntries.kt index b191ba5..97cfdd0 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/center/output/OutputEntries.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/center/output/OutputEntries.kt @@ -22,7 +22,9 @@ fun OutputEntries() { .border(BorderStroke(4.dp, UIColors.STRESS), RectangleShape) ) { OutputTopText() - Column { + Column( + verticalArrangement = Arrangement.spacedBy(15.dp) + ) { for (i in 0..5) { DummyTextEntry() }