From aa38f689a520e6daa3d2fa9536444a4c20b9d24c Mon Sep 17 00:00:00 2001 From: aro Date: Thu, 24 Nov 2022 14:54:45 +0100 Subject: [PATCH] app style: refactored ui components --- .../wrench/components/WatcherDisplay.kt | 17 ++++++ .../wrench/components/WatcherTextEntry.kt | 4 +- .../components/WrenchFileManagerInput.kt | 61 ------------------- .../wrench/components/input/InputEntries.kt | 38 ++++++++++++ .../wrench/components/input/InputTopText.kt | 35 +++++++++++ .../wrench/components/output/OutputEntries.kt | 30 +++++++++ .../wrench/components/tooltip/Tooltip.kt | 2 + 7 files changed, 125 insertions(+), 62 deletions(-) create mode 100644 src/main/kotlin/xyz/atnrch/wrench/components/WatcherDisplay.kt delete mode 100644 src/main/kotlin/xyz/atnrch/wrench/components/WrenchFileManagerInput.kt create mode 100644 src/main/kotlin/xyz/atnrch/wrench/components/input/InputEntries.kt create mode 100644 src/main/kotlin/xyz/atnrch/wrench/components/input/InputTopText.kt create mode 100644 src/main/kotlin/xyz/atnrch/wrench/components/output/OutputEntries.kt create mode 100644 src/main/kotlin/xyz/atnrch/wrench/components/tooltip/Tooltip.kt diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/WatcherDisplay.kt b/src/main/kotlin/xyz/atnrch/wrench/components/WatcherDisplay.kt new file mode 100644 index 0000000..92ebe3d --- /dev/null +++ b/src/main/kotlin/xyz/atnrch/wrench/components/WatcherDisplay.kt @@ -0,0 +1,17 @@ +package xyz.atnrch.wrench.components + +import androidx.compose.foundation.layout.Row +import androidx.compose.runtime.Composable +import xyz.atnrch.wrench.components.input.InputEntries +import xyz.atnrch.wrench.components.output.OutputEntries +import xyz.atnrch.wrench.watcher.WatcherManager + +@Composable +fun WatcherDisplay( + watcherManager: WatcherManager +) { + Row { + InputEntries(watcherManager) + OutputEntries() + } +} diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/WatcherTextEntry.kt b/src/main/kotlin/xyz/atnrch/wrench/components/WatcherTextEntry.kt index fc4408f..588ec0c 100644 --- a/src/main/kotlin/xyz/atnrch/wrench/components/WatcherTextEntry.kt +++ b/src/main/kotlin/xyz/atnrch/wrench/components/WatcherTextEntry.kt @@ -10,6 +10,7 @@ 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.dialog.EntryDialog import xyz.atnrch.wrench.ui.Fonts import xyz.atnrch.wrench.watcher.WatcherEntry @@ -24,12 +25,13 @@ fun WatcherTextEntry(entry: WatcherEntry) { style = TextStyle( color = Color.Black, fontSize = TextUnit(15F, TextUnitType.Sp), - fontFamily = Fonts.JOST_LIGHT_ITALIC + fontFamily = Fonts.ROBOTO_REGULAR ), modifier = Modifier.clickable { dialogState = true } ) + Spacer(Modifier.height(15.dp)) if (dialogState) { EntryDialog(onStateChange = { dialogState = it }) diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/WrenchFileManagerInput.kt b/src/main/kotlin/xyz/atnrch/wrench/components/WrenchFileManagerInput.kt deleted file mode 100644 index d0e7ea8..0000000 --- a/src/main/kotlin/xyz/atnrch/wrench/components/WrenchFileManagerInput.kt +++ /dev/null @@ -1,61 +0,0 @@ -package xyz.atnrch.wrench.components - -import androidx.compose.foundation.BorderStroke -import androidx.compose.foundation.border -import androidx.compose.foundation.layout.* -import androidx.compose.runtime.Composable -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.RectangleShape -import androidx.compose.ui.unit.dp -import xyz.atnrch.wrench.components.debug.DummyTextEntry -import xyz.atnrch.wrench.ui.UIColors -import xyz.atnrch.wrench.watcher.WatcherManager - -@Composable -fun WatcherDisplay( - watcherManager: WatcherManager -) { - var selectedFile = remember { mutableStateOf("") } - - Row( - horizontalArrangement = Arrangement.SpaceEvenly - ) { - Box( - contentAlignment = Alignment.Center, - modifier = Modifier - .padding(PaddingValues(0.dp, 0.dp, 0.dp, 55.dp)) - .fillMaxHeight() - .fillMaxWidth(0.5f) - .border(BorderStroke(4.dp, UIColors.ORANGE), RectangleShape) - ) { - Column { - //............. - // INPUT SIDE - //............. - watcherManager.getEntries().forEach { - WatcherTextEntry(it) - } - DummyTextEntry() - } - } - - Box( - contentAlignment = Alignment.Center, - modifier = Modifier - .padding(PaddingValues(0.dp, 0.dp, 0.dp, 55.dp)) - .fillMaxHeight() - .fillMaxWidth(1f) - .border(BorderStroke(4.dp, UIColors.STRESS), RectangleShape) - ) { - Column { - //............. - // OUTPUT SIDE - //............. - DummyTextEntry() - } - } - } -} diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/input/InputEntries.kt b/src/main/kotlin/xyz/atnrch/wrench/components/input/InputEntries.kt new file mode 100644 index 0000000..f75be3e --- /dev/null +++ b/src/main/kotlin/xyz/atnrch/wrench/components/input/InputEntries.kt @@ -0,0 +1,38 @@ +package xyz.atnrch.wrench.components.input + +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.* +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.RectangleShape +import androidx.compose.ui.unit.dp +import xyz.atnrch.wrench.components.WatcherTextEntry +import xyz.atnrch.wrench.components.debug.DummyTextEntry +import xyz.atnrch.wrench.ui.UIColors +import xyz.atnrch.wrench.watcher.WatcherManager + +@Composable +fun InputEntries( + watcherManager: WatcherManager +) { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier + .padding(PaddingValues(0.dp, 0.dp, 0.dp, 55.dp)) + .fillMaxHeight() + .fillMaxWidth(0.5f) + .border(BorderStroke(4.dp, UIColors.ORANGE), RectangleShape) + ) { + InputTopText() + Column { + watcherManager.getEntries().forEach { + WatcherTextEntry(it) + } + for (i in 0..5) { + DummyTextEntry() + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/input/InputTopText.kt b/src/main/kotlin/xyz/atnrch/wrench/components/input/InputTopText.kt new file mode 100644 index 0000000..71f3bab --- /dev/null +++ b/src/main/kotlin/xyz/atnrch/wrench/components/input/InputTopText.kt @@ -0,0 +1,35 @@ +package xyz.atnrch.wrench.components.input + +import androidx.compose.foundation.layout.* +import androidx.compose.material.ButtonDefaults +import androidx.compose.material.Icon +import androidx.compose.material.Text +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Input +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp + +@Composable +fun InputTopText() { + Box( + contentAlignment = Alignment.TopCenter, + modifier = Modifier + .padding(PaddingValues(0.dp, 24.dp, 0.dp, 55.dp)) + .fillMaxHeight() + .fillMaxWidth(0.5f) + ) { + Row { + Icon( + Icons.Filled.Input, + tint = Color.Black, + contentDescription = "Input", + modifier = Modifier.size(ButtonDefaults.IconSize) + ) + Spacer(Modifier.width(5.dp)) + Text("Input") + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/output/OutputEntries.kt b/src/main/kotlin/xyz/atnrch/wrench/components/output/OutputEntries.kt new file mode 100644 index 0000000..9a41dbc --- /dev/null +++ b/src/main/kotlin/xyz/atnrch/wrench/components/output/OutputEntries.kt @@ -0,0 +1,30 @@ +package xyz.atnrch.wrench.components.output + +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.* +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.RectangleShape +import androidx.compose.ui.unit.dp +import xyz.atnrch.wrench.components.debug.DummyTextEntry +import xyz.atnrch.wrench.ui.UIColors + +@Composable +fun OutputEntries() { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier + .padding(PaddingValues(0.dp, 0.dp, 0.dp, 55.dp)) + .fillMaxHeight() + .fillMaxWidth() + .border(BorderStroke(4.dp, UIColors.STRESS), RectangleShape) + ) { + Column { + for (i in 0..5) { + DummyTextEntry() + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/tooltip/Tooltip.kt b/src/main/kotlin/xyz/atnrch/wrench/components/tooltip/Tooltip.kt new file mode 100644 index 0000000..2d4136c --- /dev/null +++ b/src/main/kotlin/xyz/atnrch/wrench/components/tooltip/Tooltip.kt @@ -0,0 +1,2 @@ +package xyz.atnrch.wrench.components.tooltip +